r20489 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sat Oct 24 11:43:12 UTC 2015


Author: jghali
Date: Sat Oct 24 11:43:12 2015
New Revision: 20489

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20489
Log: (empty)

Modified:
    trunk/Scribus/scribus/ui/aligndistribute.cpp
    trunk/Scribus/scribus/ui/aligndistribute.ui

Modified: trunk/Scribus/scribus/ui/aligndistribute.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20489&path=/trunk/Scribus/scribus/ui/aligndistribute.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.cpp	(original)
+++ trunk/Scribus/scribus/ui/aligndistribute.cpp	Sat Oct 24 11:43:12 2015
@@ -89,10 +89,8 @@
 
 void AlignDistributePalette::languageChange()
 {
-	setWindowTitle( tr( "Align and Distribute" ) );
-	tabWidget->setTabText(0, tr( "Align"));
-	tabWidget->setTabText(1, tr( "Distribute"));
-	alignRelativeToLabel->setText( tr( "&Relative to:" ) );
+	retranslateUi(this);
+
 	int alignComboValue=alignRelativeToCombo->currentIndex();
 	alignRelativeToCombo->clear();
 	alignRelativeToCombo->addItem( tr( "First Selected" ) );
@@ -104,70 +102,43 @@
 	alignRelativeToCombo->setCurrentIndex(alignComboValue);
 	alignRelativeToCombo->setToolTip( tr( "<qt>Align relative to the:<ul><li>First selected item</li><li>Second Selected Item</li><li>The current page</li><li>The margins of the current page</li><li>A Guide</li><li>The selection</ul></qt>" ) );
 	alignToChanged(alignComboValue);
-	alignMoveOrResizeLabel->setText( tr( "&Align Sides By:" ) );
+
 	int alignMethodValue=alignMoveOrResizeCombo->currentIndex();
 	alignMoveOrResizeCombo->clear();
 	alignMoveOrResizeCombo->addItem( tr("Move") );
 	alignMoveOrResizeCombo->addItem( tr("Resize") );
 	alignMoveOrResizeCombo->setToolTip( tr( "<qt>When aligning one side of an item do one of the following:<ul><li>Always move the other side too (preserve existing width and height)</li><li>Keep the other side fixed (resize the item instead of moving it) whenever possible</li></ul></qt>" ));
 	alignMethodChanged(alignMethodValue);
+
 	alignGuideLineEdit->setToolTip( tr( "The location of the selected guide to align to" ) );
-	alignLeftOutToolButton->setText( QString::null );
 	alignLeftOutToolButton->setToolTip( tr( "Align right sides of items to left side of anchor" ) );
-	alignRightOutToolButton->setText( QString::null );
 	alignRightOutToolButton->setToolTip( tr( "Align left sides of items to right side of anchor" ) );
-	alignBottomInToolButton->setText( QString::null );
 	alignBottomInToolButton->setToolTip( tr( "Align bottoms" ) );
-	alignRightInToolButton->setText( QString::null );
 	alignRightInToolButton->setToolTip( tr( "Align right sides" ) );
-	alignBottomOutToolButton->setText( QString::null );
 	alignBottomOutToolButton->setToolTip( tr( "Align tops of items to bottom of anchor" ) );
-	alignCenterHorToolButton->setText( QString::null );
 	alignCenterHorToolButton->setToolTip( tr( "Center on vertical axis" ) );
-	alignLeftInToolButton->setText( QString::null );
 	alignLeftInToolButton->setToolTip( tr( "Align left sides" ) );
-	alignCenterVerToolButton->setText( QString::null );
 	alignCenterVerToolButton->setToolTip( tr( "Center on horizontal axis" ) );
-	alignTopOutToolButton->setText( QString::null );
 	alignTopOutToolButton->setToolTip( tr( "Align bottoms of items to top of anchor" ) );
-	alignTopInToolButton->setText( QString::null );
 	alignTopInToolButton->setToolTip( tr( "Align tops" ) );
-	
-	alignGuideLabel->setText( tr( "&Selected Guide:" ) );
-	
-	distributeDistHToolButton->setText( QString::null );
+		
 	distributeDistHToolButton->setToolTip( tr( "Make horizontal gaps between items equal" ) );
-	distributeDistValueHToolButton->setText( QString::null );
 	distributeDistValueHToolButton->setToolTip( tr( "Make horizontal gaps between items equal to the value specified" ) );
 	
-	distributeRightToolButton->setText( QString::null );
 	distributeRightToolButton->setToolTip( tr( "Distribute right sides equidistantly" ) );
-	distributeBottomToolButton->setText( QString::null );
 	distributeBottomToolButton->setToolTip( tr( "Distribute bottoms equidistantly" ) );
-	distributeCenterHToolButton->setText( QString::null );
 	distributeCenterHToolButton->setToolTip( tr( "Distribute centers equidistantly horizontally" ) );
-	distributeDistVToolButton->setText( QString::null );
 	distributeDistVToolButton->setToolTip( tr( "Make vertical gaps between items equal" ) );
-	distributeDistValueVToolButton->setText( QString::null );
 	distributeDistValueVToolButton->setToolTip( tr( "Make vertical gaps between items equal to the value specified" ) );
-	distributeLeftToolButton->setText( QString::null );
 	distributeLeftToolButton->setToolTip( tr( "Distribute left sides equidistantly" ) );
-	distributeCenterVToolButton->setText( QString::null );
 	distributeCenterVToolButton->setToolTip( tr( "Distribute centers equidistantly vertically" ) );
-	distributeTopToolButton->setText( QString::null );
 	distributeTopToolButton->setToolTip( tr( "Distribute tops equidistantly" ) );
-	distributeAcrossPageToolButton->setText( QString::null );
 	distributeAcrossPageToolButton->setToolTip( tr( "Make horizontal gaps between items and sides of page equal" ) );
-	distributeDownPageToolButton->setText( QString::null );
 	distributeDownPageToolButton->setToolTip( tr( "Make vertical gaps between items and the top and bottom of page equal" ) );
-	distributeAcrossMarginsToolButton->setText( QString::null );
 	distributeAcrossMarginsToolButton->setToolTip( tr( "Make horizontal gaps between items and sides of page margins equal" ) );
-	distributeDownMarginsToolButton->setText( QString::null );
 	distributeDownMarginsToolButton->setToolTip( tr( "Make vertical gaps between items and the top and bottom of page margins equal" ) );
 
-	distributeDistLabel->setText( tr( "&Distance:" ) );
 	distributeDistSpinBox->setToolTip( tr( "Distribute the items with the distance specified" ) );
-
 	reverseDistributionCheckBox->setToolTip( tr("When distributing by a set distance, reverse the direction of the distribution of items") );
 	
 	guideInfoTextNone = tr("None Selected");

Modified: trunk/Scribus/scribus/ui/aligndistribute.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20489&path=/trunk/Scribus/scribus/ui/aligndistribute.ui
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.ui	(original)
+++ trunk/Scribus/scribus/ui/aligndistribute.ui	Sat Oct 24 11:43:12 2015
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>269</width>
-    <height>304</height>
+    <height>308</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,18 +25,6 @@
         <string>Align</string>
        </attribute>
        <layout class="QVBoxLayout">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
         <item>
          <layout class="QHBoxLayout" name="_2">
           <item>
@@ -148,7 +136,7 @@
             <item row="1" column="3">
              <widget class="QToolButton" name="alignBottomInToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -161,7 +149,7 @@
             <item row="1" column="1">
              <widget class="QToolButton" name="alignTopInToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -174,7 +162,7 @@
             <item row="0" column="1">
              <widget class="QToolButton" name="alignLeftInToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -187,7 +175,7 @@
             <item row="0" column="3">
              <widget class="QToolButton" name="alignRightInToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -200,7 +188,7 @@
             <item row="1" column="4">
              <widget class="QToolButton" name="alignBottomOutToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -213,7 +201,7 @@
             <item row="1" column="0">
              <widget class="QToolButton" name="alignTopOutToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -226,7 +214,7 @@
             <item row="1" column="2">
              <widget class="QToolButton" name="alignCenterVerToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -239,7 +227,7 @@
             <item row="0" column="0">
              <widget class="QToolButton" name="alignLeftOutToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -252,7 +240,7 @@
             <item row="0" column="4">
              <widget class="QToolButton" name="alignRightOutToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -265,7 +253,7 @@
             <item row="0" column="2">
              <widget class="QToolButton" name="alignCenterHorToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -341,7 +329,7 @@
             <item row="0" column="3">
              <widget class="QToolButton" name="distributeDistHToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -354,7 +342,7 @@
             <item row="1" column="2">
              <widget class="QToolButton" name="distributeTopToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -367,7 +355,7 @@
             <item row="1" column="1">
              <widget class="QToolButton" name="distributeCenterVToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -380,7 +368,7 @@
             <item row="0" column="2">
              <widget class="QToolButton" name="distributeRightToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -393,7 +381,7 @@
             <item row="3" column="0">
              <widget class="QToolButton" name="toolButtonDummy1">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -409,7 +397,7 @@
                <bool>true</bool>
               </property>
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -422,7 +410,7 @@
             <item row="0" column="0">
              <widget class="QToolButton" name="distributeLeftToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -438,7 +426,7 @@
                <bool>true</bool>
               </property>
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -451,7 +439,7 @@
             <item row="3" column="1">
              <widget class="QToolButton" name="distributeDistValueHToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -467,7 +455,7 @@
                <bool>true</bool>
               </property>
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -480,7 +468,7 @@
             <item row="0" column="1">
              <widget class="QToolButton" name="distributeCenterHToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -493,7 +481,7 @@
             <item row="3" column="3">
              <widget class="QToolButton" name="toolButtonDummy2">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -509,7 +497,7 @@
                <bool>true</bool>
               </property>
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -522,7 +510,7 @@
             <item row="3" column="2">
              <widget class="QToolButton" name="distributeDistValueVToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -535,7 +523,7 @@
             <item row="1" column="3">
              <widget class="QToolButton" name="distributeDistVToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -548,7 +536,7 @@
             <item row="1" column="0">
              <widget class="QToolButton" name="distributeBottomToolButton">
               <property name="text">
-               <string>...</string>
+               <string/>
               </property>
               <property name="iconSize">
                <size>
@@ -728,7 +716,7 @@
           <item>
            <widget class="QToolButton" name="swapLeftToolButton">
             <property name="text">
-             <string>...</string>
+             <string/>
             </property>
             <property name="iconSize">
              <size>
@@ -741,7 +729,7 @@
           <item>
            <widget class="QToolButton" name="swapRightToolButton">
             <property name="text">
-             <string>...</string>
+             <string/>
             </property>
             <property name="iconSize">
              <size>




More information about the scribus-commit mailing list