0016509: Update layout for Text Properties: unify buttons, layout, new

ID	Project	Category	View Status	Date Submitted	Last Update

0016509	Scribus	User Interface	public	2021-03-04 23:20	2024-10-23 18:42

Reporter	bubu	Assigned To	nitramr
Priority	normal	Severity	minor	Reproducibility	always
Status	closed	Resolution	fixed
Product Version	1.5.7.svn
Target Version	1.7.0	Fixed in Version	1.7.0.svn

Summary	0016509: Update layout for Text Properties: unify buttons, layout, new
Description	After 0016505 I propose a new patch for Text Properties palette to shrink its minimal width: 1. Unify size for buttons and icon labels (as in 0016505) 2. Shrink panel with: The critical rows were "text align" + "language" and "Paragraphs/Character Style". - I split text align and language into 2 rows - I replace text label for paragraphs and character style with an icon label - I removed unnecessary horizontal lines so the height did not increase in total 3. I added two other icon labels for language and text align to increase consistency. 4. "text align" and "text direction" widgets are used in Style Manager too, I attached a corresponding screenshot too. With this patch Properties and Content Properties palette has a similar minimum width, they have much less dead space. :-) :-) :-) Please see the attached patch and review it. I attach icons separately.
Tags	No tags attached.

Patch	No

bubu 2021-03-04 23:20 reporter	0001-Update-layout-for-Text-Properties-unify-buttons-layo.patch (21,693 bytes) From 7d712a59283fb028feb6c9ff1c27212db2f1b5b8 Mon Sep 17 00:00:00 2001 Message-Id: <7d712a59283fb028feb6c9ff1c27212db2f1b5b8.1614897969.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Thu, 4 Mar 2021 23:46:00 +0100 Subject: [PATCH] Update layout for Text Properties: unify buttons, layout, new label icons --- scribus/ui/alignselect.cpp \| 19 ++- scribus/ui/directionselect.cpp \| 10 +- scribus/ui/propertiespalette_text.cpp \| 6 +- scribus/ui/propertiespalette_textbase.ui \| 173 ++++++++++++++++----- scribus/ui/propertywidget_advancedbase.ui \| 84 ++++++++++ scribus/ui/propertywidget_textcolorbase.ui \| 108 +++++++++++++ 6 files changed, 348 insertions(+), 52 deletions(-) diff --git a/scribus/ui/alignselect.cpp b/scribus/ui/alignselect.cpp index f328aac5c..77b256576 100644 --- a/scribus/ui/alignselect.cpp +++ b/scribus/ui/alignselect.cpp @@ -22,11 +22,12 @@ AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent) buttonGroup = new QButtonGroup(this); GroupAlignLayout = new QHBoxLayout( this ); - GroupAlignLayout->setSpacing( 0 ); - GroupAlignLayout->setMargin( 0 ); + GroupAlignLayout->setSpacing(3); + GroupAlignLayout->setContentsMargins(0, 0, 0, 0); TextL = new QToolButton( this ); - TextL->setMaximumSize( QSize( 22, 22 ) ); + TextL->setMaximumSize( QSize(24, 24) ); + TextL->setMinimumSize( QSize(24, 24) ); TextL->setIcon(im.loadIcon("16/format-justify-left.png")); TextL->setCheckable( true ); TextL->setChecked( true ); @@ -34,28 +35,32 @@ AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent) buttonGroup->addButton(TextL, 0); TextC = new QToolButton( this ); - TextC->setMaximumSize( QSize( 22, 22 ) ); + TextC->setMaximumSize( QSize(24, 24) ); + TextC->setMinimumSize( QSize(24, 24) ); TextC->setIcon(im.loadIcon("16/format-justify-center.png")); TextC->setCheckable( true ); GroupAlignLayout->addWidget( TextC ); buttonGroup->addButton(TextC, 1); TextR = new QToolButton( this ); - TextR->setMaximumSize( QSize( 22, 22 ) ); + TextR->setMaximumSize( QSize(24, 24) ); + TextR->setMinimumSize( QSize(24, 24) ); TextR->setIcon(im.loadIcon("16/format-justify-right.png")); TextR->setCheckable( true ); GroupAlignLayout->addWidget( TextR ); buttonGroup->addButton(TextR, 2); TextB = new QToolButton( this ); - TextB->setMaximumSize( QSize( 22, 22 ) ); + TextB->setMaximumSize( QSize(24, 24) ); + TextB->setMinimumSize( QSize(24, 24) ); TextB->setIcon(im.loadIcon("16/format-justify-fill-block.png")); TextB->setCheckable( true ); GroupAlignLayout->addWidget( TextB ); buttonGroup->addButton(TextB, 3); TextF = new QToolButton( this ); - TextF->setMaximumSize( QSize( 22, 22 ) ); + TextF->setMaximumSize( QSize(24, 24) ); + TextF->setMinimumSize( QSize(24, 24) ); TextF->setIcon(im.loadIcon("16/format-justify-fill.png")); TextF->setCheckable( true ); GroupAlignLayout->addWidget( TextF ); diff --git a/scribus/ui/directionselect.cpp b/scribus/ui/directionselect.cpp index 8fa132cf7..44a78a0ba 100644 --- a/scribus/ui/directionselect.cpp +++ b/scribus/ui/directionselect.cpp @@ -18,12 +18,13 @@ DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent) buttonGroup = new QButtonGroup(this); groupSelectLayout = new QHBoxLayout( this ); - groupSelectLayout->setSpacing( 0 ); - groupSelectLayout->setMargin( 5 ); + groupSelectLayout->setSpacing(3); + groupSelectLayout->setContentsMargins(6, 0, 6, 0); groupSelectLayout->setAlignment(Qt::AlignRight); LTR = new QToolButton( this ); - LTR->setMaximumSize( QSize( 22, 22 ) ); + LTR->setMaximumSize( QSize(24, 24) ); + LTR->setMinimumSize( QSize(24, 24) ); LTR->setIcon(IconManager::instance().loadIcon("16/text-direction-ltr.png")); LTR->setCheckable( true ); LTR->setChecked( true ); @@ -31,7 +32,8 @@ DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent) buttonGroup->addButton(LTR, 0); RTL = new QToolButton( this ); - RTL->setMaximumSize( QSize( 22, 22 ) ); + RTL->setMaximumSize( QSize(24, 24) ); + RTL->setMinimumSize( QSize(24, 24) ); RTL->setIcon(IconManager::instance().loadIcon("16/text-direction-rtl.png")); RTL->setCheckable( true ); groupSelectLayout->addWidget( RTL ); diff --git a/scribus/ui/propertiespalette_text.cpp b/scribus/ui/propertiespalette_text.cpp index 0b051faf6..360f3f787 100644 --- a/scribus/ui/propertiespalette_text.cpp +++ b/scribus/ui/propertiespalette_text.cpp @@ -58,10 +58,12 @@ PropertiesPalette_Text::PropertiesPalette_Text( QWidget* parent) : QWidget(paren fontSize->setPrefix( "" ); fontSizeLabel->setPixmap(IconManager::instance().loadPixmap("zeichen.png")); lineSpacingLabel->setPixmap(IconManager::instance().loadPixmap("linespacing2.png")); + textAlignmentLabel->setPixmap(IconManager::instance().loadPixmap("22/text-align.png")); + langLabel->setPixmap(IconManager::instance().loadPixmap("22/language.png")); + paraStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/paragraph-style.png")); + charStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/character-style.png")); - paraStyleLabel->setBuddy(paraStyleCombo); paraStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png")); - charStyleLabel->setBuddy(charStyleCombo); charStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png")); colorWidgets = new PropertyWidget_TextColor(textTree); diff --git a/scribus/ui/propertiespalette_textbase.ui b/scribus/ui/propertiespalette_textbase.ui index b38e3f796..5d4a9338f 100644 --- a/scribus/ui/propertiespalette_textbase.ui +++ b/scribus/ui/propertiespalette_textbase.ui @@ -40,11 +40,23 @@ <item> <widget class="QLabel" name="fontSizeLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -74,13 +86,6 @@ </item> </layout> </item> - <item> - <widget class="Line" name="line_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="spacing"> @@ -94,6 +99,18 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -138,12 +155,37 @@ <property name="spacing"> <number>3</number> </property> - <item alignment="Qt::AlignLeft"> - <widget class="DirectionSelect" name="textDirection" native="true"/> + <item> + <widget class="QLabel" name="textAlignmentLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + </widget> </item> <item> <widget class="AlignSelect" name="textAlignment" native="true"/> </item> + <item alignment="Qt::AlignLeft"> + <widget class="DirectionSelect" name="textDirection" native="true"/> + </item> <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> @@ -157,8 +199,46 @@ </property> </spacer> </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <property name="spacing"> + <number>3</number> + </property> + <item> + <widget class="QLabel" name="langLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> <item> <widget class="QComboBox" name="langCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="toolTip"> <string>Text Language</string> </property> @@ -169,20 +249,6 @@ </item> </layout> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <property name="spacing"> - <number>3</number> - </property> - </layout> - </item> - <item> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> <property name="spacing"> @@ -191,13 +257,25 @@ <item> <widget class="QLabel" name="paraStyleLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> - <string>Paragraph St&yle:</string> + <string/> </property> <property name="pixmap"> <pixmap>../../resources/icons/zeichen.png</pixmap> @@ -219,10 +297,16 @@ </item> <item> <widget class="QToolButton" name="paraStyleClear"> + <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"> @@ -247,13 +331,25 @@ <item> <widget class="QLabel" name="charStyleLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> - <string>Character St&yle:</string> + <string/> </property> <property name="pixmap"> <pixmap>../../resources/icons/zeichen.png</pixmap> @@ -275,10 +371,16 @@ </item> <item> <widget class="QToolButton" name="charStyleClear"> + <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"> @@ -295,13 +397,6 @@ </item> </layout> </item> - <item> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="ScTreeWidget" name="textTree"> <column> diff --git a/scribus/ui/propertywidget_advancedbase.ui b/scribus/ui/propertywidget_advancedbase.ui index baafb2167..6250bd082 100644 --- a/scribus/ui/propertywidget_advancedbase.ui +++ b/scribus/ui/propertywidget_advancedbase.ui @@ -37,9 +37,30 @@ </property> <item row="0" column="0"> <widget class="QLabel" name="textBaseLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="1"> @@ -60,9 +81,30 @@ </item> <item row="0" column="2"> <widget class="QLabel" name="trackingLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="3"> @@ -77,9 +119,30 @@ </item> <item row="1" column="0"> <widget class="QLabel" name="scaleHLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="1"> @@ -94,9 +157,30 @@ </item> <item row="1" column="2"> <widget class="QLabel" name="scaleVLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="3"> diff --git a/scribus/ui/propertywidget_textcolorbase.ui b/scribus/ui/propertywidget_textcolorbase.ui index 950184770..d8a1aff67 100644 --- a/scribus/ui/propertywidget_textcolorbase.ui +++ b/scribus/ui/propertywidget_textcolorbase.ui @@ -36,6 +36,24 @@ </property> <item> <widget class="QLabel" name="fillIcon"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -59,6 +77,24 @@ </item> <item> <widget class="QLabel" name="fillShadeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -86,6 +122,24 @@ </property> <item> <widget class="QLabel" name="strokeIcon"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -112,6 +166,24 @@ </item> <item> <widget class="QLabel" name="strokeShadeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -139,6 +211,24 @@ </property> <item> <widget class="QLabel" name="backIcon"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -162,6 +252,24 @@ </item> <item> <widget class="QLabel" name="backShadeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> -- 2.27.0 0001-Update-layout-for-Text-Properties-unify-buttons-layo.patch (21,693 bytes) icons.png.zip (6,479 bytes) icons.svg.zip (17,998 bytes) text_properties.gif (86,299 bytes) text_properties.gif (86,299 bytes) style_manager.gif (23,341 bytes) style_manager.gif (23,341 bytes)

