r24533 by jghali - #16494: Unify margins and spacing for properties palette, set 3 <bubu>

scribus-commit scribus-commit at lists.scribus.net
Sat Feb 27 22:30:12 UTC 2021


Author: jghali
Date: Sat Feb 27 22:30:12 2021
New Revision: 24533

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24533
Log:
#16494: Unify margins and spacing for properties palette, set 3 <bubu>

Modified:
    trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
    trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
    trunk/Scribus/scribus/ui/propertywidget_distance.cpp
    trunk/Scribus/scribus/ui/propertywidget_distancebase.ui
    trunk/Scribus/scribus/ui/propertywidget_flop.cpp
    trunk/Scribus/scribus/ui/propertywidget_flopbase.ui
    trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
    trunk/Scribus/scribus/ui/propertywidget_fontfeaturesbase.ui
    trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
    trunk/Scribus/scribus/ui/propertywidget_hyphenationbase.ui
    trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
    trunk/Scribus/scribus/ui/propertywidget_optmarginsbase.ui
    trunk/Scribus/scribus/ui/propertywidget_orphans.cpp
    trunk/Scribus/scribus/ui/propertywidget_orphansbase.ui
    trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
    trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
    trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
    trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui
    trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
    trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui

Modified: trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_textbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_textbase.ui	Sat Feb 27 22:30:12 2021
@@ -15,25 +15,28 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="leftMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="FontComboH" name="fonts" native="true"/>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item>
       <widget class="QLabel" name="fontSizeLabel">
        <property name="sizePolicy">
@@ -80,6 +83,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item>
       <widget class="QLabel" name="lineSpacingLabel">
        <property name="sizePolicy">
@@ -129,6 +135,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item alignment="Qt::AlignLeft">
       <widget class="DirectionSelect" name="textDirection" native="true"/>
      </item>
@@ -161,7 +170,11 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_6"/>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <property name="spacing">
+      <number>3</number>
+     </property>
+    </layout>
    </item>
    <item>
     <widget class="Line" name="line">
@@ -172,6 +185,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item>
       <widget class="QLabel" name="paraStyleLabel">
        <property name="sizePolicy">
