From 0f3349a9b2551d0de79ac382b7166dce89f80107 Mon Sep 17 00:00:00 2001
Message-Id: <0f3349a9b2551d0de79ac382b7166dce89f80107.1614782121.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Wed, 3 Mar 2021 15:35:12 +0100
Subject: [PATCH] Update layout for Style Manager: fontcombo, styleselect,
 tabruler

---
 scribus/ui/fontcombo.cpp     |  7 ++--
 scribus/ui/smcstylewidget.ui | 61 +++++++++++++++------------------
 scribus/ui/smpstylewidget.ui | 65 +++++++++++++++++++-----------------
 scribus/ui/smtabruler.cpp    |  6 ++--
 scribus/ui/styleselect.cpp   | 20 +++++------
 scribus/ui/tabruler.cpp      | 37 ++++++++++----------
 scribus/ui/tabruler.h        |  2 --
 7 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/scribus/ui/fontcombo.cpp b/scribus/ui/fontcombo.cpp
index 699bbf047..24ff37802 100644
--- a/scribus/ui/fontcombo.cpp
+++ b/scribus/ui/fontcombo.cpp
@@ -117,8 +117,11 @@ FontComboH::FontComboH(QWidget* parent, bool labels) :
 	psFont = IconManager::instance().loadPixmap("font_type1_16.png");
 	substFont = IconManager::instance().loadPixmap("font_subst16.png");
 	fontComboLayout = new QGridLayout(this);