bubu 2021-03-05 12:41 reporter ~0048914	Rev 24545 breaks this patch too. Here is the new one. Please apply after 0016507. Icon pack (icons.png.zip) is OK. 0001-Update-layout-for-Text-Properties-unify-buttons-layou-2.patch (23,091 bytes) From f1dac2b3f4f42e2381da1dba39b0ee2ece532727 Mon Sep 17 00:00:00 2001 Message-Id: <f1dac2b3f4f42e2381da1dba39b0ee2ece532727.1614947910.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Fri, 5 Mar 2021 13:38:22 +0100 Subject: [PATCH] Update layout for Text Properties: unify buttons, layout, new label icons --- scribus/ui/alignselect.cpp \| 17 +- scribus/ui/directionselect.cpp \| 10 +- scribus/ui/propertiespalette_text.cpp \| 6 +- scribus/ui/propertiespalette_textbase.ui \| 173 ++++++++++++++++----- scribus/ui/propertywidget_advancedbase.ui \| 84 ++++++++++ scribus/ui/propertywidget_textcolorbase.ui \| 108 +++++++++++++ scribus/ui/smalignselect.cpp \| 3 +- scribus/ui/smdirectionselect.cpp \| 3 +- 8 files changed, 351 insertions(+), 53 deletions(-) diff --git a/scribus/ui/alignselect.cpp b/scribus/ui/alignselect.cpp index 674290429..f4f47a6a4 100644 --- a/scribus/ui/alignselect.cpp +++ b/scribus/ui/alignselect.cpp @@ -22,11 +22,12 @@ AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent) buttonGroup = new QButtonGroup(this); GroupAlignLayout = new QHBoxLayout( this ); - GroupAlignLayout->setSpacing( 0 ); + GroupAlignLayout->setSpacing(3); GroupAlignLayout->setContentsMargins(0, 0, 0, 0); TextL = new QToolButton( this ); - TextL->setMaximumSize( QSize( 22, 22 ) ); + TextL->setMaximumSize(24, 24); + TextL->setMinimumSize(24, 24); TextL->setIcon(im.loadIcon("16/format-justify-left.png")); TextL->setCheckable( true ); TextL->setChecked( true ); @@ -34,28 +35,32 @@ AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent) buttonGroup->addButton(TextL, 0); TextC = new QToolButton( this ); - TextC->setMaximumSize( QSize( 22, 22 ) ); + TextC->setMaximumSize(24, 24); + TextC->setMinimumSize(24, 24); TextC->setIcon(im.loadIcon("16/format-justify-center.png")); TextC->setCheckable( true ); GroupAlignLayout->addWidget( TextC ); buttonGroup->addButton(TextC, 1); TextR = new QToolButton( this ); - TextR->setMaximumSize( QSize( 22, 22 ) ); + TextR->setMaximumSize(24, 24); + TextR->setMinimumSize(24, 24); TextR->setIcon(im.loadIcon("16/format-justify-right.png")); TextR->setCheckable( true ); GroupAlignLayout->addWidget( TextR ); buttonGroup->addButton(TextR, 2); TextB = new QToolButton( this ); - TextB->setMaximumSize( QSize( 22, 22 ) ); + TextB->setMaximumSize(24, 24); + TextB->setMinimumSize(24, 24); TextB->setIcon(im.loadIcon("16/format-justify-fill-block.png")); TextB->setCheckable( true ); GroupAlignLayout->addWidget( TextB ); buttonGroup->addButton(TextB, 3); TextF = new QToolButton( this ); - TextF->setMaximumSize( QSize( 22, 22 ) ); + TextF->setMaximumSize(24, 24); + TextF->setMinimumSize(24, 24); TextF->setIcon(im.loadIcon("16/format-justify-fill.png")); TextF->setCheckable( true ); GroupAlignLayout->addWidget( TextF ); diff --git a/scribus/ui/directionselect.cpp b/scribus/ui/directionselect.cpp index 4c5ff48cd..747e2bdb6 100644 --- a/scribus/ui/directionselect.cpp +++ b/scribus/ui/directionselect.cpp @@ -18,12 +18,13 @@ DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent) buttonGroup = new QButtonGroup(this); groupSelectLayout = new QHBoxLayout( this ); - groupSelectLayout->setSpacing( 0 ); - groupSelectLayout->setContentsMargins(5, 5, 5, 5); + groupSelectLayout->setSpacing(3); + groupSelectLayout->setContentsMargins(6, 0, 6, 0); groupSelectLayout->setAlignment(Qt::AlignRight); LTR = new QToolButton( this ); - LTR->setMaximumSize( QSize( 22, 22 ) ); + LTR->setMaximumSize(24, 24); + LTR->setMinimumSize(24, 24); LTR->setIcon(IconManager::instance().loadIcon("16/text-direction-ltr.png")); LTR->setCheckable( true ); LTR->setChecked( true ); @@ -31,7 +32,8 @@ DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent) buttonGroup->addButton(LTR, 0); RTL = new QToolButton( this ); - RTL->setMaximumSize( QSize( 22, 22 ) ); + RTL->setMaximumSize(24, 24); + RTL->setMinimumSize(24, 24); RTL->setIcon(IconManager::instance().loadIcon("16/text-direction-rtl.png")); RTL->setCheckable( true ); groupSelectLayout->addWidget( RTL ); diff --git a/scribus/ui/propertiespalette_text.cpp b/scribus/ui/propertiespalette_text.cpp index 0b051faf6..360f3f787 100644 --- a/scribus/ui/propertiespalette_text.cpp +++ b/scribus/ui/propertiespalette_text.cpp @@ -58,10 +58,12 @@ PropertiesPalette_Text::PropertiesPalette_Text( QWidget* parent) : QWidget(paren fontSize->setPrefix( "" ); fontSizeLabel->setPixmap(IconManager::instance().loadPixmap("zeichen.png")); lineSpacingLabel->setPixmap(IconManager::instance().loadPixmap("linespacing2.png")); + textAlignmentLabel->setPixmap(IconManager::instance().loadPixmap("22/text-align.png")); + langLabel->setPixmap(IconManager::instance().loadPixmap("22/language.png")); + paraStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/paragraph-style.png")); + charStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/character-style.png")); - paraStyleLabel->setBuddy(paraStyleCombo); paraStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png")); - charStyleLabel->setBuddy(charStyleCombo); charStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png")); colorWidgets = new PropertyWidget_TextColor(textTree); diff --git a/scribus/ui/propertiespalette_textbase.ui b/scribus/ui/propertiespalette_textbase.ui index b38e3f796..5d4a9338f 100644 --- a/scribus/ui/propertiespalette_textbase.ui +++ b/scribus/ui/propertiespalette_textbase.ui @@ -40,11 +40,23 @@ <item> <widget class="QLabel" name="fontSizeLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -74,13 +86,6 @@ </item> </layout> </item> - <item> - <widget class="Line" name="line_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="spacing"> @@ -94,6 +99,18 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -138,12 +155,37 @@ <property name="spacing"> <number>3</number> </property> - <item alignment="Qt::AlignLeft"> - <widget class="DirectionSelect" name="textDirection" native="true"/> + <item> + <widget class="QLabel" name="textAlignmentLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + </widget> </item> <item> <widget class="AlignSelect" name="textAlignment" native="true"/> </item> + <item alignment="Qt::AlignLeft"> + <widget class="DirectionSelect" name="textDirection" native="true"/> + </item> <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> @@ -157,8 +199,46 @@ </property> </spacer> </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <property name="spacing"> + <number>3</number> + </property> + <item> + <widget class="QLabel" name="langLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> <item> <widget class="QComboBox" name="langCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="toolTip"> <string>Text Language</string> </property> @@ -169,20 +249,6 @@ </item> </layout> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <property name="spacing"> - <number>3</number> - </property> - </layout> - </item> - <item> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> <property name="spacing"> @@ -191,13 +257,25 @@ <item> <widget class="QLabel" name="paraStyleLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> - <string>Paragraph St&yle:</string> + <string/> </property> <property name="pixmap"> <pixmap>../../resources/icons/zeichen.png</pixmap> @@ -219,10 +297,16 @@ </item> <item> <widget class="QToolButton" name="paraStyleClear"> + <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"> @@ -247,13 +331,25 @@ <item> <widget class="QLabel" name="charStyleLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> - <string>Character St&yle:</string> + <string/> </property> <property name="pixmap"> <pixmap>../../resources/icons/zeichen.png</pixmap> @@ -275,10 +371,16 @@ </item> <item> <widget class="QToolButton" name="charStyleClear"> + <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"> @@ -295,13 +397,6 @@ </item> </layout> </item> - <item> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="ScTreeWidget" name="textTree"> <column> diff --git a/scribus/ui/propertywidget_advancedbase.ui b/scribus/ui/propertywidget_advancedbase.ui index baafb2167..6250bd082 100644 --- a/scribus/ui/propertywidget_advancedbase.ui +++ b/scribus/ui/propertywidget_advancedbase.ui @@ -37,9 +37,30 @@ </property> <item row="0" column="0"> <widget class="QLabel" name="textBaseLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="1"> @@ -60,9 +81,30 @@ </item> <item row="0" column="2"> <widget class="QLabel" name="trackingLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="3"> @@ -77,9 +119,30 @@ </item> <item row="1" column="0"> <widget class="QLabel" name="scaleHLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="1"> @@ -94,9 +157,30 @@ </item> <item row="1" column="2"> <widget class="QLabel" name="scaleVLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="3"> diff --git a/scribus/ui/propertywidget_textcolorbase.ui b/scribus/ui/propertywidget_textcolorbase.ui index 950184770..d8a1aff67 100644 --- a/scribus/ui/propertywidget_textcolorbase.ui +++ b/scribus/ui/propertywidget_textcolorbase.ui @@ -36,6 +36,24 @@ </property> <item> <widget class="QLabel" name="fillIcon"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -59,6 +77,24 @@ </item> <item> <widget class="QLabel" name="fillShadeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -86,6 +122,24 @@ </property> <item> <widget class="QLabel" name="strokeIcon"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -112,6 +166,24 @@ </item> <item> <widget class="QLabel" name="strokeShadeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -139,6 +211,24 @@ </property> <item> <widget class="QLabel" name="backIcon"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -162,6 +252,24 @@ </item> <item> <widget class="QLabel" name="backShadeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> diff --git a/scribus/ui/smalignselect.cpp b/scribus/ui/smalignselect.cpp index cdb7ea940..8a6e9c6a9 100644 --- a/scribus/ui/smalignselect.cpp +++ b/scribus/ui/smalignselect.cpp @@ -12,7 +12,8 @@ SMAlignSelect::SMAlignSelect(QWidget parent) : AlignSelect(parent) { parentButton = new QToolButton(this); - parentButton->setMaximumSize( QSize( 22, 22 ) ); + parentButton->setMaximumSize(24, 24); + parentButton->setMinimumSize(24, 24); parentButton->setCheckable( true ); parentButton->setText( tr("P", "P as in Parent")); parentButton->setToolTip( tr("Use parent style's alignment instead of overriding it")); diff --git a/scribus/ui/smdirectionselect.cpp b/scribus/ui/smdirectionselect.cpp index d54df49ed..f02bf1726 100644 --- a/scribus/ui/smdirectionselect.cpp +++ b/scribus/ui/smdirectionselect.cpp @@ -4,7 +4,8 @@ SMDirectionSelect::SMDirectionSelect(QWidget parent) : DirectionSelect(parent) { parentButton = new QToolButton(this); - parentButton->setMaximumSize( QSize( 22, 22 ) ); + parentButton->setMaximumSize(24, 24); + parentButton->setMinimumSize(24, 24); parentButton->setCheckable( true ); parentButton->setText( tr("P", "P as in Parent")); parentButton->setToolTip( tr("Use parent style's direction instead of overriding it")); -- 2.27.0 0001-Update-layout-for-Text-Properties-unify-buttons-layou-2.patch (23,091 bytes)

cbradney 2021-03-14 17:10 administrator ~0048931	Hmm its broken again?

bubu 2021-03-14 21:19 reporter ~0048932	Yes :-), 0016505 broke it. I updated the patch. Comments: - I removed the fixed size from toolbuttons: ([sm]align select, [sm]direction select widgets) - I set default size for icon labels as in 0016507 (sizepolicy: preferred×preferred, minimum: 20×0, maximum: 22×22) - Others are equal to previous patch. Please review the current patch. Icon pack is in the 1st comment. Thanks again. 0001-Update-layout-for-Text-Properties-unify-buttons-layo-3.patch (19,803 bytes) From 293b4fa9d5c112e3708fce08469c8b16a3f05410 Mon Sep 17 00:00:00 2001 Message-Id: <293b4fa9d5c112e3708fce08469c8b16a3f05410.1615755617.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Sun, 14 Mar 2021 22:00:05 +0100 Subject: [PATCH] Update layout for Text Properties: unify buttons, layout, new label icons --- scribus/ui/alignselect.cpp \| 7 +- scribus/ui/directionselect.cpp \| 6 +- scribus/ui/propertiespalette_text.cpp \| 6 +- scribus/ui/propertiespalette_textbase.ui \| 163 +++++++++++++-------- scribus/ui/propertywidget_advancedbase.ui \| 64 +++++++- scribus/ui/propertywidget_textcolorbase.ui \| 74 +++++++++- scribus/ui/smalignselect.cpp \| 1 - scribus/ui/smdirectionselect.cpp \| 1 - 8 files changed, 241 insertions(+), 81 deletions(-) diff --git a/scribus/ui/alignselect.cpp b/scribus/ui/alignselect.cpp index 674290429..0a0fd87f2 100644 --- a/scribus/ui/alignselect.cpp +++ b/scribus/ui/alignselect.cpp @@ -22,11 +22,10 @@ AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent) buttonGroup = new QButtonGroup(this); GroupAlignLayout = new QHBoxLayout( this ); - GroupAlignLayout->setSpacing( 0 ); + GroupAlignLayout->setSpacing(3); GroupAlignLayout->setContentsMargins(0, 0, 0, 0); TextL = new QToolButton( this ); - TextL->setMaximumSize( QSize( 22, 22 ) ); TextL->setIcon(im.loadIcon("16/format-justify-left.png")); TextL->setCheckable( true ); TextL->setChecked( true ); @@ -34,28 +33,24 @@ AlignSelect::AlignSelect(QWidget* parent) : QWidget(parent) buttonGroup->addButton(TextL, 0); TextC = new QToolButton( this ); - TextC->setMaximumSize( QSize( 22, 22 ) ); TextC->setIcon(im.loadIcon("16/format-justify-center.png")); TextC->setCheckable( true ); GroupAlignLayout->addWidget( TextC ); buttonGroup->addButton(TextC, 1); TextR = new QToolButton( this ); - TextR->setMaximumSize( QSize( 22, 22 ) ); TextR->setIcon(im.loadIcon("16/format-justify-right.png")); TextR->setCheckable( true ); GroupAlignLayout->addWidget( TextR ); buttonGroup->addButton(TextR, 2); TextB = new QToolButton( this ); - TextB->setMaximumSize( QSize( 22, 22 ) ); TextB->setIcon(im.loadIcon("16/format-justify-fill-block.png")); TextB->setCheckable( true ); GroupAlignLayout->addWidget( TextB ); buttonGroup->addButton(TextB, 3); TextF = new QToolButton( this ); - TextF->setMaximumSize( QSize( 22, 22 ) ); TextF->setIcon(im.loadIcon("16/format-justify-fill.png")); TextF->setCheckable( true ); GroupAlignLayout->addWidget( TextF ); diff --git a/scribus/ui/directionselect.cpp b/scribus/ui/directionselect.cpp index 4c5ff48cd..2a592878e 100644 --- a/scribus/ui/directionselect.cpp +++ b/scribus/ui/directionselect.cpp @@ -18,12 +18,11 @@ DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent) buttonGroup = new QButtonGroup(this); groupSelectLayout = new QHBoxLayout( this ); - groupSelectLayout->setSpacing( 0 ); - groupSelectLayout->setContentsMargins(5, 5, 5, 5); + groupSelectLayout->setSpacing(3); + groupSelectLayout->setContentsMargins(6, 0, 6, 0); groupSelectLayout->setAlignment(Qt::AlignRight); LTR = new QToolButton( this ); - LTR->setMaximumSize( QSize( 22, 22 ) ); LTR->setIcon(IconManager::instance().loadIcon("16/text-direction-ltr.png")); LTR->setCheckable( true ); LTR->setChecked( true ); @@ -31,7 +30,6 @@ DirectionSelect::DirectionSelect(QWidget* parent) : QWidget(parent) buttonGroup->addButton(LTR, 0); RTL = new QToolButton( this ); - RTL->setMaximumSize( QSize( 22, 22 ) ); RTL->setIcon(IconManager::instance().loadIcon("16/text-direction-rtl.png")); RTL->setCheckable( true ); groupSelectLayout->addWidget( RTL ); diff --git a/scribus/ui/propertiespalette_text.cpp b/scribus/ui/propertiespalette_text.cpp index 0b051faf6..360f3f787 100644 --- a/scribus/ui/propertiespalette_text.cpp +++ b/scribus/ui/propertiespalette_text.cpp @@ -58,10 +58,12 @@ PropertiesPalette_Text::PropertiesPalette_Text( QWidget* parent) : QWidget(paren fontSize->setPrefix( "" ); fontSizeLabel->setPixmap(IconManager::instance().loadPixmap("zeichen.png")); lineSpacingLabel->setPixmap(IconManager::instance().loadPixmap("linespacing2.png")); + textAlignmentLabel->setPixmap(IconManager::instance().loadPixmap("22/text-align.png")); + langLabel->setPixmap(IconManager::instance().loadPixmap("22/language.png")); + paraStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/paragraph-style.png")); + charStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/character-style.png")); - paraStyleLabel->setBuddy(paraStyleCombo); paraStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png")); - charStyleLabel->setBuddy(charStyleCombo); charStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png")); colorWidgets = new PropertyWidget_TextColor(textTree); diff --git a/scribus/ui/propertiespalette_textbase.ui b/scribus/ui/propertiespalette_textbase.ui index b38e3f796..68fdbcedf 100644 --- a/scribus/ui/propertiespalette_textbase.ui +++ b/scribus/ui/propertiespalette_textbase.ui @@ -39,11 +39,17 @@ </property> <item> <widget class="QLabel" name="fontSizeLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> </property> <property name="text"> <string/> @@ -74,13 +80,6 @@ </item> </layout> </item> - <item> - <widget class="Line" name="line_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="spacing"> @@ -88,11 +87,17 @@ </property> <item> <widget class="QLabel" name="lineSpacingLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> </property> <property name="text"> <string/> @@ -138,12 +143,31 @@ <property name="spacing"> <number>3</number> </property> - <item alignment="Qt::AlignLeft"> - <widget class="DirectionSelect" name="textDirection" native="true"/> + <item> + <widget class="QLabel" name="textAlignmentLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + </widget> </item> <item> <widget class="AlignSelect" name="textAlignment" native="true"/> </item> + <item alignment="Qt::AlignLeft"> + <widget class="DirectionSelect" name="textDirection" native="true"/> + </item> <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> @@ -157,8 +181,40 @@ </property> </spacer> </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <property name="spacing"> + <number>3</number> + </property> + <item> + <widget class="QLabel" name="langLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> <item> <widget class="QComboBox" name="langCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="toolTip"> <string>Text Language</string> </property> @@ -169,20 +225,6 @@ </item> </layout> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <property name="spacing"> - <number>3</number> - </property> - </layout> - </item> - <item> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> <property name="spacing"> @@ -190,14 +232,20 @@ </property> <item> <widget class="QLabel" name="paraStyleLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> </property> <property name="text"> - <string>Paragraph St&yle:</string> + <string/> </property> <property name="pixmap"> <pixmap>../../resources/icons/zeichen.png</pixmap> @@ -219,12 +267,6 @@ </item> <item> <widget class="QToolButton" name="paraStyleClear"> - <property name="maximumSize"> - <size> - <width>22</width> - <height>22</height> - </size> - </property> <property name="toolTip"> <string>Remove Direct Paragraph Formatting</string> </property> @@ -246,14 +288,20 @@ </property> <item> <widget class="QLabel" name="charStyleLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> </property> <property name="text"> - <string>Character St&yle:</string> + <string/> </property> <property name="pixmap"> <pixmap>../../resources/icons/zeichen.png</pixmap> @@ -275,12 +323,6 @@ </item> <item> <widget class="QToolButton" name="charStyleClear"> - <property name="maximumSize"> - <size> - <width>22</width> - <height>22</height> - </size> - </property> <property name="toolTip"> <string>Remove Direct Character Formatting</string> </property> @@ -295,13 +337,6 @@ </item> </layout> </item> - <item> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> <item> <widget class="ScTreeWidget" name="textTree"> <column> diff --git a/scribus/ui/propertywidget_advancedbase.ui b/scribus/ui/propertywidget_advancedbase.ui index baafb2167..bf954c091 100644 --- a/scribus/ui/propertywidget_advancedbase.ui +++ b/scribus/ui/propertywidget_advancedbase.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>239</width> - <height>155</height> + <width>278</width> + <height>161</height> </rect> </property> <property name="windowTitle"> @@ -37,9 +37,24 @@ </property> <item row="0" column="0"> <widget class="QLabel" name="textBaseLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="1"> @@ -60,9 +75,24 @@ </item> <item row="0" column="2"> <widget class="QLabel" name="trackingLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="3"> @@ -77,9 +107,24 @@ </item> <item row="1" column="0"> <widget class="QLabel" name="scaleHLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="1"> @@ -94,9 +139,24 @@ </item> <item row="1" column="2"> <widget class="QLabel" name="scaleVLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> + <property name="alignment"> + <set>Qt::AlignRight\|Qt::AlignTrailing\|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="3"> diff --git a/scribus/ui/propertywidget_textcolorbase.ui b/scribus/ui/propertywidget_textcolorbase.ui index 950184770..ee92357bd 100644 --- a/scribus/ui/propertywidget_textcolorbase.ui +++ b/scribus/ui/propertywidget_textcolorbase.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>147</width> + <width>167</width> <height>135</height> </rect> </property> @@ -36,6 +36,18 @@ </property> <item> <widget class="QLabel" name="fillIcon"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -59,6 +71,18 @@ </item> <item> <widget class="QLabel" name="fillShadeLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -86,6 +110,18 @@ </property> <item> <widget class="QLabel" name="strokeIcon"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -112,6 +148,18 @@ </item> <item> <widget class="QLabel" name="strokeShadeLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -139,6 +187,18 @@ </property> <item> <widget class="QLabel" name="backIcon"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> @@ -162,6 +222,18 @@ </item> <item> <widget class="QLabel" name="backShadeLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> <string/> </property> diff --git a/scribus/ui/smalignselect.cpp b/scribus/ui/smalignselect.cpp index cdb7ea940..90164afb8 100644 --- a/scribus/ui/smalignselect.cpp +++ b/scribus/ui/smalignselect.cpp @@ -12,7 +12,6 @@ SMAlignSelect::SMAlignSelect(QWidget parent) : AlignSelect(parent) { parentButton = new QToolButton(this); - parentButton->setMaximumSize( QSize( 22, 22 ) ); parentButton->setCheckable( true ); parentButton->setText( tr("P", "P as in Parent")); parentButton->setToolTip( tr("Use parent style's alignment instead of overriding it")); diff --git a/scribus/ui/smdirectionselect.cpp b/scribus/ui/smdirectionselect.cpp index d54df49ed..c0334af70 100644 --- a/scribus/ui/smdirectionselect.cpp +++ b/scribus/ui/smdirectionselect.cpp @@ -4,7 +4,6 @@ SMDirectionSelect::SMDirectionSelect(QWidget parent) : DirectionSelect(parent) { parentButton = new QToolButton(this); - parentButton->setMaximumSize( QSize( 22, 22 ) ); parentButton->setCheckable( true ); parentButton->setText( tr("P", "P as in Parent")); parentButton->setToolTip( tr("Use parent style's direction instead of overriding it")); -- 2.27.0 0001-Update-layout-for-Text-Properties-unify-buttons-layo-3.patch (19,803 bytes) alignselect-directionselect.gif (15,472 bytes) alignselect-directionselect.gif (15,472 bytes) text_properties-2.gif (85,251 bytes) text_properties-2.gif (85,251 bytes)

