From f1dac2b3f4f42e2381da1dba39b0ee2ece532727 Mon Sep 17 00:00:00 2001 Message-Id: From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= 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 @@ - + 0 0 + + + 22 + 22 + + + + + 22 + 22 + + @@ -74,13 +86,6 @@ - - - - Qt::Horizontal - - - @@ -94,6 +99,18 @@ 0 + + + 22 + 22 + + + + + 22 + 22 + + @@ -138,12 +155,37 @@ 3 - - + + + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + + + + + + + + @@ -157,8 +199,46 @@ + + + + + + 3 + + + + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + + + + + + + + + 0 + 0 + + Text Language @@ -169,20 +249,6 @@ - - - - 3 - - - - - - - Qt::Horizontal - - - @@ -191,13 +257,25 @@ - + 0 0 + + + 22 + 22 + + + + + 22 + 22 + + - Paragraph St&yle: + ../../resources/icons/zeichen.png @@ -219,10 +297,16 @@ + + + 24 + 24 + + - 22 - 22 + 24 + 24 @@ -247,13 +331,25 @@ - + 0 0 + + + 22 + 22 + + + + + 22 + 22 + + - Character St&yle: + ../../resources/icons/zeichen.png @@ -275,10 +371,16 @@ + + + 24 + 24 + + - 22 - 22 + 24 + 24 @@ -295,13 +397,6 @@ - - - - Qt::Horizontal - - - 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 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 16777215 + 22 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -60,9 +81,30 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 16777215 + 22 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -77,9 +119,30 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 16777215 + 22 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -94,9 +157,30 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 16777215 + 22 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + 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 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + @@ -59,6 +77,24 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + @@ -86,6 +122,24 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + @@ -112,6 +166,24 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + @@ -139,6 +211,24 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + @@ -162,6 +252,24 @@ + + + 0 + 0 + + + + + 22 + 22 + + + + + 22 + 22 + + 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