View Issue Details

IDProjectCategoryView StatusLast Update
0016505ScribusUser Interfacepublic2021-03-21 14:57
Reporterbubu Assigned Tocbradney  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.5.7.svn 
Fixed in Version1.5.7.svn 
Summary0016505: Unify size of icon buttons on dock palettes
DescriptionI found a set of dock palettes where the icon button size was different and I propose to unifying them. Please see attached screenshots:

- Properties palette: XYZ,
- Properties palette: Shapes
- Properties palette: Transparency
- Content palette: Tables
- Align and distribute: there are no visual changes, I do not attach screenshot
- Scrapbook
- Custom shapes
- Layers: I accept here an exception: traditional big buttons (48×24)

There are no others changes in the patch. Please review. Thanks.
TagsNo tags attached.
PatchNo

Relationships

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

Activities

bubu

2021-03-02 22:10

reporter  

0001-Unify-size-of-icon-buttons-on-dock-palettes.patch (42,219 bytes)   
From aefcec13ce5027b50257fe8ecf53e3e719a94ce5 Mon Sep 17 00:00:00 2001
Message-Id: <aefcec13ce5027b50257fe8ecf53e3e719a94ce5.1614722512.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Tue, 2 Mar 2021 23:01:26 +0100
Subject: [PATCH] Unify size of icon buttons on dock palettes

---
 scribus/plugins/shapes/shapepalette.cpp   |  26 +-
 scribus/ui/aligndistribute.ui             | 336 ++++++++++++++++++++++
 scribus/ui/layers.cpp                     |  25 +-
 scribus/ui/propertiespalette_shapebase.ui | 122 +++++---
 scribus/ui/propertiespalette_tablebase.ui |  40 ++-
 scribus/ui/propertiespalette_xyzbase.ui   | 124 +++++++-
 scribus/ui/scrapbookpalette.cpp           |  10 +
 scribus/ui/transparencypalette.ui         |  24 ++
 8 files changed, 633 insertions(+), 74 deletions(-)