cbradney 2021-03-15 20:21 administrator ~0048936	Hi I have committed this in r24564 however I will add two screenshots that need taking care of. When SM is compressed or extended, the buttons shrink too much or the widgets spacing is not aligned. thanks Craig image.png (13,633 bytes) image.png (13,633 bytes) image-2.png (16,618 bytes) image-2.png (16,618 bytes)

cbradney 2021-03-15 20:41 administrator ~0048937	Also I am not sure if this strange icon came in recently? Like two rubbish bins image-3.png (16,465 bytes) image-3.png (16,465 bytes)

bubu 2021-03-16 16:23 reporter ~0048943	Craig, thanks for reviewing and committing. Now I only react to tabruler topic. I attached a patch to convert QPushButton to QToolButton. This should be fix this error. I have only 1 pixel difference, but you should view more. 0001-Convert-tabruler-delete-and-clear-buttons-to-QToolBu.patch (2,081 bytes) From a258c008bdb077b0eb88f6842e5ee648569a2de5 Mon Sep 17 00:00:00 2001 Message-Id: <a258c008bdb077b0eb88f6842e5ee648569a2de5.1615911333.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Tue, 16 Mar 2021 17:15:23 +0100 Subject: [PATCH] Convert tabruler delete and clear buttons to QToolButton --- scribus/ui/tabruler.cpp \| 10 ++-------- scribus/ui/tabruler.h \| 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/scribus/ui/tabruler.cpp b/scribus/ui/tabruler.cpp index a58140789..47e2bec5b 100644 --- a/scribus/ui/tabruler.cpp +++ b/scribus/ui/tabruler.cpp @@ -542,18 +542,12 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int unit, const QList<Parag tabFillComboT->setBuddy(tabFillCombo); layout1->addWidget( tabFillComboT ); layout1->addWidget( tabFillCombo ); - clearOneButton = new QPushButton( this ); - clearOneButton->setText(""); + clearOneButton = new QToolButton( this ); 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 = new QToolButton( this ); clearButton->setIcon(IconManager::instance().loadIcon("16/edit-delete-all.png")); - clearButton->setMinimumSize(24, 24); - clearButton->setMaximumSize(24, 24); layout1->addWidget(clearButton); indentLayout = new QHBoxLayout; diff --git a/scribus/ui/tabruler.h b/scribus/ui/tabruler.h index 03be41da8..83b56b63d 100644 --- a/scribus/ui/tabruler.h +++ b/scribus/ui/tabruler.h @@ -157,8 +157,8 @@ protected: ScrSpinBox* firstLineData { nullptr }; ScrSpinBox* leftIndentData { nullptr }; ScrSpinBox* rightIndentData { nullptr }; - QPushButton* clearButton { nullptr }; - QPushButton* clearOneButton { nullptr }; + QToolButton* clearButton { nullptr }; + QToolButton* clearOneButton { nullptr }; bool m_haveFirst; double m_docUnitRatio; -- 2.27.0 0001-Convert-tabruler-delete-and-clear-buttons-to-QToolBu.patch (2,081 bytes) 0001-Convert-tabruler-delete-and-clear-buttons-to-QToolBu.gif (16,364 bytes) 0001-Convert-tabruler-delete-and-clear-buttons-to-QToolBu.gif (16,364 bytes)