-	fontComboLayout->setMargin(0);
-	fontComboLayout->setSpacing(0);
+	fontComboLayout->setContentsMargins(0, 0, 0, 0);
+	if (showLabels)
+		fontComboLayout->setSpacing(6);
+	else
+		fontComboLayout->setSpacing(3);
 	int col = 0;
 	if (showLabels)
 	{
diff --git a/scribus/ui/smcstylewidget.ui b/scribus/ui/smcstylewidget.ui
index 54ed97549..8a81560a1 100644
--- a/scribus/ui/smcstylewidget.ui
+++ b/scribus/ui/smcstylewidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>402</width>
-    <height>563</height>
+    <width>430</width>
+    <height>601</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -242,22 +242,6 @@
               </item>
              </layout>
             </item>
-            <item>
-             <spacer>
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>300</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </widget>
          </item>
@@ -435,22 +419,6 @@
               </item>
              </layout>
             </item>
-            <item>
-             <spacer>
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>300</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </widget>
          </item>
@@ -470,7 +438,14 @@
                </widget>
               </item>
               <item>
-               <widget class="SMLineEdit" name="hyphenCharLineEdit"/>
+               <widget class="SMLineEdit" name="hyphenCharLineEdit">
+                <property name="maximumSize">
+                 <size>
+                  <width>60</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+               </widget>
               </item>
               <item>
                <spacer name="horizontalSpacer_2">
@@ -768,6 +743,22 @@
               </item>
              </layout>
             </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>300</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </widget>
          </item>
diff --git a/scribus/ui/smpstylewidget.ui b/scribus/ui/smpstylewidget.ui
index 942164eea..89047a832 100644
--- a/scribus/ui/smpstylewidget.ui
+++ b/scribus/ui/smpstylewidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>695</width>
-    <height>582</height>
+    <height>596</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -251,6 +251,19 @@
               </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>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </widget>
          </item>
@@ -372,27 +385,16 @@
             <string>Optical Margins</string>
            </property>
            <layout class="QGridLayout" name="gridLayout_3">
-            <item row="6" column="0" colspan="2">
-             <layout class="QHBoxLayout" name="horizontalLayout_4">
-              <item>
-               <widget class="QPushButton" name="optMarginDefaultButton">
-                <property name="text">
-                 <string>Reset to Default</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="optMarginParentButton">
+            <item row="1" column="0" colspan="2">
+             <layout class="QGridLayout" name="gridLayout_5">
+              <item row="2" column="0">
+               <widget class="SMRadioButton" name="optMarginRadioLeft">
                 <property name="text">
-                 <string>Use Parent Value</string>
+                 <string>Left Only</string>
                 </property>
                </widget>
               </item>
-             </layout>
-            </item>
-            <item row="1" column="0" colspan="2">
-             <layout class="QGridLayout" name="gridLayout_5">
-              <item row="0" column="1">
+              <item row="1" column="0">
                <widget class="SMRadioButton" name="optMarginRadioBoth">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -421,14 +423,7 @@
                 </property>
                </widget>
               </item>
-              <item row="1" column="0">
-               <widget class="SMRadioButton" name="optMarginRadioLeft">
-                <property name="text">
-                 <string>Left Only</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
+              <item row="3" column="0">
                <widget class="SMRadioButton" name="optMarginRadioRight">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -441,6 +436,20 @@
                 </property>
                </widget>
               </item>
+              <item row="0" column="1">
+               <widget class="QPushButton" name="optMarginDefaultButton">
+                <property name="text">
+                 <string>Reset to Default</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QPushButton" name="optMarginParentButton">
+                <property name="text">
+                 <string>Use Parent Value</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </item>
            </layout>
@@ -1333,11 +1342,7 @@
   <tabstop>keepTogether</tabstop>
   <tabstop>keepWithNext</tabstop>
   <tabstop>optMarginRadioNone</tabstop>
-  <tabstop>optMarginRadioBoth</tabstop>
   <tabstop>optMarginRadioLeft</tabstop>
-  <tabstop>optMarginRadioRight</tabstop>
-  <tabstop>optMarginDefaultButton</tabstop>
-  <tabstop>optMarginParentButton</tabstop>
   <tabstop>minSpaceSpin</tabstop>
   <tabstop>maxGlyphExtSpin</tabstop>
   <tabstop>bulletBox</tabstop>
diff --git a/scribus/ui/smtabruler.cpp b/scribus/ui/smtabruler.cpp
index f8343fb3e..ba29a34b7 100644
--- a/scribus/ui/smtabruler.cpp
+++ b/scribus/ui/smtabruler.cpp
@@ -36,14 +36,14 @@ SMTabruler::SMTabruler(QWidget* parent, bool haveFirst, int dEin, QList<Paragrap
 	indentLayout->insertWidget(1, firstLineSpin);
 	firstLineSpin->show();
 
-	layout4->removeWidget(leftIndentData);
+	indentLayout->removeWidget(leftIndentData);
 	leftIndentData->hide();
-	layout4->insertWidget(1, leftIndentSpin);
+	indentLayout->insertWidget(3, leftIndentSpin);
 	leftIndentSpin->show();
 
 	indentLayout->removeWidget(rightIndentData);
 	rightIndentData->hide();
-	indentLayout->insertWidget(3, rightIndentSpin);
+	indentLayout->insertWidget(5, rightIndentSpin);
 	rightIndentSpin->show();
 
 	connect(firstLineData, SIGNAL(valueChanged(double)), this, SLOT(firstDataChanged()));
diff --git a/scribus/ui/styleselect.cpp b/scribus/ui/styleselect.cpp
index 5521c3085..0b400a013 100644
--- a/scribus/ui/styleselect.cpp
+++ b/scribus/ui/styleselect.cpp
@@ -14,8 +14,8 @@ for which a new license (GPL+exception) is in place.
 StrikeValues::StrikeValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout( this );
-	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
@@ -47,8 +47,8 @@ void StrikeValues::languageChange()
 UnderlineValues::UnderlineValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout(this);
-	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
@@ -80,8 +80,8 @@ void UnderlineValues::languageChange()
 OutlineValues::OutlineValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout( this );
-	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LWidth = new ScrSpinBox( 0, 100, this, 0 );
 	LWidth->setValue( 1 );
@@ -101,8 +101,8 @@ void OutlineValues::languageChange()
 ShadowValues::ShadowValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout( this );
-	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	Xoffset = new ScrSpinBox( -100, 100, this, 0 );
 	Xoffset->setValue( 5 );
@@ -131,8 +131,8 @@ StyleSelect::StyleSelect(QWidget* parent) : QWidget(parent)
 {
 	IconManager& im = IconManager::instance();
 	ssLayout = new QHBoxLayout(this);
-	ssLayout->setSpacing( 0 );
-	ssLayout->setMargin( 0 );
+	ssLayout->setSpacing(3);
+	ssLayout->setContentsMargins(0, 0, 0, 0);
 
 	UnderlineVal = new UnderlineValues( nullptr );
 	UnderlinePop = new QMenu();
diff --git a/scribus/ui/tabruler.cpp b/scribus/ui/tabruler.cpp
index c4daa1232..5528f7b73 100644
--- a/scribus/ui/tabruler.cpp
+++ b/scribus/ui/tabruler.cpp
@@ -557,10 +557,19 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 	tabFillComboT->setBuddy(tabFillCombo);
 	layout1->addWidget( tabFillComboT );
 	layout1->addWidget( tabFillCombo );
-
-	layout4 = new QHBoxLayout;
-	layout4->setContentsMargins(0, 0, 0, 0);
-	layout4->setSpacing(6);
+	clearOneButton = new QPushButton( this );
+	clearOneButton->setText("");
+	clearOneButton->setIcon(IconManager::instance().loadIcon("16/edit-delete.png"));
+	clearOneButton->setMinimumSize(24, 24);
+	clearOneButton->setMaximumSize(24, 24);
+	layout1->addSpacing(12);
+	layout1->addWidget(clearOneButton);
+	clearButton = new QPushButton( this );
+	clearButton->setText("");
+	clearButton->setIcon(IconManager::instance().loadIcon("16/edit-delete-all.png"));
+	clearButton->setMinimumSize(24, 24);
+	clearButton->setMaximumSize(24, 24);
+	layout1->addWidget(clearButton);
 
 	indentLayout = new QHBoxLayout;
 	indentLayout->setContentsMargins(0, 0, 0, 0);
@@ -579,9 +588,8 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 		leftIndentLabel = new QLabel(this);
 		leftIndentLabel->setText("");
 		leftIndentLabel->setPixmap(IconManager::instance().loadPixmap("leftindent.png"));
-		layout4->addWidget( leftIndentLabel );
-		layout4->addWidget( leftIndentData );
-		layout4->addStretch(10);
+		indentLayout->addWidget(leftIndentLabel);
+		indentLayout->addWidget(leftIndentData);
 		rightIndentLabel = new QLabel(this);
 		rightIndentLabel->setText("");
 		rightIndentLabel->setPixmap(IconManager::instance().loadPixmap("rightindent.png"));
@@ -590,14 +598,6 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 		indentLayout->addWidget(rightIndentLabel);
 		indentLayout->addWidget(rightIndentData);
 	}
-	clearButton = new QPushButton( this );
-	clearButton->setText( tr( "Delete All" ) );
-	indentLayout->addSpacing(20);
-	indentLayout->addWidget( clearButton);
-	clearOneButton = new QPushButton( this );
-	clearOneButton->setText( tr( "Delete Selected" ) );
-	indentLayout->addWidget( clearOneButton);
-	indentLayout->addStretch(10);
 	if (!haveFirst)
 	{
 		QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -609,7 +609,6 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 	tabrulerLayout->addLayout( layout2 );
 	indentLayout->addStretch( 10 );
 	tabrulerLayout->addLayout( indentLayout );
-	tabrulerLayout->addLayout(layout4);
 
 	tabData->setEnabled(false);
 	tabFillCombo->setEnabled(false);
@@ -701,9 +700,13 @@ void Tabruler::iconSetChange()
 
 	if (leftIndentLabel)
 		leftIndentLabel->setPixmap(iconManager.loadPixmap("leftindent.png"));
-	
+
 	if (rightIndentLabel)
 		rightIndentLabel->setPixmap(iconManager.loadPixmap("rightindent.png"));
+
+	clearOneButton->setIcon(iconManager.loadIcon("16/edit-delete.png"));
+	clearButton->setIcon(iconManager.loadIcon("16/edit-delete-all.png"));
+
 }
 
 void Tabruler::languageChange()
diff --git a/scribus/ui/tabruler.h b/scribus/ui/tabruler.h
index 0251bbb19..7c5b3d460 100644
--- a/scribus/ui/tabruler.h
+++ b/scribus/ui/tabruler.h
@@ -142,8 +142,6 @@ protected:
 	QHBoxLayout* layout2 { nullptr };
 	QHBoxLayout* layout1 { nullptr };
 	QHBoxLayout* indentLayout { nullptr };
-//	QVBoxLayout* layout3 { nullptr };
-	QHBoxLayout* layout4 { nullptr };
 	QComboBox* typeCombo { nullptr };
 	QComboBox* tabFillCombo { nullptr };
 	QLabel* tabFillComboT { nullptr };
-- 
2.27.0

From 4d542ed41de52be1fde8b4bd209793a278b73bc5 Mon Sep 17 00:00:00 2001
Message-Id: <4d542ed41de52be1fde8b4bd209793a278b73bc5.1614938704.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Fri, 5 Mar 2021 11:03:18 +0100
Subject: [PATCH] Update layout for Style Manager: fontcombo, styleselect,
 tabruler

---
 scribus/ui/fontcombo.cpp     |  5 ++-
 scribus/ui/smcstylewidget.ui | 61 +++++++++++++++---------------------
 scribus/ui/smpstylewidget.ui | 61 +++++++++++++++++++++---------------
 scribus/ui/smtabruler.cpp    |  6 ++--
 scribus/ui/styleselect.cpp   | 18 +++++------
 scribus/ui/tabruler.cpp      | 37 ++++++++++++----------
 scribus/ui/tabruler.h        |  2 --
 7 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/scribus/ui/fontcombo.cpp b/scribus/ui/fontcombo.cpp
index 9bef53fe1..24ff37802 100644
--- a/scribus/ui/fontcombo.cpp
+++ b/scribus/ui/fontcombo.cpp
@@ -118,7 +118,10 @@ FontComboH::FontComboH(QWidget* parent, bool labels) :
 	substFont = IconManager::instance().loadPixmap("font_subst16.png");
 	fontComboLayout = new QGridLayout(this);
 	fontComboLayout->setContentsMargins(0, 0, 0, 0);
-	fontComboLayout->setSpacing(0);
+	if (showLabels)
+		fontComboLayout->setSpacing(6);
+	else
+		fontComboLayout->setSpacing(3);
 	int col = 0;
 	if (showLabels)
 	{
diff --git a/scribus/ui/smcstylewidget.ui b/scribus/ui/smcstylewidget.ui
index 54ed97549..3e723c3a1 100644
--- a/scribus/ui/smcstylewidget.ui
+++ b/scribus/ui/smcstylewidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>402</width>
-    <height>563</height>
+    <width>430</width>
+    <height>601</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -242,22 +242,6 @@
               </item>
              </layout>
             </item>
-            <item>
-             <spacer>
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>300</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </widget>
          </item>
@@ -435,22 +419,6 @@
               </item>
              </layout>
             </item>
-            <item>
-             <spacer>
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>300</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </widget>
          </item>
@@ -470,7 +438,14 @@
                </widget>
               </item>
               <item>
-               <widget class="SMLineEdit" name="hyphenCharLineEdit"/>
+               <widget class="SMLineEdit" name="hyphenCharLineEdit">
+                <property name="maximumSize">
+                 <size>
+                  <width>60</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+               </widget>
               </item>
               <item>
                <spacer name="horizontalSpacer_2">
@@ -773,6 +748,22 @@
          </item>
         </layout>
        </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>300</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabFontFeatures">
diff --git a/scribus/ui/smpstylewidget.ui b/scribus/ui/smpstylewidget.ui
index 942164eea..a15b41224 100644
--- a/scribus/ui/smpstylewidget.ui
+++ b/scribus/ui/smpstylewidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>695</width>
-    <height>582</height>
+    <height>596</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -251,6 +251,19 @@
               </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>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </widget>
          </item>
@@ -372,27 +385,16 @@
             <string>Optical Margins</string>
            </property>
            <layout class="QGridLayout" name="gridLayout_3">
-            <item row="6" column="0" colspan="2">
-             <layout class="QHBoxLayout" name="horizontalLayout_4">
-              <item>
-               <widget class="QPushButton" name="optMarginDefaultButton">
-                <property name="text">
-                 <string>Reset to Default</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="optMarginParentButton">
+            <item row="1" column="0" colspan="2">
+             <layout class="QGridLayout" name="gridLayout_5">
+              <item row="2" column="0">
+               <widget class="SMRadioButton" name="optMarginRadioLeft">
                 <property name="text">
-                 <string>Use Parent Value</string>
+                 <string>Left Only</string>
                 </property>
                </widget>
               </item>
-             </layout>
-            </item>
-            <item row="1" column="0" colspan="2">
-             <layout class="QGridLayout" name="gridLayout_5">
-              <item row="0" column="1">
+              <item row="1" column="0">
                <widget class="SMRadioButton" name="optMarginRadioBoth">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -421,14 +423,7 @@
                 </property>
                </widget>
               </item>
-              <item row="1" column="0">
-               <widget class="SMRadioButton" name="optMarginRadioLeft">
-                <property name="text">
-                 <string>Left Only</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
+              <item row="3" column="0">
                <widget class="SMRadioButton" name="optMarginRadioRight">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -441,6 +436,20 @@
                 </property>
                </widget>
               </item>
+              <item row="0" column="1">
+               <widget class="QPushButton" name="optMarginDefaultButton">
+                <property name="text">
+                 <string>Reset to Default</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QPushButton" name="optMarginParentButton">
+                <property name="text">
+                 <string>Use Parent Value</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </item>
            </layout>
diff --git a/scribus/ui/smtabruler.cpp b/scribus/ui/smtabruler.cpp
index f8343fb3e..ba29a34b7 100644
--- a/scribus/ui/smtabruler.cpp
+++ b/scribus/ui/smtabruler.cpp
@@ -36,14 +36,14 @@ SMTabruler::SMTabruler(QWidget* parent, bool haveFirst, int dEin, QList<Paragrap
 	indentLayout->insertWidget(1, firstLineSpin);
 	firstLineSpin->show();
 
-	layout4->removeWidget(leftIndentData);
+	indentLayout->removeWidget(leftIndentData);
 	leftIndentData->hide();
-	layout4->insertWidget(1, leftIndentSpin);
+	indentLayout->insertWidget(3, leftIndentSpin);
 	leftIndentSpin->show();
 
 	indentLayout->removeWidget(rightIndentData);
 	rightIndentData->hide();
-	indentLayout->insertWidget(3, rightIndentSpin);
+	indentLayout->insertWidget(5, rightIndentSpin);
 	rightIndentSpin->show();
 
 	connect(firstLineData, SIGNAL(valueChanged(double)), this, SLOT(firstDataChanged()));
diff --git a/scribus/ui/styleselect.cpp b/scribus/ui/styleselect.cpp
index 79cb997b4..0b400a013 100644
--- a/scribus/ui/styleselect.cpp
+++ b/scribus/ui/styleselect.cpp
@@ -14,8 +14,8 @@ for which a new license (GPL+exception) is in place.
 StrikeValues::StrikeValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout( this );
-	group1Layout->setSpacing( 3 );
-	group1Layout->setContentsMargins(2, 2, 2, 2);
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
@@ -47,8 +47,8 @@ void StrikeValues::languageChange()
 UnderlineValues::UnderlineValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout(this);
-	group1Layout->setSpacing( 3 );
-	group1Layout->setContentsMargins(2, 2, 2, 2);
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
@@ -80,8 +80,8 @@ void UnderlineValues::languageChange()
 OutlineValues::OutlineValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout( this );
-	group1Layout->setSpacing( 3 );
-	group1Layout->setContentsMargins(2, 2, 2, 2);
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LWidth = new ScrSpinBox( 0, 100, this, 0 );
 	LWidth->setValue( 1 );
@@ -101,8 +101,8 @@ void OutlineValues::languageChange()
 ShadowValues::ShadowValues( QWidget* parent ) : QFrame( parent )
 {
 	group1Layout = new QGridLayout( this );
-	group1Layout->setSpacing( 3 );
-	group1Layout->setContentsMargins(2, 2, 2, 2);
+	group1Layout->setSpacing(3);
+	group1Layout->setContentsMargins(3, 3, 3, 3);
 	group1Layout->setAlignment( Qt::AlignTop );
 	Xoffset = new ScrSpinBox( -100, 100, this, 0 );
 	Xoffset->setValue( 5 );
@@ -131,7 +131,7 @@ StyleSelect::StyleSelect(QWidget* parent) : QWidget(parent)
 {
 	IconManager& im = IconManager::instance();
 	ssLayout = new QHBoxLayout(this);
-	ssLayout->setSpacing( 0 );
+	ssLayout->setSpacing(3);
 	ssLayout->setContentsMargins(0, 0, 0, 0);
 
 	UnderlineVal = new UnderlineValues( nullptr );
diff --git a/scribus/ui/tabruler.cpp b/scribus/ui/tabruler.cpp
index c4daa1232..5528f7b73 100644
--- a/scribus/ui/tabruler.cpp
+++ b/scribus/ui/tabruler.cpp
@@ -557,10 +557,19 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 	tabFillComboT->setBuddy(tabFillCombo);
 	layout1->addWidget( tabFillComboT );
 	layout1->addWidget( tabFillCombo );
-
-	layout4 = new QHBoxLayout;
-	layout4->setContentsMargins(0, 0, 0, 0);
-	layout4->setSpacing(6);
+	clearOneButton = new QPushButton( this );
+	clearOneButton->setText("");
+	clearOneButton->setIcon(IconManager::instance().loadIcon("16/edit-delete.png"));
+	clearOneButton->setMinimumSize(24, 24);
+	clearOneButton->setMaximumSize(24, 24);
+	layout1->addSpacing(12);
+	layout1->addWidget(clearOneButton);
+	clearButton = new QPushButton( this );
+	clearButton->setText("");
+	clearButton->setIcon(IconManager::instance().loadIcon("16/edit-delete-all.png"));
+	clearButton->setMinimumSize(24, 24);
+	clearButton->setMaximumSize(24, 24);
+	layout1->addWidget(clearButton);
 
 	indentLayout = new QHBoxLayout;
 	indentLayout->setContentsMargins(0, 0, 0, 0);
@@ -579,9 +588,8 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 		leftIndentLabel = new QLabel(this);
 		leftIndentLabel->setText("");
 		leftIndentLabel->setPixmap(IconManager::instance().loadPixmap("leftindent.png"));
-		layout4->addWidget( leftIndentLabel );
-		layout4->addWidget( leftIndentData );
-		layout4->addStretch(10);
+		indentLayout->addWidget(leftIndentLabel);
+		indentLayout->addWidget(leftIndentData);
 		rightIndentLabel = new QLabel(this);
 		rightIndentLabel->setText("");
 		rightIndentLabel->setPixmap(IconManager::instance().loadPixmap("rightindent.png"));
@@ -590,14 +598,6 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 		indentLayout->addWidget(rightIndentLabel);
 		indentLayout->addWidget(rightIndentData);
 	}
-	clearButton = new QPushButton( this );
-	clearButton->setText( tr( "Delete All" ) );
-	indentLayout->addSpacing(20);
-	indentLayout->addWidget( clearButton);
-	clearOneButton = new QPushButton( this );
-	clearOneButton->setText( tr( "Delete Selected" ) );
-	indentLayout->addWidget( clearOneButton);
-	indentLayout->addStretch(10);
 	if (!haveFirst)
 	{
 		QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -609,7 +609,6 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 	tabrulerLayout->addLayout( layout2 );
 	indentLayout->addStretch( 10 );
 	tabrulerLayout->addLayout( indentLayout );
-	tabrulerLayout->addLayout(layout4);
 
 	tabData->setEnabled(false);
 	tabFillCombo->setEnabled(false);
@@ -701,9 +700,13 @@ void Tabruler::iconSetChange()
 
 	if (leftIndentLabel)
 		leftIndentLabel->setPixmap(iconManager.loadPixmap("leftindent.png"));
-	
+
 	if (rightIndentLabel)
 		rightIndentLabel->setPixmap(iconManager.loadPixmap("rightindent.png"));
+
+	clearOneButton->setIcon(iconManager.loadIcon("16/edit-delete.png"));
+	clearButton->setIcon(iconManager.loadIcon("16/edit-delete-all.png"));
+
 }
 
 void Tabruler::languageChange()
diff --git a/scribus/ui/tabruler.h b/scribus/ui/tabruler.h
index 0251bbb19..7c5b3d460 100644
--- a/scribus/ui/tabruler.h
+++ b/scribus/ui/tabruler.h
@@ -142,8 +142,6 @@ protected:
 	QHBoxLayout* layout2 { nullptr };
 	QHBoxLayout* layout1 { nullptr };
 	QHBoxLayout* indentLayout { nullptr };
-//	QVBoxLayout* layout3 { nullptr };
-	QHBoxLayout* layout4 { nullptr };
 	QComboBox* typeCombo { nullptr };
 	QComboBox* tabFillCombo { nullptr };
 	QLabel* tabFillComboT { nullptr };
-- 
2.27.0