r20517 by craig -

scribus-commit scribus-commit at lists.scribus.net
Mon Nov 2 11:54:05 UTC 2015


Author: craig
Date: Mon Nov  2 11:54:05 2015
New Revision: 20517

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20517
Log:
#13455: Fix resized widget issue, and rearrange pstyle dialog a little and fix incorrect strings

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

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20517&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp	Mon Nov  2 11:54:05 2015
@@ -174,17 +174,17 @@
 
 	//parEffectsBox->setTitle(tr("Paragraph Effects"));
 	bulletBox->setTitle(           tr("Bullets"));
-	bulletCharLabel->setText(      tr("Bullet Char/String"));
-	bulletCharTableButton->setText(tr("Char Table"));
-
-	numBox->setTitle(       tr("Numeration"));
-	numLevelLabel->setText( tr("Level"));
+	bulletCharLabel->setText(      tr("Bullet Character(s):"));
+	bulletCharTableButton->setText(tr("Character Table"));
+
+	numBox->setTitle(       tr("Numbering:"));
+	numLevelLabel->setText( tr("Level:"));
 	numNewLabel->setText( tr("Create New Set:"));
-	numFormatLabel->setText(tr("Numbering Style"));
-	numStartLabel->setText( tr("Start with"));
-	numPrefixLabel->setText(tr("Prefix"));
-	numSuffixLabel->setText(tr("Suffix"));
-	numRestartLabel->setText( tr("Restart"));
+	numFormatLabel->setText(tr("Numbering Style:"));
+	numStartLabel->setText( tr("Start with:"));
+	numPrefixLabel->setText(tr("Prefix:"));
+	numSuffixLabel->setText(tr("Suffix:"));
+	numRestartLabel->setText( tr("Restart:"));
 	numRestartOtherBox->setText( tr("Restart after other format"));
 	numRestartHigherBox->setText(tr("Restart after higher level"));
 
@@ -202,6 +202,7 @@
 	parEffectIndentBox->setText(tr("AutoIndent"));
 	parentParEffectsButton->setText(tr("Use Parent`s Values"));
 
+/* #13455 stop making the font 2ce as big
 	QFont font1;
 	if (font1.pointSize())
 		font1.setPointSize(font1.pointSize() *2);
@@ -209,7 +210,7 @@
 		font1.setPixelSize(font1.pixelSize() *2);
 	((QComboBox*) bulletStrEdit)->setFont(font1);
 	(bulletStrEdit->lineEdit())->setFont(font1);
-
+*/
 	tabsBox->setTitle(tr("Tabulators and Indentation"));
 	tabWidget->setTabText(0, tr("Properties"));
 	tabWidget->setTabText(1, tr("Paragraph Effects"));

Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20517&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui	(original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui	Mon Nov  2 11:54:05 2015
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>695</width>
-    <height>522</height>
+    <height>528</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -627,7 +627,7 @@
             <item>
              <widget class="QLabel" name="bulletCharLabel">
               <property name="text">
-               <string>Bullet Char/String</string>
+               <string>Bullet Character(s)</string>
               </property>
              </widget>
             </item>
@@ -657,7 +657,7 @@
               </property>
               <property name="sizeHint" stdset="0">
                <size>
-                <width>40</width>
+                <width>20</width>
                 <height>20</height>
                </size>
               </property>
@@ -672,7 +672,7 @@
                </sizepolicy>
               </property>
               <property name="text">
-               <string>Char Table</string>
+               <string>Character Table</string>
               </property>
               <property name="checkable">
                <bool>true</bool>
@@ -686,7 +686,7 @@
               </property>
               <property name="sizeHint" stdset="0">
                <size>
-                <width>40</width>
+                <width>20</width>
                 <height>20</height>
                </size>
               </property>
@@ -706,7 +706,7 @@
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Numeration</string>
+          <string>Numbering</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -737,7 +737,7 @@
             <item>
              <widget class="QLabel" name="numLevelLabel">
               <property name="text">
-               <string>Level</string>
+               <string>Level:</string>
               </property>
              </widget>
             </item>
@@ -774,7 +774,7 @@
             <item>
              <widget class="QLabel" name="numFormatLabel">
               <property name="text">
-               <string>Nums Format</string>
+               <string>Numbering Style:</string>
               </property>
               <property name="buddy">
                <cstring>numFormatCombo</cstring>
@@ -794,7 +794,7 @@
             <item>
              <widget class="QLabel" name="numStartLabel">
               <property name="text">
-               <string>Start with</string>
+               <string>Start with:</string>
               </property>
              </widget>
             </item>
@@ -809,41 +809,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="numPrefixLabel">
-              <property name="text">
-               <string>Prefix</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="numPrefix"/>
-            </item>
-            <item>
-             <widget class="QLabel" name="numSuffixLabel">
-              <property name="text">
-               <string>Suffix</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="numSuffix"/>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_8">
-            <item>
-             <widget class="QLabel" name="numRestartLabel">
-              <property name="text">
-               <string>Restart</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="SMScComboBox" name="numRestartCombo"/>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
+             <spacer name="horizontalSpacer_8">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
@@ -855,12 +821,95 @@
               </property>
              </spacer>
             </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <item>
+             <widget class="QLabel" name="numPrefixLabel">
+              <property name="text">
+               <string>Prefix:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="numPrefix"/>
+            </item>
+            <item>
+             <widget class="QLabel" name="numSuffixLabel">
+              <property name="text">
+               <string>Suffix:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="numSuffix"/>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_9">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_8">
+            <item>
+             <widget class="QLabel" name="numRestartLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Restart</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="SMScComboBox" name="numRestartCombo"/>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
             <item>
              <widget class="SMCheckBox" name="numRestartOtherBox">
               <property name="text">
                <string>Restart after other format</string>
               </property>
              </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
             </item>
             <item>
              <widget class="SMCheckBox" name="numRestartHigherBox">
@@ -936,6 +985,12 @@
         <layout class="QHBoxLayout" name="horizontalLayout_12">
          <item>
           <widget class="QLabel" name="parEffectCharStyleComboLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
             <string>Character Style for Effect:</string>
            </property>
@@ -951,7 +1006,7 @@
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>40</width>
+             <width>20</width>
              <height>20</height>
             </size>
            </property>
@@ -959,6 +1014,12 @@
          </item>
          <item>
           <widget class="QLabel" name="distFromTextLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
             <string>Distance from Text:</string>
            </property>
@@ -984,7 +1045,7 @@
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>40</width>
+             <width>20</width>
              <height>20</height>
             </size>
            </property>
@@ -1166,8 +1227,6 @@
   <tabstop>numNewLineEdit</tabstop>
   <tabstop>numFormatCombo</tabstop>
   <tabstop>numStartSpin</tabstop>
-  <tabstop>numPrefix</tabstop>
-  <tabstop>numSuffix</tabstop>
   <tabstop>numRestartCombo</tabstop>
   <tabstop>numRestartOtherBox</tabstop>
   <tabstop>numRestartHigherBox</tabstop>




More information about the scribus-commit mailing list