@@ -225,6 +241,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item>
       <widget class="QLabel" name="charStyleLabel">
        <property name="sizePolicy">

Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp	Sat Feb 27 22:30:12 2021
@@ -19,9 +19,6 @@
 PropertyWidget_Advanced::PropertyWidget_Advanced(QWidget* parent) : QFrame(parent)
 {
 	setupUi(this);
-
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 
 	layout()->setAlignment(Qt::AlignLeft);
 

Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp	Sat Feb 27 22:30:12 2021
@@ -23,9 +23,6 @@
 PropertyWidget_Distance::PropertyWidget_Distance(QWidget* parent) : QFrame(parent)
 {
 	setupUi(this);
-
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 
 	layout()->setAlignment(Qt::AlignTop);
 

Modified: trunk/Scribus/scribus/ui/propertywidget_distancebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_distancebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distancebase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_distancebase.ui	Sat Feb 27 22:30:12 2021
@@ -6,34 +6,28 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>187</width>
-    <height>223</height>
+    <width>223</width>
+    <height>232</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <property name="spacing">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="verticalAlignLabel">

Modified: trunk/Scribus/scribus/ui/propertywidget_flop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_flop.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_flop.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_flop.cpp	Sat Feb 27 22:30:12 2021
@@ -14,10 +14,8 @@
 {
 	setupUi(this);
 
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 	layout()->setAlignment(Qt::AlignTop);
-	
+
 	flopRealHeight->setChecked(true);
 
 	flopGroup->setId(flopRealHeight,  RealHeightID);

Modified: trunk/Scribus/scribus/ui/propertywidget_flopbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_flopbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_flopbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_flopbase.ui	Sat Feb 27 22:30:12 2021
@@ -7,19 +7,28 @@
     <x>0</x>
     <y>0</y>
     <width>218</width>
-    <height>126</height>
+    <height>107</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>3</number>
+   </property>
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
+   </property>
    <item>
     <widget class="QRadioButton" name="flopRealHeight">
      <property name="toolTip">

Modified: trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	Sat Feb 27 22:30:12 2021
@@ -17,14 +17,12 @@
 PropertyWidget_FontFeatures::PropertyWidget_FontFeatures(QWidget* parent) : QFrame(parent)
 {
 	m_item = nullptr;
-	m_ScMW = nullptr;
-	setupUi(this);
-
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
-	layout()->setAlignment(Qt::AlignTop);
-
-	initWidgets();
+	m_ScMW = nullptr;
+	setupUi(this);
+
+	layout()->setAlignment(Qt::AlignTop);
+
+	initWidgets();
 	languageChange();
 }
 

Modified: trunk/Scribus/scribus/ui/propertywidget_fontfeaturesbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_fontfeaturesbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_fontfeaturesbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_fontfeaturesbase.ui	Sat Feb 27 22:30:12 2021
@@ -7,19 +7,28 @@
     <x>0</x>
     <y>0</y>
     <width>509</width>
-    <height>1151</height>
+    <height>837</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>3</number>
+   </property>
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
+   </property>
    <item>
     <widget class="QCheckBox" name="CommonCheck">
      <property name="toolTip">
@@ -457,6 +466,21 @@
       <string>Stylistic sets</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
+      <property name="spacing">
+       <number>3</number>
+      </property>
       <item row="0" column="0">
        <widget class="QCheckBox" name="StyleSet01">
         <property name="text">

Modified: trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp	Sat Feb 27 22:30:12 2021
@@ -24,8 +24,6 @@
 
 	setupUi(this);
 
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 	hyphenCharLineEdit->setMaxLength(1);
 	layout()->setAlignment( Qt::AlignTop );
 	languageChange();

Modified: trunk/Scribus/scribus/ui/propertywidget_hyphenationbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_hyphenationbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_hyphenationbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_hyphenationbase.ui	Sat Feb 27 22:30:12 2021
@@ -6,37 +6,34 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>304</width>
-    <height>152</height>
+    <width>305</width>
+    <height>95</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="leftMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>5</number>
+    <number>3</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -78,6 +75,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item>
       <widget class="QLabel" name="label_3">
        <property name="text">
@@ -97,6 +97,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item>
       <widget class="QLabel" name="label_4">
        <property name="text">

Modified: trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp	Sat Feb 27 22:30:12 2021
@@ -22,8 +22,6 @@
 
 	setupUi(this);
 
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 	layout()->setAlignment(Qt::AlignTop);
 
 	languageChange();

Modified: trunk/Scribus/scribus/ui/propertywidget_optmarginsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_optmarginsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmarginsbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmarginsbase.ui	Sat Feb 27 22:30:12 2021
@@ -7,24 +7,27 @@
     <x>0</x>
     <y>0</y>
     <width>210</width>
-    <height>122</height>
+    <height>137</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
-    <number>2</number>
+    <number>3</number>
    </property>
-   <property name="margin">
-    <number>5</number>
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
    </property>
    <item>
     <widget class="QRadioButton" name="optMarginRadioNone">

Modified: trunk/Scribus/scribus/ui/propertywidget_orphans.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_orphans.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_orphans.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_orphans.cpp	Sat Feb 27 22:30:12 2021
@@ -14,8 +14,6 @@
 {
 	setupUi(this);
 
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 	layout()->setAlignment(Qt::AlignTop);
 	keepLinesStart->setDecimals(0);
 	keepLinesEnd->setDecimals(0);

Modified: trunk/Scribus/scribus/ui/propertywidget_orphansbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_orphansbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_orphansbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_orphansbase.ui	Sat Feb 27 22:30:12 2021
@@ -6,14 +6,29 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>211</width>
-    <height>130</height>
+    <width>258</width>
+    <height>113</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
+   </property>
+   <property name="spacing">
+    <number>3</number>
+   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="keepLabelStart">
      <property name="toolTip">

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp	Sat Feb 27 22:30:12 2021
@@ -25,8 +25,7 @@
 PropertyWidget_ParEffect::PropertyWidget_ParEffect(QWidget *parent) : QFrame(parent)
 {
 	setupUi(this);
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
+
 	layout()->setAlignment(Qt::AlignTop);
 
 	languageChange();

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui	Sat Feb 27 22:30:12 2021
@@ -7,13 +7,28 @@
     <x>0</x>
     <y>0</y>
     <width>354</width>
-    <height>442</height>
+    <height>390</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>3</number>
+   </property>
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
+   </property>
    <item>
     <widget class="QComboBox" name="peCombo"/>
    </item>
@@ -23,6 +38,21 @@
       <string>Drop Caps</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="dropCapLinesLabel">
         <property name="toolTip">
@@ -62,6 +92,21 @@
       <string>Bulleted List</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
+      <property name="spacing">
+       <number>3</number>
+      </property>
       <item row="0" column="1">
        <widget class="QComboBox" name="bulletStrEdit">
         <property name="sizePolicy">
@@ -119,8 +164,26 @@
       <string>Numbered List</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
+      <property name="spacing">
+       <number>3</number>
+      </property>
       <item row="3" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="spacing">
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="numLevelLabel">
           <property name="text">
@@ -172,6 +235,9 @@
       </item>
       <item row="0" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <property name="spacing">
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="numComboLabel">
           <property name="text">
@@ -223,6 +289,9 @@
       </item>
       <item row="4" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <property name="spacing">
+         <number>3</number>
+        </property>
         <item>
          <widget class="QLabel" name="numPrefixLabel">
           <property name="text">
@@ -273,6 +342,21 @@
       <string>Effect Parameters</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
+      <property name="spacing">
+       <number>3</number>
+      </property>
       <item row="6" column="0">
        <widget class="QLabel" name="peCharStyleLabel">
         <property name="text">
@@ -292,6 +376,9 @@
       </item>
       <item row="1" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <property name="spacing">
+         <number>3</number>
+        </property>
         <item>
          <widget class="QCheckBox" name="peIndent">
           <property name="text">

Modified: trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp	Sat Feb 27 22:30:12 2021
@@ -19,10 +19,8 @@
 {
 	setupUi(this);
 
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 	layout()->setAlignment(Qt::AlignTop);
-	
+
 	startOffset->setValues(0, 30000, 2, 0);
 	startOffset->setSingleStep(10);
 

Modified: trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pathtextbase.ui	Sat Feb 27 22:30:12 2021
@@ -6,25 +6,28 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>218</width>
-    <height>118</height>
+    <width>243</width>
+    <height>143</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
-    <number>5</number>
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
    </property>
    <property name="spacing">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="pathTextTypeLabel">

Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp	Sat Feb 27 22:30:12 2021
@@ -18,9 +18,6 @@
 PropertyWidget_TextColor::PropertyWidget_TextColor(QWidget* parent) : QFrame(parent)
 {
 	setupUi(this);
-
-	setFrameStyle(QFrame::Box | QFrame::Plain);
-	setLineWidth(1);
 
 	layout()->setAlignment(Qt::AlignLeft);
 

Modified: trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24533&path=/trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui	Sat Feb 27 22:30:12 2021
@@ -13,12 +13,6 @@
   <property name="windowTitle">
    <string notr="true">Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>3</number>
@@ -89,18 +83,6 @@
     <layout class="QHBoxLayout" name="strokeLayout">
      <property name="spacing">
       <number>3</number>
-     </property>
-     <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>
       <widget class="QLabel" name="strokeIcon">




More information about the scribus-commit mailing list