r24606 by craig - #16370: Rearrange Typography panel in Preferences dialog (bubu)

scribus-commit scribus-commit at lists.scribus.net
Wed Apr 7 20:13:08 UTC 2021


Author: craig
Date: Wed Apr  7 20:13:07 2021
New Revision: 24606

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24606
Log:
#16370: Rearrange Typography panel in Preferences dialog (bubu)

Modified:
    trunk/Scribus/scribus/sclayer.cpp
    trunk/Scribus/scribus/ui/prefs_typographybase.ui

Modified: trunk/Scribus/scribus/sclayer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24606&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp	(original)
+++ trunk/Scribus/scribus/sclayer.cpp	Wed Apr  7 20:13:07 2021
@@ -58,11 +58,16 @@
 bool ScLayer::operator== (const ScLayer& other) const
 {
 	// ignore markerColor?
-	return Name == other.Name && ID == other.ID && Level == other.Level &&
-		   isPrintable == other.isPrintable && isViewable  == other.isViewable &&
-		   flowControl == other.flowControl && outlineMode == other.outlineMode &&
-		   transparency == other.transparency && isEditable == other.isEditable &&
-		   blendMode == other.blendMode;
+	return Name == other.Name &&
+		ID == other.ID &&
+		Level == other.Level &&
+		isPrintable == other.isPrintable &&
+		isViewable  == other.isViewable &&
+		flowControl == other.flowControl &&
+		outlineMode == other.outlineMode &&
+		transparency == other.transparency &&
+		isEditable == other.isEditable &&
+		blendMode == other.blendMode;
 }
 
 int ScLayers::getMaxID()

Modified: trunk/Scribus/scribus/ui/prefs_typographybase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24606&path=/trunk/Scribus/scribus/ui/prefs_typographybase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_typographybase.ui	(original)
+++ trunk/Scribus/scribus/ui/prefs_typographybase.ui	Wed Apr  7 20:13:07 2021
@@ -45,20 +45,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>648</width>
-        <height>624</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
        <item>
         <widget class="QLabel" name="label_2">
          <property name="font">
@@ -73,7 +62,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_4">
+        <widget class="Line" name="line_3">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -156,7 +145,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_3">
+        <widget class="Line" name="line_2">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -225,6 +214,73 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <widget class="QLabel" name="label_14">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Small Caps</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_5">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QFormLayout" name="formLayout_5">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+         </property>
+         <property name="formAlignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_15">
+           <property name="text">
+            <string>Scaling:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="smallcapsScalingSpinBox">
+           <property name="suffix">
+            <string> %</string>
+           </property>
+           <property name="maximum">
+            <number>100</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>9</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QLabel" name="label_4">
          <property name="font">
@@ -239,14 +295,14 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_2">
+        <widget class="Line" name="line_1">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
        <item>
-        <layout class="QFormLayout" name="formLayout">
+        <layout class="QFormLayout" name="formLayout_1">
          <property name="fieldGrowthPolicy">
           <enum>QFormLayout::FieldsStayAtSizeHint</enum>
          </property>
@@ -337,7 +393,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_5">
+        <widget class="Line" name="line_4">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -400,69 +456,6 @@
            </property>
            <property name="maximum">
             <double>100.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_14">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Small Caps</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="Line" name="line_6">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout_5">
-         <property name="fieldGrowthPolicy">
-          <enum>QFormLayout::FieldsStayAtSizeHint</enum>
-         </property>
-         <property name="formAlignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_15">
-           <property name="text">
-            <string>Scaling:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QSpinBox" name="smallcapsScalingSpinBox">
-           <property name="suffix">
-            <string> %</string>
-           </property>
-           <property name="maximum">
-            <number>100</number>
            </property>
           </widget>
          </item>
@@ -498,7 +491,7 @@
         </widget>
        </item>
        <item>
-        <widget class="Line" name="line_7">
+        <widget class="Line" name="line_6">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -534,36 +527,35 @@
          </item>
         </layout>
        </item>
-       <item>
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>34</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
-     </widget>
-    </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>34</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>scrollArea</tabstop>
   <tabstop>subscriptDisplacementSpinBox</tabstop>
   <tabstop>subscriptScalingSpinBox</tabstop>
   <tabstop>superscriptDisplacementSpinBox</tabstop>
   <tabstop>superscriptScalingSpinBox</tabstop>
+  <tabstop>smallcapsScalingSpinBox</tabstop>
   <tabstop>underlineDisplacementSpinBox</tabstop>
   <tabstop>underlineLineWidthSpinBox</tabstop>
   <tabstop>strikeoutDisplacementSpinBox</tabstop>
   <tabstop>strikeoutLineWidthSpinBox</tabstop>
-  <tabstop>smallcapsScalingSpinBox</tabstop>
   <tabstop>automaticLineSpacingSpinBox</tabstop>
  </tabstops>
  <resources/>




More information about the scribus-commit mailing list