r24432 by jghali - Make UI related to numerated lists in style manager a bit less ugly

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 26 23:01:52 UTC 2021


Author: jghali
Date: Tue Jan 26 23:01:52 2021
New Revision: 24432

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24432
Log:
Make UI related to numerated lists in style manager a bit less ugly

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

Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24432&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui	(original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui	Tue Jan 26 23:01:52 2021
@@ -879,36 +879,56 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_9">
-            <item>
+           <layout class="QGridLayout" name="gridLayout_2">
+            <item row="2" column="2">
+             <widget class="QLabel" name="numStartLabel">
+              <property name="text">
+               <string>Start with:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="3">
+             <widget class="QLineEdit" name="numSuffix"/>
+            </item>
+            <item row="0" column="0">
              <widget class="QLabel" name="numComboLabel">
               <property name="text">
                <string>Set:</string>
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="SMScComboBox" name="numComboBox">
-              <property name="currentIndex">
-               <number>-1</number>
-              </property>
-              <property name="minimumContentsLength">
-               <number>10</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="numLevelLabel">
-              <property name="text">
-               <string>Level:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="SMSpinBox" name="numLevelSpin"/>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_4">
+            <item row="0" column="4">
+             <widget class="QLineEdit" name="numNewLineEdit"/>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="numFormatLabel">
+              <property name="text">
+               <string>Numbering Style:</string>
+              </property>
+              <property name="buddy">
+               <cstring>numFormatCombo</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="2">
+             <widget class="QLabel" name="numSuffixLabel">
+              <property name="text">
+               <string>Suffix:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="3">
+             <widget class="SMSpinBox" name="numStartSpin">
+              <property name="maximum">
+               <number>99999</number>
+              </property>
+              <property name="value">
+               <number>1</number>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <spacer name="horizontalSpacer_10">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
@@ -920,31 +940,41 @@
               </property>
              </spacer>
             </item>
-            <item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="numPrefixLabel">
+              <property name="text">
+               <string>Prefix:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="SMScComboBox" name="numComboBox">
+              <property name="currentIndex">
+               <number>-1</number>
+              </property>
+              <property name="minimumContentsLength">
+               <number>10</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="SMSpinBox" name="numLevelSpin"/>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="numLevelLabel">
+              <property name="text">
+               <string>Level:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
              <widget class="QLabel" name="numNewLabel">
               <property name="text">
                <string>Create New Set:</string>
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QLineEdit" name="numNewLineEdit"/>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_10">
-            <item>
-             <widget class="QLabel" name="numFormatLabel">
-              <property name="text">
-               <string>Numbering Style:</string>
-              </property>
-              <property name="buddy">
-               <cstring>numFormatCombo</cstring>
-              </property>
-             </widget>
-            </item>
-            <item>
+            <item row="1" column="1">
              <widget class="SMNumFormatCombo" name="numFormatCombo">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -954,132 +984,68 @@
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QLabel" name="numStartLabel">
-              <property name="text">
-               <string>Start with:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="SMSpinBox" name="numStartSpin">
-              <property name="maximum">
-               <number>99999</number>
-              </property>
-              <property name="value">
-               <number>1</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_8">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </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>
+            <item row="3" column="1">
              <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">
-              <property name="text">
-               <string>Restart after higher level</string>
-              </property>
-             </widget>
+            <item row="4" column="0" colspan="5">
+             <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">
+                <property name="text">
+                 <string>Restart after higher level</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
            </layout>
           </item>
@@ -1399,11 +1365,6 @@
   <tabstop>bulletStrEdit</tabstop>
   <tabstop>bulletCharTableButton</tabstop>
   <tabstop>numBox</tabstop>
-  <tabstop>numComboBox</tabstop>
-  <tabstop>numLevelSpin</tabstop>
-  <tabstop>numNewLineEdit</tabstop>
-  <tabstop>numFormatCombo</tabstop>
-  <tabstop>numStartSpin</tabstop>
   <tabstop>numRestartCombo</tabstop>
   <tabstop>numRestartOtherBox</tabstop>
   <tabstop>numRestartHigherBox</tabstop>




More information about the scribus-commit mailing list