cbradney 2021-03-16 20:44 administrator ~0048945	That's fixed, thanks

bubu 2021-03-17 15:20 reporter ~0048954	Craig, can you please update public SVN(/Github/Gitlab) repo? (I work from Gitlab's repository.) I want to address spacing problem but I need the last source code. Thanks.

cbradney 2021-03-17 20:50 administrator ~0048957	I don't know how the github stuff is updated, sorry. Its not by us and we class it as unsupported. Officially, we only support SVN.

bubu 2021-03-18 19:09 reporter ~0048959	Craig, thanks for the information. It wasn't clear for me that we do not have official git repository. It's a little weird for me but I don't know the history of Scribus development. There must be a reason for that . OK, I have no experience in SVN, so I have to setup a private SVN to Git sync. I'm trying. About 0016509:0048936 and spacing problem (image-2.png): I propose to reorganize the spacers. I'm not happy with this interface but better than was. This time I attach a Qt Designer screenshot. This tells more about the proposal. Please test the attached patch. Thank you. 0001-Update-layout-for-SM-paragraph-properties-page.patch (34,777 bytes) From f5b2efeb792b68563a8342ed93d399da1fb03b9b Mon Sep 17 00:00:00 2001 Message-Id: <f5b2efeb792b68563a8342ed93d399da1fb03b9b.1616093310.git.bubu@ujevangelizacio.hu> From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu> Date: Thu, 18 Mar 2021 19:48:12 +0100 Subject: [PATCH] Update layout for SM paragraph properties page --- scribus/ui/smpstylewidget.ui \| 778 ++++++++++++++++++----------------- 1 file changed, 393 insertions(+), 385 deletions(-) diff --git a/scribus/ui/smpstylewidget.ui b/scribus/ui/smpstylewidget.ui index 68dc7e488..63ad5fa42 100644 --- a/scribus/ui/smpstylewidget.ui +++ b/scribus/ui/smpstylewidget.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>695</width> - <height>613</height> + <width>665</width> + <height>574</height> </rect> </property> <layout class="QVBoxLayout"> @@ -50,100 +50,145 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QGroupBox" name="distancesBox"> + <item row="1" column="1"> + <widget class="QGroupBox" name="advSettingsGroupBox"> + <property name="enabled"> + <bool>true</bool> + </property> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> <property name="title"> - <string>Alignment and Distances</string> + <string>Advanced Settings</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <item> - <widget class="SMAlignSelect" name="alignment" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item> - <widget class="SMDirectionSelect" name="direction" native="true"/> - </item> - <item> - <spacer name="horizontalSpacer_4"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> + <layout class="QVBoxLayout" name="verticalLayout_9"> <item> - <layout class="QHBoxLayout" name="horizontalLayout_9"> - <item> - <widget class="QLabel" name="lineSpacingLabel"> - <property name="minimumSize"> - <size> - <width>20</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>22</width> - <height>22</height> - </size> - </property> - <property name="text"> - <string/> - </property> - <property name="buddy"> - <cstring>lineSpacingMode</cstring> - </property> - </widget> - </item> - <item> - <widget class="SMScComboBox" name="lineSpacingMode"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Line Spacing Mode</string> - </property> - </widget> - </item> + <layout class="QHBoxLayout" name="horizontalLayout_13"> <item> - <widget class="SMScrSpinBox" name="lineSpacing"> - <property name="toolTip"> - <string>Line Spacing</string> - </property> - <property name="minimum"> - <double>1.000000000000000</double> - </property> - <property name="maximum"> - <double>300.000000000000000</double> - </property> - </widget> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="minSpaceLabel"> + <property name="text"> + <string>Min. Space Width:</string> + </property> + <property name="buddy"> + <cstring>minSpaceSpin</cstring> + </property> + </widget> + </item> + <item> + <widget class="SMScrSpinBox" name="minSpaceSpin"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="baseSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Maximum white space compression allowed. Expressed as a percentage of the current white space value.</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="glyphExtensionLabel"> + <property name="text"> + <string>Glyph Extension </string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="minGlyphExtLabel"> + <property name="text"> + <string>Min:</string> + </property> + <property name="buddy"> + <cstring>minGlyphExtSpin</cstring> + </property> + </widget> + </item> + <item> + <widget class="SMScrSpinBox" name="minGlyphExtSpin"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Maximum compression of glyphs</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="maxGlyphExtLabel"> + <property name="text"> + <string>Max:</string> + </property> + <property name="buddy"> + <cstring>maxGlyphExtSpin</cstring> + </property> + </widget> + </item> + <item> + <widget class="SMScrSpinBox" name="maxGlyphExtSpin"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Maximum extension of glyphs</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Consecutive Hyphenations Allowed:</string> + </property> + </widget> + </item> + <item> + <widget class="SMSpinBox" name="maxConsecutiveCountSpinBox"/> + </item> + </layout> + </item> + </layout> </item> <item> - <spacer name="horizontalSpacer_8"> + <spacer name="horizontalSpacer_7"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -157,87 +202,86 @@ </item> </layout> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QLabel" name="spaceAboveLabel"> - <property name="minimumSize"> - <size> - <width>20</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>22</width> - <height>22</height> - </size> - </property> - <property name="text"> - <string/> - </property> - <property name="buddy"> - <cstring>spaceAbove</cstring> - </property> - </widget> - </item> - <item> - <widget class="SMScrSpinBox" name="spaceAbove"> - <property name="toolTip"> - <string>Space Above</string> - </property> - <property name="maximum"> - <double>300.000000000000000</double> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_9"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="spaceBelowLabel"> - <property name="minimumSize"> - <size> - <width>20</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>22</width> - <height>22</height> - </size> - </property> - <property name="text"> - <string/> - </property> - <property name="buddy"> - <cstring>spaceBelow</cstring> - </property> - </widget> - </item> + </layout> + </widget> + </item> + <item row="1" column="0"> + <widget class="QGroupBox" name="opticalMarginsGroupBox"> + <property name="title"> + <string>Optical Margins</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> <item> - <widget class="SMScrSpinBox" name="spaceBelow"> - <property name="toolTip"> - <string>Space Below</string> - </property> - <property name="maximum"> - <double>300.000000000000000</double> - </property> - </widget> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="2" column="0"> + <widget class="SMRadioButton" name="optMarginRadioLeft"> + <property name="text"> + <string>Left Only</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="SMRadioButton" name="optMarginRadioBoth"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Both Sides</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="SMRadioButton" name="optMarginRadioNone"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>None</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="SMRadioButton" name="optMarginRadioRight"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Right Only</string> + </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> <item> - <spacer name="horizontalSpacer_11"> + <spacer name="horizontalSpacer_15"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -249,20 +293,7 @@ </property> </spacer> </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> + </layout> </item> </layout> </widget> @@ -313,19 +344,6 @@ </property> </widget> </item> - <item> - <spacer name="horizontalSpacer_5"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> <item> <widget class="QLabel" name="keepLabelEnd"> <property name="minimumSize"> @@ -409,234 +427,224 @@ </layout> </widget> </item> - <item row="1" column="0"> - <widget class="QGroupBox" name="opticalMarginsGroupBox"> - <property name="title"> - <string>Optical Margins</string> - </property> - <layout class="QGridLayout" name="gridLayout_3"> - <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>Left Only</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="SMRadioButton" name="optMarginRadioBoth"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Both Sides</string> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="SMRadioButton" name="optMarginRadioNone"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>None</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="SMRadioButton" name="optMarginRadioRight"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Right Only</string> - </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> - </widget> - </item> - <item row="1" column="1"> - <widget class="QGroupBox" name="advSettingsGroupBox"> - <property name="enabled"> - <bool>true</bool> - </property> + <item row="0" column="0"> + <widget class="QGroupBox" name="distancesBox"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> <property name="title"> - <string>Advanced Settings</string> + <string>Alignment and Distances</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_9"> + <layout class="QHBoxLayout" name="horizontalLayout_10"> <item> - <layout class="QHBoxLayout" name="horizontalLayout_13"> + <layout class="QVBoxLayout" name="verticalLayout_10"> <item> - <layout class="QVBoxLayout" name="verticalLayout_7"> + <layout class="QHBoxLayout" name="horizontalLayout_6"> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="minSpaceLabel"> - <property name="text"> - <string>Min. Space Width:</string> - </property> - <property name="buddy"> - <cstring>minSpaceSpin</cstring> - </property> - </widget> - </item> - <item> - <widget class="SMScrSpinBox" name="minSpaceSpin"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Maximum white space compression allowed. Expressed as a percentage of the current white space value.</string> - </property> - </widget> - </item> - </layout> + <widget class="SMAlignSelect" name="alignment" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> <item> - <widget class="QLabel" name="glyphExtensionLabel"> + <widget class="SMDirectionSelect" name="direction" native="true"/> + </item> + <item> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_9"> + <item> + <widget class="QLabel" name="lineSpacingLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> <property name="text"> - <string>Glyph Extension </string> + <string/> + </property> + <property name="buddy"> + <cstring>lineSpacingMode</cstring> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QLabel" name="minGlyphExtLabel"> - <property name="text"> - <string>Min:</string> - </property> - <property name="buddy"> - <cstring>minGlyphExtSpin</cstring> - </property> - </widget> - </item> - <item> - <widget class="SMScrSpinBox" name="minGlyphExtSpin"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Maximum compression of glyphs</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="maxGlyphExtLabel"> - <property name="text"> - <string>Max:</string> - </property> - <property name="buddy"> - <cstring>maxGlyphExtSpin</cstring> - </property> - </widget> - </item> - <item> - <widget class="SMScrSpinBox" name="maxGlyphExtSpin"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Maximum extension of glyphs</string> - </property> - </widget> - </item> - </layout> + <widget class="SMScComboBox" name="lineSpacingMode"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Line Spacing Mode</string> + </property> + </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="label_3"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Consecutive Hyphenations Allowed:</string> - </property> - </widget> - </item> - <item> - <widget class="SMSpinBox" name="maxConsecutiveCountSpinBox"/> - </item> - </layout> + <widget class="SMScrSpinBox" name="lineSpacing"> + <property name="toolTip"> + <string>Line Spacing</string> + </property> + <property name="minimum"> + <double>1.000000000000000</double> + </property> + <property name="maximum"> + <double>300.000000000000000</double> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_8"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> </item> </layout> </item> <item> - <spacer name="horizontalSpacer_7"> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <widget class="QLabel" name="spaceAboveLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="buddy"> + <cstring>spaceAbove</cstring> + </property> + </widget> + </item> + <item> + <widget class="SMScrSpinBox" name="spaceAbove"> + <property name="toolTip"> + <string>Space Above</string> + </property> + <property name="maximum"> + <double>300.000000000000000</double> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="spaceBelowLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="buddy"> + <cstring>spaceBelow</cstring> + </property> + </widget> + </item> + <item> + <widget class="SMScrSpinBox" name="spaceBelow"> + <property name="toolTip"> + <string>Space Below</string> + </property> + <property name="maximum"> + <double>300.000000000000000</double> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_11"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer_3"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>37</width> - <height>17</height> + <width>20</width> + <height>0</height> </size> </property> </spacer> </item> </layout> </item> + <item> + <spacer name="horizontalSpacer_16"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </widget> </item> @@ -673,7 +681,7 @@ </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> + <width>0</width> <height>20</height> </size> </property> @@ -754,7 +762,7 @@ </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> + <width>0</width> <height>20</height> </size> </property> -- 2.27.0 0001-Update-layout-for-SM-paragraph-properties-page.patch (34,777 bytes) 0001-Update-layout-for-SM-paragraph-properties-page.gif (88,507 bytes) 0001-Update-layout-for-SM-paragraph-properties-page.gif (88,507 bytes)

cbradney 2021-03-18 20:10 administrator ~0048960	You don't need anything to do with git at all. Just check out SVN. https://wiki.scribus.net/canvas/Checking_out_SVN as an example. This will give you your local copy of SVN. Then, when you want to create a diff,, just run svn diff from the directory.

bubu 2021-03-21 16:34 reporter ~0049043	Craig, thank you the info about SVN. I tried to setup a workflow with SVN but I miss feature branches. I usually create a feature branch, code something, create patch and send to you. I usually have 3-5 issues parallel and often I have to work with an issue again and when you accept a code I delete my feature branch. I can manage these parallel issues with feature branches. SVN doesn’t cover what I need. Plus I am familiar with Git but SVN unfortunately is an old and unfamiliar territory to me. I successfully set up an SVN to Git mirror. I'm happy with this now. If you can manage my Git patches I want to continue to use Git for development. I hope this is not a problem. About remaining compressed SM layout on MacOS: I can't cause this compressed layout on Linux which is shown on 0016509:0048936 in image.png. I thought about it, I tried to solve it, I looked at the code carefully, but nothing. I think I don't have enough experience to solve the problem. Originally I proposed fixed size (24×24) for QToolButtons with icon only appearance but Jean asked me to switch to Qt's platform independent default sizing. He had some good arguments for this. Jean, do you have an idea to solve this issue? alignment.png (18,909 bytes) alignment.png (18,909 bytes)

bubu 2024-10-23 07:52 reporter ~0051479	@cbradney, this can be mark as fixed too.

Date Modified	Username	Field	Change
2021-03-04 23:20	bubu	New Issue
2021-03-04 23:20	bubu	File Added: 0001-Update-layout-for-Text-Properties-unify-buttons-layo.patch
2021-03-04 23:20	bubu	File Added: icons.png.zip
2021-03-04 23:20	bubu	File Added: icons.svg.zip
2021-03-04 23:20	bubu	File Added: text_properties.gif
2021-03-04 23:20	bubu	File Added: style_manager.gif
2021-03-05 04:52	PeterBenedek	Relationship added	child of 0013906
2021-03-05 12:41	bubu	File Added: 0001-Update-layout-for-Text-Properties-unify-buttons-layou-2.patch
2021-03-05 12:41	bubu	Note Added: 0048914
2021-03-14 17:10	cbradney	Note Added: 0048931
2021-03-14 21:19	bubu	Note Added: 0048932
2021-03-14 21:19	bubu	File Added: 0001-Update-layout-for-Text-Properties-unify-buttons-layo-3.patch
2021-03-14 21:19	bubu	File Added: alignselect-directionselect.gif
2021-03-14 21:19	bubu	File Added: text_properties-2.gif
2021-03-15 20:21	cbradney	Note Added: 0048936
2021-03-15 20:21	cbradney	File Added: image.png
2021-03-15 20:21	cbradney	File Added: image-2.png
2021-03-15 20:41	cbradney	Note Added: 0048937
2021-03-15 20:41	cbradney	File Added: image-3.png
2021-03-16 16:23	bubu	Note Added: 0048943
2021-03-16 16:23	bubu	File Added: 0001-Convert-tabruler-delete-and-clear-buttons-to-QToolBu.patch
2021-03-16 16:23	bubu	File Added: 0001-Convert-tabruler-delete-and-clear-buttons-to-QToolBu.gif
2021-03-16 20:44	cbradney	Note Added: 0048945
2021-03-17 15:20	bubu	Note Added: 0048954
2021-03-17 20:50	cbradney	Note Added: 0048957
2021-03-18 19:09	bubu	Note Added: 0048959
2021-03-18 19:09	bubu	File Added: 0001-Update-layout-for-SM-paragraph-properties-page.patch
2021-03-18 19:09	bubu	File Added: 0001-Update-layout-for-SM-paragraph-properties-page.gif
2021-03-18 20:10	cbradney	Note Added: 0048960
2021-03-21 16:34	bubu	Note Added: 0049043
2021-03-21 16:34	bubu	File Added: alignment.png
2024-10-22 14:43	nitramr	Relationship added	related to 0017285
2024-10-23 07:52	bubu	Note Added: 0051479
2024-10-23 09:07	nitramr	Assigned To	=> nitramr
2024-10-23 09:07	nitramr	Status	new => resolved
2024-10-23 09:07	nitramr	Resolution	open => fixed
2024-10-23 09:07	nitramr	Fixed in Version	=> 1.7.0.svn
2024-10-23 09:07	nitramr	Target Version	=> 1.7.0
2024-10-23 18:42	cbradney	Status	resolved => closed

View Issue Details

Relationships

Activities

Issue History

related to	0017285	closed	nitramr	Indigo UI: Text Properties Palette Redesign (+Style Manager Adjustments)
child of	0013906	acknowledged		Metabug: UI enhancement proposals (1.5.x.svn)