| 13c38b13 | 2015-03-04 22:42:54 | Slávek Banko |
Fix incorrectly renamed strings (cherry picked from commit a323a9c371885d011a815fd45987414539feda7f) |
||
|
M kdevdesigner/designer/customwidgeteditor.ui M kdevdesigner/designer/formwindow.cpp M kdevdesigner/designer/kdevdesigner_part.cpp M kdevdesigner/designer/mainwindowactions.cpp M kdevdesigner/designer/propertyeditor.cpp M lib/widgets/propeditor/propertymachinefactory.cpp |
||
diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui
index db6860f..76abc45 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/kdevdesigner/designer/customwidgeteditor.ui
@@ -433,7 +433,7 @@
<string>Vertical Sizepolicy</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Choose theQt::Vertical size policy</string>
+ <string>Choose the Vertical size policy</string>
</property>
</widget>
<widget class="TQSpinBox" row="3" column="1">
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index 4e5bc09..99f631a 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -454,7 +454,7 @@
pos -= r.topLeft();
np.append( pos );
}
-
+
MoveCommand *mv = new MoveCommand( i18n( "Reparent Widgets" ), this,
lst, op, np, insertParent, pw );
@@ -462,13 +462,13 @@
mainwindow->resetTool();
else
setCursorToAll( CrossCursor, w );
-
+
InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r );
-
+
TQPtrList<Command> commands;
commands.append( mv );
commands.append( cmd );
-
+
MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).arg( w->name() ), this, commands );
commandHistory()->addCommand( mc );
mc->execute();
@@ -1999,7 +1999,7 @@
void FormWindow::layoutHorizontal()
{
TQWidgetList widgets( selectedWidgets() );
- LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay OutQt::Horizontally" ),
+ LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Horizontally" ),
this, mainContainer(), 0, widgets );
clearSelection( FALSE );
commandHistory()->addCommand( cmd );
@@ -2009,7 +2009,7 @@
void FormWindow::layoutVertical()
{
TQWidgetList widgets( selectedWidgets() );
- LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay OutQt::Vertically" ),
+ LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Vertically" ),
this, mainContainer(), 0, widgets );
clearSelection( FALSE );
commandHistory()->addCommand( cmd );
@@ -2019,7 +2019,7 @@
void FormWindow::layoutHorizontalSplit()
{
TQWidgetList widgets( selectedWidgets() );
- LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay OutQt::Horizontally (in splitter)" ),
+ LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay Out Horizontally (in splitter)" ),
this, mainContainer(), 0, widgets );
clearSelection( FALSE );
commandHistory()->addCommand( cmd );
@@ -2029,7 +2029,7 @@
void FormWindow::layoutVerticalSplit()
{
TQWidgetList widgets( selectedWidgets() );
- LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay OutQt::Vertically (in splitter)" ),
+ LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay Out Vertically (in splitter)" ),
this, mainContainer(), 0, widgets );
clearSelection( FALSE );
commandHistory()->addCommand( cmd );
@@ -2063,7 +2063,7 @@
insertedWidgets.find( (TQWidget*)o ) )
widgets.append( (TQWidget*)o );
}
- LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out ChildrenQt::Horizontally" ),
+ LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Children Horizontally" ),
this, mainContainer(), w, widgets );
clearSelection( FALSE );
commandHistory()->addCommand( cmd );
@@ -2084,7 +2084,7 @@
insertedWidgets.find( (TQWidget*)o ) )
widgets.append( (TQWidget*)o );
}
- LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out ChildrenQt::Vertically" ),
+ LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Children Vertically" ),
this, mainContainer(), w, widgets );
clearSelection( FALSE );
commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index ac966d0..8c8917a 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -152,9 +152,9 @@
stateSync(action, m_widget->actionEditVLayout);
action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
stateSync(action, m_widget->actionEditGridLayout);
- action = new TDEAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
+ action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
stateSync(action, m_widget->actionEditSplitHorizontal);
- action = new TDEAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
+ action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
stateSync(action, m_widget->actionEditSplitVertical);
action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
stateSync(action, m_widget->actionEditBreakLayout);
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index 7fa1d1f..c937236 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -330,17 +330,17 @@
connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) );
actionEditAdjustSize->setEnabled( FALSE );
- actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithlayout.png"),
+ actionEditHLayout = new DesignerAction( i18n( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"),
i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 );
actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") );
- actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally" ) );
+ actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) );
connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) );
actionEditHLayout->setEnabled( FALSE );
- actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvlayout.png"),
+ actionEditVLayout = new DesignerAction( i18n( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"),
i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 );
actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") );
- actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically" ) );
+ actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically" ) );
connect( actionEditVLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVertical() ) );
actionEditVLayout->setEnabled( FALSE );
@@ -351,17 +351,17 @@
connect( actionEditGridLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutGrid() ) );
actionEditGridLayout->setEnabled( FALSE );
- actionEditSplitHorizontal = new DesignerAction( i18n( "Lay OutQt::Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"),
- i18n( "Lay OutQt::Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 );
+ actionEditSplitHorizontal = new DesignerAction( i18n( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"),
+ i18n( "Lay Out Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 );
actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") );
- actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally (in Splitter)" ) );
+ actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) );
connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontalSplit() ) );
actionEditSplitHorizontal->setEnabled( FALSE );
- actionEditSplitVertical = new DesignerAction( i18n( "Lay OutQt::Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"),
- i18n( "Lay OutQt::Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 );
+ actionEditSplitVertical = new DesignerAction( i18n( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"),
+ i18n( "Lay Out Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 );
actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") );
- actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically (in Splitter)" ) );
+ actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) );
connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVerticalSplit() ) );
actionEditSplitVertical->setEnabled( FALSE );
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index e7a5d38..8397fc2 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -2382,16 +2382,16 @@
comb->insertItem( CrossPix, i18n("Cross"), TQObject::CrossCursor );
comb->insertItem( WaitPix, i18n("Waiting"), TQObject::WaitCursor );
comb->insertItem( IBeamPix, i18n("iBeam"), TQObject::IbeamCursor );
- comb->insertItem( SizeVPix, i18n("SizeQt::Vertical"), TQObject::SizeVerCursor );
- comb->insertItem( SizeHPix, i18n("SizeQt::Horizontal"), TQObject::SizeHorCursor );
+ comb->insertItem( SizeVPix, i18n("Size Vertical"), TQObject::SizeVerCursor );
+ comb->insertItem( SizeHPix, i18n("Size Horizontal"), TQObject::SizeHorCursor );
comb->insertItem( SizeFPix, i18n("Size Slash"), TQObject::SizeBDiagCursor );
comb->insertItem( SizeBPix, i18n("Size Backslash"), TQObject::SizeFDiagCursor );
comb->insertItem( SizeAllPix, i18n("Size All"), TQObject::SizeAllCursor );
cur = TQBitmap( 25, 25, 1 );
cur.setMask( cur );
comb->insertItem( cur, i18n("Blank"), TQObject::BlankCursor );
- comb->insertItem( VSplitPix, i18n("SplitQt::Vertical"), TQObject::SplitVCursor );
- comb->insertItem( HSplitPix, i18n("SplitQt::Horizontal"), TQObject::SplitHCursor );
+ comb->insertItem( VSplitPix, i18n("Split Vertical"), TQObject::SplitVCursor );
+ comb->insertItem( HSplitPix, i18n("Split Horizontal"), TQObject::SplitHCursor );
comb->insertItem( HandPix, i18n("Pointing Hand"), TQObject::PointingHandCursor );
comb->insertItem( NoPix, i18n("Forbidden"), TQObject::ForbiddenCursor );
diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp
index 882964b..389fc38 100644
--- a/lib/widgets/propeditor/propertymachinefactory.cpp
+++ b/lib/widgets/propeditor/propertymachinefactory.cpp
@@ -151,7 +151,7 @@
spValues[i18n("Expanding")] = TQSizePolicy::Expanding;
spValues[i18n("Minimum Expanding")] = TQSizePolicy::MinimumExpanding;
spValues[i18n("Ignored")] = TQSizePolicy::Ignored;
-
+
Machine *mach = new Machine(new PSizePolicyEdit(property, spValues));
property->details.append(ChildProperty(property, i18n("hSizeType"), ChildProperty::SizePolicy_HorData, spValues, i18n("Horizontal Size Type")));
property->details.append(ChildProperty(property, i18n("vSizeType"), ChildProperty::SizePolicy_VerData, spValues, i18n("Vertical Size Type")));
@@ -167,14 +167,14 @@
spValues[i18n("Cross")] = TQt::CrossCursor;
spValues[i18n("Waiting")] = TQt::WaitCursor;
spValues[i18n("iBeam")] = TQt::IbeamCursor;
- spValues[i18n("SizeQt::Vertical")] = TQt::SizeVerCursor;
- spValues[i18n("SizeQt::Horizontal")] = TQt::SizeHorCursor;
+ spValues[i18n("Size Vertical")] = TQt::SizeVerCursor;
+ spValues[i18n("Size Horizontal")] = TQt::SizeHorCursor;
spValues[i18n("Size Slash")] = TQt::SizeBDiagCursor;
spValues[i18n("Size Backslash")] = TQt::SizeFDiagCursor;
spValues[i18n("Size All")] = TQt::SizeAllCursor;
spValues[i18n("Blank")] = TQt::BlankCursor;
- spValues[i18n("SplitQt::Vertical")] = TQt::SplitVCursor;
- spValues[i18n("SplitQt::Horizontal")] = TQt::SplitHCursor;
+ spValues[i18n("Split Vertical")] = TQt::SplitVCursor;
+ spValues[i18n("Split Horizontal")] = TQt::SplitHCursor;
spValues[i18n("Pointing Hand")] = TQt::PointingHandCursor;
spValues[i18n("Forbidden")] = TQt::ForbiddenCursor;
spValues[i18n("What's this")] = TQt::WhatsThisCursor;
|
||