diff --git a/scribus/plugins/shapes/shapepalette.cpp b/scribus/plugins/shapes/shapepalette.cpp
index 532f6f098..be4453244 100644
--- a/scribus/plugins/shapes/shapepalette.cpp
+++ b/scribus/plugins/shapes/shapepalette.cpp
@@ -282,19 +282,21 @@ ShapePalette::ShapePalette( QWidget* parent) : ScDockPalette(parent, "Shap", Qt:
 {
 	setMinimumSize( QSize( 220, 240 ) );
 	setObjectName(QString::fromLocal8Bit("Shap"));
-	setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
-	containerWidget = new QWidget(this);
-	vLayout = new QVBoxLayout( containerWidget );
-	vLayout->setSpacing(3);
-	vLayout->setContentsMargins(3, 3, 3, 3);
-	buttonLayout = new QHBoxLayout;
-	buttonLayout->setSpacing(6);
-	buttonLayout->setContentsMargins(0, 0, 0, 0);
-
-	importButton = new QToolButton(this);
-	importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+	setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+	containerWidget = new QWidget(this);
+	vLayout = new QVBoxLayout( containerWidget );
+	vLayout->setSpacing(3);
+	vLayout->setContentsMargins(3, 3, 3, 3);
+	buttonLayout = new QHBoxLayout;
+	buttonLayout->setSpacing(6);
+	buttonLayout->setContentsMargins(0, 0, 0, 0);
+
+	importButton = new QToolButton(this);
+	importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	importButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
 	importButton->setIconSize(QSize(16, 16));
+	importButton->setMinimumSize(24, 24);
+	importButton->setMaximumSize(24, 24);
 	buttonLayout->addWidget( importButton );
 
 	QSpacerItem* spacer = new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -304,6 +306,8 @@ ShapePalette::ShapePalette( QWidget* parent) : ScDockPalette(parent, "Shap", Qt:
 	closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	closeButton->setIcon(IconManager::instance().loadIcon("16/close.png"));
 	closeButton->setIconSize(QSize(16, 16));
+	closeButton->setMinimumSize(24, 24);
+	closeButton->setMaximumSize(24, 24);
 	buttonLayout->addWidget( closeButton );
 	vLayout->addLayout( buttonLayout );
 
diff --git a/scribus/ui/aligndistribute.ui b/scribus/ui/aligndistribute.ui
index 30163d713..35b920a29 100644
--- a/scribus/ui/aligndistribute.ui
+++ b/scribus/ui/aligndistribute.ui
@@ -168,6 +168,18 @@
            <layout class="QGridLayout" name="_5">
             <item row="1" column="3">
              <widget class="QToolButton" name="alignBottomInToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -181,6 +193,18 @@
             </item>
             <item row="1" column="1">
              <widget class="QToolButton" name="alignTopInToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -194,6 +218,18 @@
             </item>
             <item row="0" column="1">
              <widget class="QToolButton" name="alignLeftInToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -207,6 +243,18 @@
             </item>
             <item row="0" column="3">
              <widget class="QToolButton" name="alignRightInToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -220,6 +268,18 @@
             </item>
             <item row="1" column="4">
              <widget class="QToolButton" name="alignBottomOutToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -233,6 +293,18 @@
             </item>
             <item row="1" column="0">
              <widget class="QToolButton" name="alignTopOutToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -246,6 +318,18 @@
             </item>
             <item row="1" column="2">
              <widget class="QToolButton" name="alignCenterVerToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -259,6 +343,18 @@
             </item>
             <item row="0" column="0">
              <widget class="QToolButton" name="alignLeftOutToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -272,6 +368,18 @@
             </item>
             <item row="0" column="4">
              <widget class="QToolButton" name="alignRightOutToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -285,6 +393,18 @@
             </item>
             <item row="0" column="2">
              <widget class="QToolButton" name="alignCenterHorToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -379,6 +499,18 @@
            <layout class="QGridLayout" name="_7">
             <item row="0" column="3">
              <widget class="QToolButton" name="distributeDistHToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -392,6 +524,18 @@
             </item>
             <item row="1" column="2">
              <widget class="QToolButton" name="distributeTopToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -405,6 +549,18 @@
             </item>
             <item row="1" column="1">
              <widget class="QToolButton" name="distributeCenterVToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -418,6 +574,18 @@
             </item>
             <item row="0" column="2">
              <widget class="QToolButton" name="distributeRightToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -431,6 +599,18 @@
             </item>
             <item row="3" column="0">
              <widget class="QToolButton" name="toolButtonDummy1">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -447,6 +627,18 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -460,6 +652,18 @@
             </item>
             <item row="0" column="0">
              <widget class="QToolButton" name="distributeLeftToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -476,6 +680,18 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -489,6 +705,18 @@
             </item>
             <item row="3" column="1">
              <widget class="QToolButton" name="distributeDistValueHToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -505,6 +733,18 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -518,6 +758,18 @@
             </item>
             <item row="0" column="1">
              <widget class="QToolButton" name="distributeCenterHToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -531,6 +783,18 @@
             </item>
             <item row="3" column="3">
              <widget class="QToolButton" name="toolButtonDummy2">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -547,6 +811,18 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -560,6 +836,18 @@
             </item>
             <item row="3" column="2">
              <widget class="QToolButton" name="distributeDistValueVToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -573,6 +861,18 @@
             </item>
             <item row="1" column="3">
              <widget class="QToolButton" name="distributeDistVToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -586,6 +886,18 @@
             </item>
             <item row="1" column="0">
              <widget class="QToolButton" name="distributeBottomToolButton">
+              <property name="minimumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>24</width>
+                <height>24</height>
+               </size>
+              </property>
               <property name="text">
                <string/>
               </property>
@@ -790,6 +1102,18 @@
           </item>
           <item>
            <widget class="QToolButton" name="swapLeftToolButton">
+            <property name="minimumSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
             <property name="text">
              <string/>
             </property>
@@ -803,6 +1127,18 @@
           </item>
           <item>
            <widget class="QToolButton" name="swapRightToolButton">
+            <property name="minimumSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
             <property name="text">
              <string/>
             </property>
diff --git a/scribus/ui/layers.cpp b/scribus/ui/layers.cpp
index ebef61598..84a8d9e12 100644
--- a/scribus/ui/layers.cpp
+++ b/scribus/ui/layers.cpp
@@ -113,36 +113,41 @@ LayerPalette::LayerPalette(QWidget* parent) : ScDockPalette(parent, "Layers", Qt
 	Layout1->addItem( spacer );
 
 	newLayerButton = new QPushButton( this );
-	newLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	newLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	newLayerButton->setIconSize(QSize(16, 16));
+	newLayerButton->setMinimumSize( QSize( 48, 24 ) );
+	newLayerButton->setMaximumSize( QSize( 48, 24 ) );
 	newLayerButton->setText( "" );
 	newLayerButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
 	Layout1->addWidget( newLayerButton );
 
 	deleteLayerButton = new QPushButton( this );
-	deleteLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	deleteLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	deleteLayerButton->setIconSize(QSize(16, 16));
+	deleteLayerButton->setMinimumSize( QSize( 48, 24 ) );
+	deleteLayerButton->setMaximumSize( QSize( 48, 24 ) );
 	deleteLayerButton->setText( "" );
 	deleteLayerButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
 	Layout1->addWidget( deleteLayerButton );
 	
 	duplicateLayerButton = new QPushButton( this );
-	duplicateLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	duplicateLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	duplicateLayerButton->setIconSize(QSize(16, 16));
+	duplicateLayerButton->setMinimumSize( QSize( 48, 24 ) );
+	duplicateLayerButton->setMaximumSize( QSize( 48, 24 ) );
 	duplicateLayerButton->setText( "" );
 	duplicateLayerButton->setIcon(IconManager::instance().loadIcon("16/edit-copy.png"));
 	Layout1->addWidget( duplicateLayerButton );
 
 	raiseLayerButton = new QPushButton( this );
-	raiseLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	raiseLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	raiseLayerButton->setIconSize(QSize(16, 16));
+	raiseLayerButton->setMinimumSize( QSize( 48, 24 ) );
+	raiseLayerButton->setMaximumSize( QSize( 48, 24 ) );
 	raiseLayerButton->setText( "" );
 	raiseLayerButton->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
 	Layout1->addWidget( raiseLayerButton );
 
 	lowerLayerButton = new QPushButton( this );
-	lowerLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	lowerLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	lowerLayerButton->setIconSize(QSize(16, 16));
+	lowerLayerButton->setMinimumSize( QSize( 48, 24 ) );
+	lowerLayerButton->setMaximumSize( QSize( 48, 24 ) );
 	lowerLayerButton->setText( "" );
 	lowerLayerButton->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
 	Layout1->addWidget( lowerLayerButton );
diff --git a/scribus/ui/propertiespalette_shapebase.ui b/scribus/ui/propertiespalette_shapebase.ui
index 72ba06355..6e282ac4e 100644
--- a/scribus/ui/propertiespalette_shapebase.ui
+++ b/scribus/ui/propertiespalette_shapebase.ui
@@ -48,16 +48,16 @@
        </property>
        <item>
         <widget class="QToolButton" name="textFlowDisabled">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>22</width>
-           <height>16777215</height>
+           <width>24</width>
+           <height>24</height>
           </size>
          </property>
          <property name="toolTip">
@@ -82,16 +82,16 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesFrameShape">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>22</width>
-           <height>16777215</height>
+           <width>24</width>
+           <height>24</height>
           </size>
          </property>
          <property name="toolTip">
@@ -116,16 +116,16 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesBoundingBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>22</width>
-           <height>16777215</height>
+           <width>24</width>
+           <height>24</height>
           </size>
          </property>
          <property name="toolTip">
@@ -150,16 +150,16 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesContourLine">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>22</width>
-           <height>16777215</height>
+           <width>24</width>
+           <height>24</height>
           </size>
          </property>
          <property name="toolTip">
@@ -184,16 +184,16 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesImageClipping">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>22</width>
-           <height>16777215</height>
+           <width>24</width>
+           <height>24</height>
           </size>
          </property>
          <property name="toolTip">
@@ -238,6 +238,18 @@
        </property>
        <item>
         <widget class="Autoforms" name="customShape">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Choose the shape of frame...</string>
          </property>
@@ -268,10 +280,22 @@
        </item>
        <item>
         <widget class="QLabel" name="roundRectIcon">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize">
           <size>
-           <width>10</width>
-           <height>10</height>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="toolTip">
@@ -318,6 +342,18 @@
        </property>
        <item>
         <widget class="QToolButton" name="evenOdd">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)</string>
          </property>
@@ -337,6 +373,18 @@
        </item>
        <item>
         <widget class="QToolButton" name="nonZero">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Fill is solid unless a subpath is counterdirectional  (fill-rule: nonzero)</string>
          </property>
diff --git a/scribus/ui/propertiespalette_tablebase.ui b/scribus/ui/propertiespalette_tablebase.ui
index 48d96dc0b..b51e4e73b 100644
--- a/scribus/ui/propertiespalette_tablebase.ui
+++ b/scribus/ui/propertiespalette_tablebase.ui
@@ -72,6 +72,18 @@
       </item>
       <item row="0" column="2">
        <widget class="QToolButton" name="buttonClearTableStyle">
+        <property name="minimumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
         <property name="toolTip">
          <string>Remove Direct Table Formatting</string>
         </property>
@@ -108,6 +120,18 @@
       </item>
       <item row="1" column="2">
        <widget class="QToolButton" name="buttonClearCellStyle">
+        <property name="minimumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
         <property name="toolTip">
          <string>Remove Direct Cell Formatting</string>
         </property>
@@ -290,14 +314,14 @@
             </property>
             <property name="minimumSize">
              <size>
-              <width>20</width>
-              <height>20</height>
+              <width>24</width>
+              <height>24</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
-              <width>20</width>
-              <height>20</height>
+              <width>24</width>
+              <height>24</height>
              </size>
             </property>
             <property name="text">
@@ -318,14 +342,14 @@
             </property>
             <property name="minimumSize">
              <size>
-              <width>20</width>
-              <height>20</height>
+              <width>24</width>
+              <height>24</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
-              <width>20</width>
-              <height>20</height>
+              <width>24</width>
+              <height>24</height>
              </size>
             </property>
             <property name="text">
diff --git a/scribus/ui/propertiespalette_xyzbase.ui b/scribus/ui/propertiespalette_xyzbase.ui
index 47fabf1f5..c36538939 100644
--- a/scribus/ui/propertiespalette_xyzbase.ui
+++ b/scribus/ui/propertiespalette_xyzbase.ui
@@ -272,10 +272,16 @@
         </property>
         <item row="0" column="0">
          <widget class="QToolButton" name="levelUp">
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
-            <width>22</width>
-            <height>22</height>
+            <width>24</width>
+            <height>24</height>
            </size>
           </property>
           <property name="toolTip">
@@ -288,10 +294,16 @@
         </item>
         <item row="1" column="0">
          <widget class="QToolButton" name="levelDown">
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
-            <width>22</width>
-            <height>22</height>
+            <width>24</width>
+            <height>24</height>
            </size>
           </property>
           <property name="toolTip">
@@ -304,10 +316,16 @@
         </item>
         <item row="0" column="1">
          <widget class="QToolButton" name="levelTop">
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
-            <width>22</width>
-            <height>22</height>
+            <width>24</width>
+            <height>24</height>
            </size>
           </property>
           <property name="toolTip">
@@ -320,10 +338,16 @@
         </item>
         <item row="1" column="1">
          <widget class="QToolButton" name="levelBottom">
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
-            <width>22</width>
-            <height>22</height>
+            <width>24</width>
+            <height>24</height>
            </size>
           </property>
           <property name="toolTip">
@@ -367,6 +391,18 @@
        </property>
        <item row="0" column="0">
         <widget class="QToolButton" name="doGroup">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Group the selected objects</string>
          </property>
@@ -377,6 +413,18 @@
        </item>
        <item row="1" column="0">
         <widget class="QToolButton" name="doUnGroup">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Ungroup the selected group</string>
          </property>
@@ -387,6 +435,18 @@
        </item>
        <item row="0" column="1">
         <widget class="QToolButton" name="flipH">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Flip horizontally</string>
          </property>
@@ -397,6 +457,18 @@
        </item>
        <item row="1" column="1">
         <widget class="QToolButton" name="flipV">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Flip vertically</string>
          </property>
@@ -407,6 +479,18 @@
        </item>
        <item row="0" column="2">
         <widget class="QToolButton" name="doLock">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Lock or unlock the object</string>
          </property>
@@ -417,6 +501,18 @@
        </item>
        <item row="1" column="2">
         <widget class="QToolButton" name="noPrint">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Enable or disable exporting of the object</string>
          </property>
@@ -427,6 +523,18 @@
        </item>
        <item row="0" column="3">
         <widget class="QToolButton" name="noResize">
+         <property name="minimumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Lock or unlock the size of the object</string>
          </property>
diff --git a/scribus/ui/scrapbookpalette.cpp b/scribus/ui/scrapbookpalette.cpp
index febb8443a..1d0436fd5 100644
--- a/scribus/ui/scrapbookpalette.cpp
+++ b/scribus/ui/scrapbookpalette.cpp
@@ -734,20 +734,30 @@ Biblio::Biblio(QWidget* parent) : ScDockPalette(parent, "Sclib", Qt::WindowFlags
 	newButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	newButton->setIcon(IconManager::instance().loadPixmap("16/document-new.png"));
 	newButton->setIconSize(QSize(16, 16));
+	newButton->setMinimumSize(24, 24);
+	newButton->setMaximumSize(24, 24);
 	upButton = new QToolButton(this);
 	upButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	upButton->setIcon(IconManager::instance().loadPixmap("16/go-up.png"));
 	upButton->setIconSize(QSize(16, 16));
+	upButton->setMinimumSize(24, 24);
+	upButton->setMaximumSize(24, 24);
 	importButton = new QToolButton(this);
 	importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	importButton->setIcon(IconManager::instance().loadPixmap("compfile16.png"));
 	importButton->setIconSize(QSize(16, 16));
+	importButton->setMinimumSize(24, 24);
+	importButton->setMaximumSize(24, 24);
 	closeButton = new QToolButton(this);
 	closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	closeButton->setIcon(IconManager::instance().loadPixmap("16/close.png"));
 	closeButton->setIconSize(QSize(16, 16));
+	closeButton->setMinimumSize(24, 24);
+	closeButton->setMaximumSize(24, 24);
 	configButton = new QToolButton(this);
 	configButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+	configButton->setMinimumSize(24, 24);
+	configButton->setMaximumSize(24, 24);
 
 	configMenue = new QMenu();
 	conf_HideDirs = configMenue->addAction( tr("Hide Directories"));
diff --git a/scribus/ui/transparencypalette.ui b/scribus/ui/transparencypalette.ui
index a407d2792..7119e821e 100644
--- a/scribus/ui/transparencypalette.ui
+++ b/scribus/ui/transparencypalette.ui
@@ -36,6 +36,18 @@
      </property>
      <item>
       <widget class="QToolButton" name="editLineSelector">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
        <property name="toolTip">
         <string>Edit Line Color Properties</string>
        </property>
@@ -52,6 +64,18 @@
      </item>
      <item>
       <widget class="QToolButton" name="editFillSelector">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
        <property name="toolTip">
         <string>Edit Fill Color Properties</string>
        </property>
-- 
2.27.0

custom_shapes.gif (4,794 bytes)   
custom_shapes.gif (4,794 bytes)   
layers.gif (8,603 bytes)   
layers.gif (8,603 bytes)   
pp_shape.gif (12,423 bytes)   
pp_shape.gif (12,423 bytes)   
pp_transparency.gif (9,046 bytes)   
pp_transparency.gif (9,046 bytes)   
pp_xyz.gif (12,164 bytes)   
pp_xyz.gif (12,164 bytes)   
scrapbook.gif (6,459 bytes)   
scrapbook.gif (6,459 bytes)   
tables.gif (31,812 bytes)   
tables.gif (31,812 bytes)   

jghali

2021-03-06 11:06

administrator   ~0048917

On Windows, the result for the shape tab of properties palette does not look quite right: the toolbutton next to "Shape" label appears much bigger than the "Edit" button next to it. I'm not sure either that setting fixed size for widgets is a good idea: normally the size of widgets is driven by Qt theme and platform, using fixed size widgets may triggers some widgets to look alien with specific themes.
16505-shape-tab-win.png (4,104 bytes)   
16505-shape-tab-win.png (4,104 bytes)   

bubu

2021-03-06 11:39

reporter   ~0048918

Jean, thanks for reviewing.

Currently we have 22×22, 23×22, 24×23, 24×24 icon buttons across the interface (on Linux). I think it would be nice to have an uniform interface. Without this patch the layout is non uniform on Linux and on Windows too... If fixed size isn't the solution for the problem, please clarify how to do this cross platform?

To understand the problem according the Shape tab:
On Linux currently:
- The frame shape button is: 24×23 (generic),
- The height of "Edit..." button is generic 24px.
- Text flow buttons are 22×22 (fixed)
- Fill rule buttons are 24×24 (fixed)
It is very non uniform :).

Sorry for my ignorance. I agree that the best solution is to let Qt do its job. But it doesn't do it... What is the Qt's solution for this cross platform problem? Global CSS? If fixed size is a wrong way, than please show me the right way.

bubu

2021-03-06 12:32

reporter   ~0048920

I'm thinking, thinking... What happens if we remove all size related attributes from icon buttons = use Qt's generic size = let Qt to do its job? It would be a huge task to remove all sizes from the icon buttons across all .ui and .cpp files, but let see is it a solution or not...

Here is a small test file for Shape tab: removed all minimum and maximum sizes.
The output on Linux:
- The frame shape button is: 24×23
- The height of "Edit..." button is generic 24px
- Text flow buttons are 24×23
- Fill rule buttons are 24×23
Not perfect... but not so bad. I don't understand why they're not the same height and width.

What happens on Windows?

bubu

2021-03-06 12:33

reporter  

0001-Generic-size-test-for-icon-buttons.patch (4,708 bytes)   
From ebbde1472ba556a3db59cc54f4950c400b3bd05c Mon Sep 17 00:00:00 2001
Message-Id: <ebbde1472ba556a3db59cc54f4950c400b3bd05c.1615033379.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sat, 6 Mar 2021 13:22:34 +0100
Subject: [PATCH] Generic size test for icon buttons

---
 scribus/ui/propertiespalette_shapebase.ui | 76 +++++------------------
 1 file changed, 14 insertions(+), 62 deletions(-)

diff --git a/scribus/ui/propertiespalette_shapebase.ui b/scribus/ui/propertiespalette_shapebase.ui
index 72ba06355..fa19059aa 100644
--- a/scribus/ui/propertiespalette_shapebase.ui
+++ b/scribus/ui/propertiespalette_shapebase.ui
@@ -48,18 +48,6 @@
        </property>
        <item>
         <widget class="QToolButton" name="textFlowDisabled">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around frame disabled</string>
          </property>
@@ -82,18 +70,6 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesFrameShape">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around frame shape</string>
          </property>
@@ -116,18 +92,6 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesBoundingBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around bounding box</string>
          </property>
@@ -150,18 +114,6 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesContourLine">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around contour line</string>
          </property>
@@ -184,18 +136,6 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesImageClipping">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around image clip path</string>
          </property>
@@ -268,10 +208,22 @@
        </item>
        <item>
         <widget class="QLabel" name="roundRectIcon">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize">
           <size>
-           <width>10</width>
-           <height>10</height>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>22</width>
+           <height>22</height>
           </size>
          </property>
          <property name="toolTip">
-- 
2.27.0

fixed-generic.gif (14,228 bytes)   
fixed-generic.gif (14,228 bytes)   

jghali

2021-03-08 08:11

administrator   ~0048922

On Windows, the generic size test patch does not fix the inconsistent vertical size of shape toolbutton and edit toolbutton. It seems that Qt is using different algorithms to determine the size of toolbuttons depending on their content (icon or text). In order to have the inconsistent sizes of shape toolbutton and edit toolbutton fixed, a solution/hack can be to set the vertical size policy of edit toolbutton to preferred.
16505-shape-edit-toolbuttons-size-test.patch (3,605 bytes)   
Index: scribus/ui/propertiespalette_shapebase.ui
===================================================================
--- scribus/ui/propertiespalette_shapebase.ui	(revision 24558)
+++ scribus/ui/propertiespalette_shapebase.ui	(working copy)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>280</width>
-    <height>97</height>
+    <height>98</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -64,7 +64,7 @@
           <string>Text flow around frame disabled</string>
          </property>
          <property name="text">
-          <string>Disabled</string>
+          <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -98,7 +98,7 @@
           <string>Text flow around frame shape</string>
          </property>
          <property name="text">
-          <string>Use Frame &amp;Shape</string>
+          <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -132,7 +132,7 @@
           <string>Text flow around bounding box</string>
          </property>
          <property name="text">
-          <string>Use &amp;Bounding Box</string>
+          <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -166,7 +166,7 @@
           <string>Text flow around contour line</string>
          </property>
          <property name="text">
-          <string>&amp;Use Contour Line</string>
+          <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -200,7 +200,7 @@
           <string>Text flow around image clip path</string>
          </property>
          <property name="text">
-          <string>Use Image Clip Path</string>
+          <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -242,12 +242,18 @@
           <string>Choose the shape of frame...</string>
          </property>
          <property name="text">
-          <string>...</string>
+          <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QToolButton" name="editShape">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>&amp;Edit...</string>
          </property>
@@ -284,12 +290,6 @@
        </item>
        <item>
         <widget class="ScrSpinBox" name="roundRect">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="toolTip">
           <string>Set radius of corner rounding</string>
          </property>
@@ -322,7 +322,7 @@
           <string>Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)</string>
          </property>
          <property name="text">
-          <string>...</string>
+          <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -341,7 +341,7 @@
           <string>Fill is solid unless a subpath is counterdirectional  (fill-rule: nonzero)</string>
          </property>
          <property name="text">
-          <string>...</string>
+          <string/>
          </property>
          <property name="checkable">
           <bool>true</bool>
16505-shape-tab-win2.png (3,990 bytes)   
16505-shape-tab-win2.png (3,990 bytes)   

bubu

2021-03-09 21:17

reporter   ~0048925

Thanks for the suggestion and for you patient. Unfortunately your patch with vertical size policy is not perfect on Linux: the "Edit..." toolbutton is 2px larger as expected. See the attached screenshot. I finally realized that the cause of this anomaly is the spinbox on the right, because its default height is 25px (23px + 1px +1px margin) and they are in same grid layout.

I suggest an another workaround: set maximum height for "Edit" toolbutton to 23px. On Windows the height is smaller, it should be good for Windows.

Anyway, this is a unique problem. I have not seen such a problem elsewhere. If you don't like my fix choose yours.
new_proposal.gif (14,362 bytes)   
new_proposal.gif (14,362 bytes)   

bubu

2021-03-09 21:20

reporter   ~0048926

Jean, here is the new patch for this issue with generic, platform independent button sizes. Let Qt to do its job :-). Please review again. Thanks.

Comments:
- I removed all minimum and maximum sizes from toolbuttons. Currently on Linux the default size is 24×23 px.
- I deleted all text from toolbuttons. Clean up.
- In Layers and in Table panels I convert QPushButtons to QToolButtons because they default size are different.
- There is no visual changes in Custom Shapes, Transparency palette and Scrapbook palette.
- As I wrote above, in Shape palette I propose an another fix for "Edit" toolbox, but feel free to use what you prefer.

I hope this patch is better than the first one.

ps.: Thanks for updating Mantis.
0001-Unify-size-of-icon-buttons-on-dock-palettes-2.patch (30,084 bytes)   
From 0849664f054acbff0006fb4f5c5d3c8b34ca5fc7 Mon Sep 17 00:00:00 2001
Message-Id: <0849664f054acbff0006fb4f5c5d3c8b34ca5fc7.1615310398.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Tue, 9 Mar 2021 18:19:48 +0100
Subject: [PATCH] Unify size of icon buttons on dock palettes

---
 scribus/ui/aligndistribute.ui             |  84 ------------------
 scribus/ui/layers.cpp                     |  38 ++++----
 scribus/ui/layers.h                       |  11 ++-
 scribus/ui/propertiespalette_shapebase.ui | 102 ++--------------------
 scribus/ui/propertiespalette_tablebase.ui |  44 +---------
 scribus/ui/propertiespalette_xyzbase.ui   |  62 +------------
 scribus/ui/transparencypalette.ui         |   6 --
 7 files changed, 40 insertions(+), 307 deletions(-)

diff --git a/scribus/ui/aligndistribute.ui b/scribus/ui/aligndistribute.ui
index 30163d713..762553765 100644
--- a/scribus/ui/aligndistribute.ui
+++ b/scribus/ui/aligndistribute.ui
@@ -168,9 +168,6 @@
            <layout class="QGridLayout" name="_5">
             <item row="1" column="3">
              <widget class="QToolButton" name="alignBottomInToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -181,9 +178,6 @@
             </item>
             <item row="1" column="1">
              <widget class="QToolButton" name="alignTopInToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -194,9 +188,6 @@
             </item>
             <item row="0" column="1">
              <widget class="QToolButton" name="alignLeftInToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -207,9 +198,6 @@
             </item>
             <item row="0" column="3">
              <widget class="QToolButton" name="alignRightInToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -220,9 +208,6 @@
             </item>
             <item row="1" column="4">
              <widget class="QToolButton" name="alignBottomOutToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -233,9 +218,6 @@
             </item>
             <item row="1" column="0">
              <widget class="QToolButton" name="alignTopOutToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -246,9 +228,6 @@
             </item>
             <item row="1" column="2">
              <widget class="QToolButton" name="alignCenterVerToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -259,9 +238,6 @@
             </item>
             <item row="0" column="0">
              <widget class="QToolButton" name="alignLeftOutToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -272,9 +248,6 @@
             </item>
             <item row="0" column="4">
              <widget class="QToolButton" name="alignRightOutToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -285,9 +258,6 @@
             </item>
             <item row="0" column="2">
              <widget class="QToolButton" name="alignCenterHorToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -379,9 +349,6 @@
            <layout class="QGridLayout" name="_7">
             <item row="0" column="3">
              <widget class="QToolButton" name="distributeDistHToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -392,9 +359,6 @@
             </item>
             <item row="1" column="2">
              <widget class="QToolButton" name="distributeTopToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -405,9 +369,6 @@
             </item>
             <item row="1" column="1">
              <widget class="QToolButton" name="distributeCenterVToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -418,9 +379,6 @@
             </item>
             <item row="0" column="2">
              <widget class="QToolButton" name="distributeRightToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -431,9 +389,6 @@
             </item>
             <item row="3" column="0">
              <widget class="QToolButton" name="toolButtonDummy1">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -447,9 +402,6 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -460,9 +412,6 @@
             </item>
             <item row="0" column="0">
              <widget class="QToolButton" name="distributeLeftToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -476,9 +425,6 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -489,9 +435,6 @@
             </item>
             <item row="3" column="1">
              <widget class="QToolButton" name="distributeDistValueHToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -505,9 +448,6 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -518,9 +458,6 @@
             </item>
             <item row="0" column="1">
              <widget class="QToolButton" name="distributeCenterHToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -531,9 +468,6 @@
             </item>
             <item row="3" column="3">
              <widget class="QToolButton" name="toolButtonDummy2">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -547,9 +481,6 @@
               <property name="enabled">
                <bool>true</bool>
               </property>
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -560,9 +491,6 @@
             </item>
             <item row="3" column="2">
              <widget class="QToolButton" name="distributeDistValueVToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -573,9 +501,6 @@
             </item>
             <item row="1" column="3">
              <widget class="QToolButton" name="distributeDistVToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -586,9 +511,6 @@
             </item>
             <item row="1" column="0">
              <widget class="QToolButton" name="distributeBottomToolButton">
-              <property name="text">
-               <string/>
-              </property>
               <property name="iconSize">
                <size>
                 <width>22</width>
@@ -790,9 +712,6 @@
           </item>
           <item>
            <widget class="QToolButton" name="swapLeftToolButton">
-            <property name="text">
-             <string/>
-            </property>
             <property name="iconSize">
              <size>
               <width>22</width>
@@ -803,9 +722,6 @@
           </item>
           <item>
            <widget class="QToolButton" name="swapRightToolButton">
-            <property name="text">
-             <string/>
-            </property>
             <property name="iconSize">
              <size>
               <width>22</width>
diff --git a/scribus/ui/layers.cpp b/scribus/ui/layers.cpp
index ebef61598..7dbf117e6 100644
--- a/scribus/ui/layers.cpp
+++ b/scribus/ui/layers.cpp
@@ -24,7 +24,6 @@ for which a new license (GPL+exception) is in place.
 #include <QLabel>
 #include <QMessageBox>
 #include <QPixmap>
-#include <QPushButton>
 #include <QSignalBlocker>
 #include <QSpacerItem>
 #include <QTableWidget>
@@ -108,41 +107,46 @@ LayerPalette::LayerPalette(QWidget* parent) : ScDockPalette(parent, "Layers", Qt
 
 	Layout1 = new QHBoxLayout;
 	Layout1->setContentsMargins(0, 0, 0, 0);
-	Layout1->setSpacing(0);
+	Layout1->setSpacing(3);
 	QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	Layout1->addItem( spacer );
 
-	newLayerButton = new QPushButton( this );
-	newLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	newLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	newLayerButton = new QToolButton( this );
+	newLayerButton->setIconSize(QSize(16, 16));
+	newLayerButton->setMinimumSize( QSize( 48, 0 ) );
+	newLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	newLayerButton->setText( "" );
 	newLayerButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
 	Layout1->addWidget( newLayerButton );
 
-	deleteLayerButton = new QPushButton( this );
-	deleteLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	deleteLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	deleteLayerButton = new QToolButton( this );
+	deleteLayerButton->setIconSize(QSize(16, 16));
+	deleteLayerButton->setMinimumSize( QSize( 48, 0 ) );
+	deleteLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	deleteLayerButton->setText( "" );
 	deleteLayerButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
 	Layout1->addWidget( deleteLayerButton );
 	
-	duplicateLayerButton = new QPushButton( this );
-	duplicateLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	duplicateLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	duplicateLayerButton = new QToolButton( this );
+	duplicateLayerButton->setIconSize(QSize(16, 16));
+	duplicateLayerButton->setMinimumSize( QSize( 48, 0 ) );
+	duplicateLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	duplicateLayerButton->setText( "" );
 	duplicateLayerButton->setIcon(IconManager::instance().loadIcon("16/edit-copy.png"));
 	Layout1->addWidget( duplicateLayerButton );
 
-	raiseLayerButton = new QPushButton( this );
-	raiseLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	raiseLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	raiseLayerButton = new QToolButton( this );
+	raiseLayerButton->setIconSize(QSize(16, 16));
+	raiseLayerButton->setMinimumSize( QSize( 48, 0 ) );
+	raiseLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	raiseLayerButton->setText( "" );
 	raiseLayerButton->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
 	Layout1->addWidget( raiseLayerButton );
 
-	lowerLayerButton = new QPushButton( this );
-	lowerLayerButton->setMinimumSize( QSize( 50, 24 ) );
-	lowerLayerButton->setMaximumSize( QSize( 50, 24 ) );
+	lowerLayerButton = new QToolButton( this );
+	lowerLayerButton->setIconSize(QSize(16, 16));
+	lowerLayerButton->setMinimumSize( QSize( 48, 0 ) );
+	lowerLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	lowerLayerButton->setText( "" );
 	lowerLayerButton->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
 	Layout1->addWidget( lowerLayerButton );
diff --git a/scribus/ui/layers.h b/scribus/ui/layers.h
index c0944925b..723728913 100644
--- a/scribus/ui/layers.h
+++ b/scribus/ui/layers.h
@@ -20,7 +20,6 @@ class QEvent;
 class QHBoxLayout;
 class QHeaderView;
 class QLabel;
-class QPushButton;
 class QTableWidget;
 class QTableWidgetItem;
 class QToolButton;
@@ -79,11 +78,11 @@ protected:
 	QLabel* textLabel2 { nullptr };
 	ScrSpinBox* opacitySpinBox { nullptr };
 	QHeaderView* Header { nullptr };
-	QPushButton* newLayerButton { nullptr };
-	QPushButton* duplicateLayerButton { nullptr };
-	QPushButton* deleteLayerButton { nullptr };
-	QPushButton* raiseLayerButton { nullptr };
-	QPushButton* lowerLayerButton { nullptr };
+	QToolButton* newLayerButton { nullptr };
+	QToolButton* duplicateLayerButton { nullptr };
+	QToolButton* deleteLayerButton { nullptr };
+	QToolButton* raiseLayerButton { nullptr };
+	QToolButton* lowerLayerButton { nullptr };
 	ScLayers *layers { nullptr };
 
 	void changeEvent(QEvent *e) override;
diff --git a/scribus/ui/propertiespalette_shapebase.ui b/scribus/ui/propertiespalette_shapebase.ui
index 72ba06355..d64b176a4 100644
--- a/scribus/ui/propertiespalette_shapebase.ui
+++ b/scribus/ui/propertiespalette_shapebase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>280</width>
-    <height>97</height>
+    <height>95</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -48,24 +48,9 @@
        </property>
        <item>
         <widget class="QToolButton" name="textFlowDisabled">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around frame disabled</string>
          </property>
-         <property name="text">
-          <string>Disabled</string>
-         </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
@@ -82,24 +67,9 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesFrameShape">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around frame shape</string>
          </property>
-         <property name="text">
-          <string>Use Frame &amp;Shape</string>
-         </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
@@ -116,24 +86,9 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesBoundingBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around bounding box</string>
          </property>
-         <property name="text">
-          <string>Use &amp;Bounding Box</string>
-         </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
@@ -150,24 +105,9 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesContourLine">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around contour line</string>
          </property>
-         <property name="text">
-          <string>&amp;Use Contour Line</string>
-         </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
@@ -184,24 +124,9 @@
        </item>
        <item>
         <widget class="QToolButton" name="textFlowUsesImageClipping">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="toolTip">
           <string>Text flow around image clip path</string>
          </property>
-         <property name="text">
-          <string>Use Image Clip Path</string>
-         </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
@@ -241,13 +166,16 @@
          <property name="toolTip">
           <string>Choose the shape of frame...</string>
          </property>
-         <property name="text">
-          <string>...</string>
-         </property>
         </widget>
        </item>
        <item>
         <widget class="QToolButton" name="editShape">
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>23</height>
+          </size>
+         </property>
          <property name="text">
           <string>&amp;Edit...</string>
          </property>
@@ -270,8 +198,8 @@
         <widget class="QLabel" name="roundRectIcon">
          <property name="minimumSize">
           <size>
-           <width>10</width>
-           <height>10</height>
+           <width>16</width>
+           <height>16</height>
           </size>
          </property>
          <property name="toolTip">
@@ -284,12 +212,6 @@
        </item>
        <item>
         <widget class="ScrSpinBox" name="roundRect">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="toolTip">
           <string>Set radius of corner rounding</string>
          </property>
@@ -321,9 +243,6 @@
          <property name="toolTip">
           <string>Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)</string>
          </property>
-         <property name="text">
-          <string>...</string>
-         </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
@@ -340,9 +259,6 @@
          <property name="toolTip">
           <string>Fill is solid unless a subpath is counterdirectional  (fill-rule: nonzero)</string>
          </property>
-         <property name="text">
-          <string>...</string>
-         </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
diff --git a/scribus/ui/propertiespalette_tablebase.ui b/scribus/ui/propertiespalette_tablebase.ui
index 48d96dc0b..fa202a0ba 100644
--- a/scribus/ui/propertiespalette_tablebase.ui
+++ b/scribus/ui/propertiespalette_tablebase.ui
@@ -75,9 +75,6 @@
         <property name="toolTip">
          <string>Remove Direct Table Formatting</string>
         </property>
-        <property name="text">
-         <string/>
-        </property>
         <property name="iconSize">
          <size>
           <width>16</width>
@@ -111,9 +108,6 @@
         <property name="toolTip">
          <string>Remove Direct Cell Formatting</string>
         </property>
-        <property name="text">
-         <string/>
-        </property>
         <property name="iconSize">
          <size>
           <width>16</width>
@@ -277,8 +271,8 @@
           <property name="spacing">
            <number>3</number>
           </property>
-          <item alignment="Qt::AlignTop">
-           <widget class="QPushButton" name="addBorderLineButton">
+          <item>
+           <widget class="QToolButton" name="addBorderLineButton">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -288,25 +282,10 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="minimumSize">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
            </widget>
           </item>
-          <item alignment="Qt::AlignTop">
-           <widget class="QPushButton" name="removeBorderLineButton">
+          <item>
+           <widget class="QToolButton" name="removeBorderLineButton">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -316,21 +295,6 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="minimumSize">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
            </widget>
           </item>
           <item>
diff --git a/scribus/ui/propertiespalette_xyzbase.ui b/scribus/ui/propertiespalette_xyzbase.ui
index 47fabf1f5..b45c51ed9 100644
--- a/scribus/ui/propertiespalette_xyzbase.ui
+++ b/scribus/ui/propertiespalette_xyzbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>280</width>
-    <height>333</height>
+    <height>371</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -228,9 +228,6 @@
           <property name="toolTip">
            <string>Keep the aspect ratio</string>
           </property>
-          <property name="text">
-           <string>...</string>
-          </property>
           <property name="checkable">
            <bool>true</bool>
           </property>
@@ -272,66 +269,30 @@
         </property>
         <item row="0" column="0">
          <widget class="QToolButton" name="levelUp">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
           <property name="toolTip">
            <string>Move one level up</string>
           </property>
-          <property name="text">
-           <string/>
-          </property>
          </widget>
         </item>
         <item row="1" column="0">
          <widget class="QToolButton" name="levelDown">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
           <property name="toolTip">
            <string>Move one level down</string>
           </property>
-          <property name="text">
-           <string/>
-          </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="QToolButton" name="levelTop">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
           <property name="toolTip">
            <string>Move to front</string>
           </property>
-          <property name="text">
-           <string/>
-          </property>
          </widget>
         </item>
         <item row="1" column="1">
          <widget class="QToolButton" name="levelBottom">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
           <property name="toolTip">
            <string>Move to back</string>
           </property>
-          <property name="text">
-           <string/>
-          </property>
          </widget>
         </item>
         <item row="0" column="2" rowspan="2">
@@ -370,9 +331,6 @@
          <property name="toolTip">
           <string>Group the selected objects</string>
          </property>
-         <property name="text">
-          <string/>
-         </property>
         </widget>
        </item>
        <item row="1" column="0">
@@ -380,9 +338,6 @@
          <property name="toolTip">
           <string>Ungroup the selected group</string>
          </property>
-         <property name="text">
-          <string/>
-         </property>
         </widget>
        </item>
        <item row="0" column="1">
@@ -390,9 +345,6 @@
          <property name="toolTip">
           <string>Flip horizontally</string>
          </property>
-         <property name="text">
-          <string/>
-         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -400,9 +352,6 @@
          <property name="toolTip">
           <string>Flip vertically</string>
          </property>
-         <property name="text">
-          <string/>
-         </property>
         </widget>
        </item>
        <item row="0" column="2">
@@ -410,9 +359,6 @@
          <property name="toolTip">
           <string>Lock or unlock the object</string>
          </property>
-         <property name="text">
-          <string/>
-         </property>
         </widget>
        </item>
        <item row="1" column="2">
@@ -420,9 +366,6 @@
          <property name="toolTip">
           <string>Enable or disable exporting of the object</string>
          </property>
-         <property name="text">
-          <string/>
-         </property>
         </widget>
        </item>
        <item row="0" column="3">
@@ -430,9 +373,6 @@
          <property name="toolTip">
           <string>Lock or unlock the size of the object</string>
          </property>
-         <property name="text">
-          <string/>
-         </property>
         </widget>
        </item>
       </layout>
diff --git a/scribus/ui/transparencypalette.ui b/scribus/ui/transparencypalette.ui
index a407d2792..8b869f05c 100644
--- a/scribus/ui/transparencypalette.ui
+++ b/scribus/ui/transparencypalette.ui
@@ -39,9 +39,6 @@
        <property name="toolTip">
         <string>Edit Line Color Properties</string>
        </property>
-       <property name="text">
-        <string/>
-       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
@@ -55,9 +52,6 @@
        <property name="toolTip">
         <string>Edit Fill Color Properties</string>
        </property>
-       <property name="text">
-        <string/>
-       </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
-- 
2.27.0

layers2.gif (8,818 bytes)   
layers2.gif (8,818 bytes)   
pp_shape2.gif (12,330 bytes)   
pp_shape2.gif (12,330 bytes)   
pp_xyz2.gif (11,294 bytes)   
pp_xyz2.gif (11,294 bytes)   
tables2.gif (31,524 bytes)   
tables2.gif (31,524 bytes)   

jghali

2021-03-12 09:16

administrator   ~0048927

Thanks for the updated patch. Looks good on Windows now. I'm waiting a little bit to commit it tho as MrB wants to test it on macOS first.

bubu

2021-03-14 15:53

reporter   ~0048928

Thanks for reviewing the patch. I have to check my outstanding patches to ensure there are no fixed toolbuttons.

FirasH

2021-03-21 14:57

developer   ~0048984

Thanks!
Fixed in 1.5.7.svn (24559)

Issue History

Date Modified Username Field Change
2021-03-02 22:10 bubu New Issue
2021-03-02 22:10 bubu File Added: 0001-Unify-size-of-icon-buttons-on-dock-palettes.patch
2021-03-02 22:10 bubu File Added: custom_shapes.gif
2021-03-02 22:10 bubu File Added: layers.gif
2021-03-02 22:10 bubu File Added: pp_shape.gif
2021-03-02 22:10 bubu File Added: pp_transparency.gif
2021-03-02 22:10 bubu File Added: pp_xyz.gif
2021-03-02 22:10 bubu File Added: scrapbook.gif
2021-03-02 22:10 bubu File Added: tables.gif
2021-03-03 06:19 PeterBenedek Relationship added child of 0013906
2021-03-06 11:06 jghali File Added: 16505-shape-tab-win.png
2021-03-06 11:06 jghali Note Added: 0048917
2021-03-06 11:39 bubu Note Added: 0048918
2021-03-06 12:32 bubu Note Added: 0048920
2021-03-06 12:33 bubu File Added: 0001-Generic-size-test-for-icon-buttons.patch
2021-03-06 12:33 bubu File Added: fixed-generic.gif
2021-03-08 08:11 jghali Note Added: 0048922
2021-03-08 08:11 jghali File Added: 16505-shape-edit-toolbuttons-size-test.patch
2021-03-08 08:11 jghali File Added: 16505-shape-tab-win2.png
2021-03-09 21:17 bubu Note Added: 0048925
2021-03-09 21:17 bubu File Added: new_proposal.gif
2021-03-09 21:20 bubu Note Added: 0048926
2021-03-09 21:20 bubu File Added: 0001-Unify-size-of-icon-buttons-on-dock-palettes-2.patch
2021-03-09 21:20 bubu File Added: layers2.gif
2021-03-09 21:20 bubu File Added: pp_shape2.gif
2021-03-09 21:20 bubu File Added: pp_xyz2.gif
2021-03-09 21:20 bubu File Added: tables2.gif
2021-03-12 09:16 jghali Note Added: 0048927
2021-03-13 14:55 cbradney Assigned To => cbradney
2021-03-13 14:55 cbradney Status new => resolved
2021-03-13 14:55 cbradney Resolution open => fixed
2021-03-13 14:55 cbradney Fixed in Version => 1.5.7.svn
2021-03-14 15:53 bubu Note Added: 0048928
2021-03-21 14:57 FirasH Status resolved => closed
2021-03-21 14:57 FirasH Note Added: 0048984