View Issue Details

IDProjectCategoryView StatusLast Update
0016501ScribusUser Interfacepublic2021-03-21 14:55
Reporterbubu Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.5.7.svn 
Fixed in Version1.5.7.svn 
Summary0016501: Update layout for Style Manager: fontcombo, styleselect, tabruler
DescriptionI propose several layout modification in Style Manager. This part is not trivial, maybe we need some discussion...

My goal is by using current UI elements:
1. to eliminate waste spacing,
2. to unify inner spacing,
3. to shrink the height of this dialog.

So I propose these modifications:

1. fontcombo: It is used in Style Manager and in Properties Palette: I propose to use standard spacing between labels and input fields. In Style Manager the spacing should be 6px, on Properties Palette 3px. I reused "showLabels" parameter, because it logic is same what we need.

2. Paragraph properties:
- Alignment and Distances: I added a spacer.
- Optical margins: I arranged the items from top to bottom as it is on PP.

3. Character properties:
- I moved spacer from Advanced formatting group to the bottom.
- I added a minimal 3px spacing between style select buttons (and 3px margin for pop-ups)

4. tabruller/smtabruller
It is used in PP and in SM. I want to shrink the height of this widget. I moved the "delete all" and "delete selected" button to the top of the widget and convert them to icon button. I moved the last input field for right indent to the right side of left indent field.

Please see attached screenshots about modifications. Please review the patch. If it succeeds I plan to continue with other widgets in SM.
TagsNo tags attached.
PatchNo

Relationships

child of 0013906 acknowledged Metabug: UI enhancement proposals (1.5.x.svn) 

Activities

bubu

2021-03-02 10:05

reporter  

0001-Update-layout-for-Style-Manager-fontcombo-styleselec.patch (19,417 bytes)   
From c3d27b65e2a52523085631dfe174862188d7ee7d Mon Sep 17 00:00:00 2001
Message-Id: <c3d27b65e2a52523085631dfe174862188d7ee7d.1614641071.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Tue, 2 Mar 2021 00:24:15 +0100
Subject: [PATCH] Update layout for Style Manager: fontcombo, styleselect,
 tabruler

---
 .../iconsets/1_5_1/16/edit-delete-all.png     | Bin 0 -> 1528 bytes
 .../1_5_1_dark/16/edit-delete-all.png         | Bin 0 -> 1460 bytes
 scribus/ui/fontcombo.cpp                      |   7 +-
 scribus/ui/smcstylewidget.ui                  |  45 +++++++-----
 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 -
 9 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/resources/iconsets/1_5_1/16/edit-delete-all.png b/resources/iconsets/1_5_1/16/edit-delete-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..07dc1eadfc540c5e48227966a9f55e6cf7da2651
