r24564 by craig - #16509: Updates for layout (bubu)
scribus-commit
scribus-commit at lists.scribus.net
Mon Mar 15 20:19:39 UTC 2021
Author: craig
Date: Mon Mar 15 20:19:39 2021
New Revision: 24564
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24564
Log:
#16509: Updates for layout (bubu)
Modified:
trunk/Scribus/scribus/ui/alignselect.cpp
trunk/Scribus/scribus/ui/directionselect.cpp
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
trunk/Scribus/scribus/ui/propertywidget_advancedbase.ui
trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui
trunk/Scribus/scribus/ui/smalignselect.cpp
trunk/Scribus/scribus/ui/smdirectionselect.cpp
Modified: trunk/Scribus/scribus/ui/alignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/alignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/alignselect.cpp (original)
+++ trunk/Scribus/scribus/ui/alignselect.cpp Mon Mar 15 20:19:39 2021
@@ -22,11 +22,10 @@
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 @@
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 );
Modified: trunk/Scribus/scribus/ui/directionselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/directionselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/directionselect.cpp (original)
+++ trunk/Scribus/scribus/ui/directionselect.cpp Mon Mar 15 20:19:39 2021
@@ -18,12 +18,11 @@
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 @@
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 );
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Mon Mar 15 20:19:39 2021
@@ -58,10 +58,12 @@
fontSize->setPrefix( "" );
fontSizeLabel->setPixmap(IconManager::instance().loadPixmap("zeichen.png"));
lineSpacingLabel->setPixmap(IconManager::instance().loadPixmap("linespacing2.png"));
-
- paraStyleLabel->setBuddy(paraStyleCombo);
+ 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"));
+
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);
Modified: trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_textbase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_textbase.ui Mon Mar 15 20:19:39 2021
@@ -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/>
@@ -75,24 +81,23 @@
</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">
<number>3</number>
</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,11 +143,30 @@
<property name="spacing">
<number>3</number>
</property>
+ <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>
- <widget class="AlignSelect" name="textAlignment" native="true"/>
</item>
<item>
<spacer name="horizontalSpacer_2">
@@ -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>
@@ -170,34 +226,26 @@
</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">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="paraStyleLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Paragraph St&yle:</string>
+ <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="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>
- <property name="text">
- <string>Character St&yle:</string>
+ <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="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>
@@ -294,13 +336,6 @@
</widget>
</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">
Modified: trunk/Scribus/scribus/ui/propertywidget_advancedbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/propertywidget_advancedbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advancedbase.ui (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advancedbase.ui Mon Mar 15 20:19:39 2021
@@ -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,8 +37,23 @@
</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>
@@ -60,8 +75,23 @@
</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>
@@ -77,8 +107,23 @@
</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>
@@ -94,8 +139,23 @@
</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>
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolorbase.ui Mon Mar 15 20:19:39 2021
@@ -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>
Modified: trunk/Scribus/scribus/ui/smalignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/smalignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smalignselect.cpp (original)
+++ trunk/Scribus/scribus/ui/smalignselect.cpp Mon Mar 15 20:19:39 2021
@@ -12,7 +12,6 @@
: 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"));
Modified: trunk/Scribus/scribus/ui/smdirectionselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24564&path=/trunk/Scribus/scribus/ui/smdirectionselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smdirectionselect.cpp (original)
+++ trunk/Scribus/scribus/ui/smdirectionselect.cpp Mon Mar 15 20:19:39 2021
@@ -4,7 +4,6 @@
: 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"));
More information about the scribus-commit
mailing list