GIT binary patch
literal 1528
zcmV<U1qb?xP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000AHdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+T~YSlI182{O1&N1SBB@$H6QSbAvhlB-nmiRad{I
zV}8bj5f-vYX9`}G>;L>c++VoZ`{;sNiaAD)E98*5V37QN<<*l9t3Mw6Ik@w?%LKzE
zu(Cf|IpPcadVS$sgSLCWOUDeSBhi`pNGNk<VE647B>cSlDIAG%-v==#yM?;(ZtD@a
zpd9yhBwdL7{_JiY!N5{eEF{cbNc`&4jzH#3Qeb8EG~>_;ZgVgsClU~H_jwlr{VhRv
zB%dSq$o^&YKt7klFArSCgCh*Sogn?5{6+E2!g4{x_Y--XslJjtMoVM#{p(7IU^E^T
zwaBJ34FWe%F6*_3X1En&TP>p{Uwnn+%~!vnRm#LrWjG4dsL-IkY^4f_fjb*4bA?dT
zm&7=8omxqljRu=!X_BB><?bM55WZlcwQgSPRZ3X75ki@ejF#BHXzr)USDG86PKwB<
z3s=C!v#tSSDmQyXK@b{;Zn_9Q+abTdsUMUo6x2m?!Uq<=?I|{;Yi-HWSrDhN`xYW+
z?MMKMu(kpW2^8>=L@AOtW+MWR2?7-$X9>JP0aE1#kQ_uJJLAN2ZM<W&Vp%!zbmMG-
z5Gqj&+GHsZD+ERTSV*X$qM|`nqnakCSxb}{qQ)34&O@%4STMC{X34UZBq=0KF<D9}
zr;<4f&OpsETTVIWQrHzNRFJD6zQD8bCR^Bai<@m}%Uh`^pBk#xSgod-YiZo1;h1Q#
zSxYUq(#dt46g_n9v0G0)_cBmxLq-@n;;@lM9_6Ciq3W0Rf@*ZA#!IOgXBXArb!KM@
zn#YMw&7c?ug5ow6Ktc1=%qI$gr*cy>pBbA%86b6P;~GuHAYtglI_RR^Rk^2hbDEyg
zjen<{o6`LW<s78@s@pfJwfQ?&mty-aoSb^W?!$af#c?Y0N3DEn-%HeMf1GiTA@W9&
zY2A0B@?w%(MAw&p2>!{sXBd&E$$k^XPh`J@;?_FfTl~C=c8)rir-}ZG^mxbpfx2GF
z-KR)ik^iaW?$bT?JNaKOPWK6l_qWJPoA%Ak>pn$tMz~Lrymzqum&eFkDE<$d7D?Tw
zNZvuDWsSU~?HKv1b&rmB?Q4kyf0f|BWA`uHl)%=@NZ70Z00D(*LqkwWLqi~Na&Km7
zY-Iodc$|HaJxIe)6opSyMUjd_JBT<0tm0rnRK!uMP=pGhR%q41<fVVmq#;RhaTHt&
z4*o1w9bBAsb#N5~!5<JeHz!3GDe=Cf&?3eQkN0ujJ%{)11B7~+X;#NLpy{@mO2oxX
zc2(?pMGygmF^VCXS;m|sCE;6N_tZ;u7vov}eScQ3nzI-X5Q%4*VcNtS#M7I$!FiuJ
z!ius=d`>)O(glehxvqHp#<}3Kz%wIeIyFxmAr=d5th6yJni}yGaa7fG$`>*otDLtu
zYvn3y-jlyDl+#z1xlU^k2`pj>5=1DdqJ%PR#Aw$^v5=zkxQ~Cp^-JVZ$W;O(#{w$Q
zAiI9>KlnXcD?d5mC57TZ=ZoWf3<F)eK%?e3-^Y&AI01ssz?I(eSL(pbC+W487Ci#`
zwt<W5mZt0hmpefJlOdb3D+Or@`8@D`M&FbL!nZ)rnm4!RIZhvdG|eh`0~{OzBL&J{
z_jz}B``rHRY0mElVLEc4i$Q=n00006VoOIv0RI600RN!9r;`8x010qNS#tmY4#WTe
z4#WYKD-Ig~000McNliru<pTi~8xY$qhd}@U0EJ0JK~y-)-I6g5!Y~X)pCQ*M16TOU
zeOWn6<Ri2a;s9M3A!Vzgil{}Q3xD&sY=3_n8ex*Al5lq`V@WsQR8V(!pX2bUtE4Az
ztPJgnp)ad6m^QCaOT-w@YsD$0A=Es`Irm!x99pjsmacz`b_HvHu)l);_TU0M7F-5K
eU^KHUzrY)?-z?0*TvWvX0000<MNUMnLSTYyxWx4U

literal 0
HcmV?d00001

diff --git a/resources/iconsets/1_5_1_dark/16/edit-delete-all.png b/resources/iconsets/1_5_1_dark/16/edit-delete-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..6344b8727749f4b8c899e6ec573d3e8fbc1743fd
GIT binary patch
literal 1460
zcmV;l1xxygP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009ndQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=K7lIti8MgLjFECERfiREB0RkMRx{#>w=PC9w>
zl73zD)uv*w03qKaaCg}M`Fn)Fa8dCTlA7m|bHtTODqPX<cwA-ODW-KlAL6BPXAjp7
zhDlJ%@o4oNUt!me370i!ySE2Fd)QA$7tg0dnJY6I{WeJ0`LI(u9hLoP<l=T4>c&Ui
z&VehG^S7N&S48o64!4G6P^l{x66Re<;=210fy^ICMJ?-2bKGi^NI=C>&PX80-RoTi
zjJE>aiF|2=&+1=WpTy^S+U1j$`P2xFryZov#a|NNEG*ZE_`bu-#nq$8V{{*5Ki;mU
z3`O&qQA=#PxWT{;lFOQwQ4Bvt+g2$k9&2ns-eZd!N~1yyDkD&$PL&4jt8UZ~V&a_*
zHFE=~X>&0y+$JkYv(R9ZB3&G?8t(!4lJGSaTI-gzUL(iKoiLOM&InU}S;BvHzEi>&
zZAwJZuUa84o_UQhCb@aXC;*{xa?>U7rJVTVP5vNNK~R^>ju)(PJ6vo^AGsxqvtXQ}
zKDH1A>!$-qgtZmHkbpqUBubg0F&hzdbO5S|oF(xF0;I|vL2?qw9E_dk+L&Xs#<Fte
zX~x+E5Gq*=Y>HICN=cDFmK-@$RWzw;R#OjJv}VaEYtGs7Jmjj0B~#00=2on_cyjgZ
z=I+I7;UYK#wd7*OODVN-s931NSH<`W%f_2*Y11ulw)s}J+K@giHEp?B^Hy5z+@<4~
z=($_>UV7ar>^Ld*wCkRC+kG#49musIBMlvS*zi$Cy;3`=K9o18(MgRLsX5NB)L;!}
z7Z)^-6P?UJj1z&lO#(=0p3I_CN<7I;X0gmOO&LMzWD`0~VnCR7VjXm4_d)I@ZbAJe
zZu~oPVWRsEaslWbxjmuQ=Xb6xV#h9=nnuCyL;vnIu-Exft9LbK)=#G2)q&rf@Z;!4
zZ+w=1)%6TT_?~zk9K9RIM;*Q=o*zfApa}18&*ydcvp7D&_}TscgQE+I@I5E?myeOh
zln8$o$ItHnvZJq`*e~t=myZ$rrGft-!@rl}u71^1q~`zt0flKpLr_UWLm+T+Z)Rz1
zWdHzpoPCi!NW)MRg-=sOk%~h*h&TkS;$T5k#8InIgbJZnXw|{wrGL<*AxUv@6kH1q
z{w!7<T%2`va1{i>9}qV;Cq)-2@xG+cBE}1k_i^4mhxhISgnF52R>wG?>9(0l#KlZ@
zRqT325CMcSiXoX<#+)Q2;agw#)Jt_2<5~WFe^#%WvltK%iD#K%+Qb{g)0?)zd7n7K
zin2<4PCRDP1&JTIu6X>$x!|(EGb3g?HBTHN77J~xv@t818u1iyRMm9K7cw5JoVPe@
z<tl65lfN*O(^r<cPHPYeEMf@~L@21DgfeWzXxB-xkfQUrkAJ}ROXO0>RRSZ&0xHlT
zyMFLL_&r-IKRMwgh2lWxi{pF@16{j7qvkl@$BxrD0fNuKmEQ7K>cGq=>9v*?Jp%f+
zfs5;wrtATiJ3#-FA)B%*1!)QSJn()--;@Qyw?NODH@D_FP9K0Y%_?~V92^281<GFc
zd3SgF-2Uxp&hH0dI&z?kL4Y{`000JJOGiWi{{a60|De66lK=n!32;bRa{vGi!~g&e
z!~vBn4jTXf00(qQO+^Rg0|6EdA(SnQ^#A|>c1c7*R5;7+k}(Q^FbqXs)NAPA$z8of
zjv|N$aB)=YqEHH{5y8m^9ezripWg}*s>)MDRYO`!^awPOo?=}Y7q38R?A5^4bQ5EQ
z;2ptoAVBLlKjbp-xR8RENah*8aZow_L6$#*d<Gq`B()uw&(+^$;Nk#M{wG~T9*;f%
O0000<MNUMnLSTY*gQeI2

literal 0
HcmV?d00001

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..9bdb4edea 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>607</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -435,22 +435,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 +454,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 +764,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..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 81e23d76a..87174a83e 100644
--- a/scribus/ui/smtabruler.cpp
+++ b/scribus/ui/smtabruler.cpp
@@ -35,14 +35,14 @@ SMTabruler::SMTabruler(QWidget* parent, bool haveFirst, int dEin, QList<Paragrap
 	indentLayout->insertWidget(1, first_);
 	first_->show();
 
-	layout4->removeWidget(leftIndentData);
+	indentLayout->removeWidget(leftIndentData);
 	leftIndentData->hide();
-	layout4->insertWidget(1, left_);
+	indentLayout->insertWidget(3, left_);
 	left_->show();
 
 	indentLayout->removeWidget(rightIndentData);
 	rightIndentData->hide();
-	indentLayout->insertWidget(3, right_);
+	indentLayout->insertWidget(5, right_);
 	right_->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

font_combo_pp.gif (9,802 bytes)   
font_combo_pp.gif (9,802 bytes)   
tabruler.gif (16,555 bytes)   
tabruler.gif (16,555 bytes)   
style_manager.gif (313,173 bytes)   
style_manager.gif (313,173 bytes)   

jghali

2021-03-03 12:07

administrator   ~0048899

I can not apply that patch on Windows with TortoiseSVN due to presence of GIT binary patches. Also that patch uses an out of sync smtabruler.cpp.

bubu

2021-03-03 14:38

reporter   ~0048901

Ah, here is the updated patch to the current master branch, and images separately.
0001-Update-layout-for-Style-Manager-fontcombo-styleselec-2.patch (15,607 bytes)   
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

edit-delete-all.png (1,528 bytes)   
edit-delete-all.png (1,528 bytes)   
edit-delete-all-2.png (1,460 bytes)   
edit-delete-all-2.png (1,460 bytes)   

bubu

2021-03-05 10:07

reporter   ~0048912

Rev 24545 breaks this patch. Here is the new on. Please apply after 0016505.
0001-Update-layout-for-Style-Manager-fontcombo-styleselec-3.patch (14,995 bytes)   
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

jghali

2021-03-06 11:56

administrator   ~0048919

Applied, thanks!

FirasH

2021-03-21 14:55

reporter   ~0048982

Thanks!
Fixed in 1.5.7.svn (24547)

Issue History

Date Modified Username Field Change
2021-03-02 10:05 bubu New Issue
2021-03-02 10:05 bubu File Added: 0001-Update-layout-for-Style-Manager-fontcombo-styleselec.patch
2021-03-02 10:05 bubu File Added: font_combo_pp.gif
2021-03-02 10:05 bubu File Added: tabruler.gif
2021-03-02 10:05 bubu File Added: style_manager.gif
2021-03-03 06:22 PeterBenedek Relationship added child of 0013906
2021-03-03 12:07 jghali Note Added: 0048899
2021-03-03 14:38 bubu File Added: 0001-Update-layout-for-Style-Manager-fontcombo-styleselec-2.patch
2021-03-03 14:38 bubu File Added: edit-delete-all.png
2021-03-03 14:38 bubu File Added: edit-delete-all-2.png
2021-03-03 14:38 bubu Note Added: 0048901
2021-03-05 10:07 bubu File Added: 0001-Update-layout-for-Style-Manager-fontcombo-styleselec-3.patch
2021-03-05 10:07 bubu Note Added: 0048912
2021-03-06 11:56 jghali Assigned To => jghali
2021-03-06 11:56 jghali Status new => resolved
2021-03-06 11:56 jghali Resolution open => fixed
2021-03-06 11:56 jghali Fixed in Version => 1.5.7.svn
2021-03-06 11:56 jghali Note Added: 0048919
2021-03-21 14:55 FirasH Status resolved => closed
2021-03-21 14:55 FirasH Note Added: 0048982