Author: jghali
Date: Thu Jan 7 12:33:40 2021
New Revision: 24381
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24381
Log:
#16407: Unify spacing and margin for dock palettes <bubu>
Modified:
trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
trunk/Scribus/scribus/ui/aligndistribute.ui
trunk/Scribus/scribus/ui/bookmarkpalette.cpp
trunk/Scribus/scribus/ui/inlinepalette.cpp
trunk/Scribus/scribus/ui/layers.cpp
trunk/Scribus/scribus/ui/outlinepalette.cpp
trunk/Scribus/scribus/ui/pagelayout.cpp
trunk/Scribus/scribus/ui/pagepalette_masterpagesbase.ui
trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
trunk/Scribus/scribus/ui/scrapbookpalette.cpp
trunk/Scribus/scribus/ui/symbolpalette.cpp
trunk/Scribus/scribus/undogui.cpp
Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp Thu Jan 7
12:33:40 2021
@@ -282,17 +282,17 @@
{
setMinimumSize( QSize( 220, 240 ) );
setObjectName(QString::fromLocal8Bit("Shap"));
- setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
- containerWidget = new QWidget(this);
- vLayout = new QVBoxLayout( containerWidget );
- vLayout->setSpacing( 0 );
- vLayout->setMargin( 0 );
- buttonLayout = new QHBoxLayout;
- buttonLayout->setSpacing( 5 );
- buttonLayout->setMargin( 0 );
-
- importButton = new QToolButton(this);
- importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
QSizePolicy::Fixed));
+ setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+ containerWidget = new QWidget(this);
+ vLayout = new QVBoxLayout( containerWidget );
+ vLayout->setSpacing(3);
+ vLayout->setContentsMargins(3, 3, 3, 3);
+ buttonLayout = new QHBoxLayout;
+ buttonLayout->setSpacing(6);
+ buttonLayout->setContentsMargins(0, 0, 0, 0);
+
+ importButton = new QToolButton(this);
+ importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
QSizePolicy::Fixed));
importButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
importButton->setIconSize(QSize(16, 16));
buttonLayout->addWidget( importButton );
Modified: trunk/Scribus/scribus/ui/aligndistribute.ui
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/aligndistribute.ui
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.ui (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.ui Thu Jan 7 12:33:40 2021
@@ -15,6 +15,18 @@
</property>
<widget class="QWidget" name="dockWidgetContents">
<layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
@@ -25,8 +37,26 @@
<string>Align</string>
</attribute>
<layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
<item>
<layout class="QHBoxLayout" name="_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<spacer>
<property name="orientation">
@@ -115,6 +145,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="_4">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<spacer>
<property name="orientation">
@@ -306,8 +339,26 @@
<string>Distribute</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
<item>
<layout class="QHBoxLayout" name="_6">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<spacer>
<property name="orientation">
@@ -586,6 +637,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="_9">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="distributeDistLabel">
<property name="text">
@@ -634,6 +688,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<spacer name="spacer">
<property name="orientation">
@@ -698,8 +755,26 @@
<string>Swap</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
Modified: trunk/Scribus/scribus/ui/bookmarkpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/bookmarkpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/bookmarkpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/bookmarkpalette.cpp Thu Jan 7 12:33:40 2021
@@ -28,6 +28,7 @@
BookPalette::BookPalette(QWidget* parent) : ScDockPalette( parent, "Books" )
{;
setObjectName(QString::fromLocal8Bit("Books"));
+ setContentsMargins(3, 3, 3, 3);
setMinimumSize( QSize(220, 240) );
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
BView = new BookmarkView(this);
Modified: trunk/Scribus/scribus/ui/inlinepalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/inlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/inlinepalette.cpp Thu Jan 7 12:33:40 2021
@@ -100,12 +100,13 @@
drag->exec(Qt::CopyAction);
clearSelection();
}
-
-InlinePalette::InlinePalette( QWidget* parent) : ScDockPalette(parent,
"Inline", Qt::WindowFlags())
-{
- setMinimumSize( QSize( 220, 240 ) );
- setObjectName(QString::fromLocal8Bit("Inline"));
- setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+
+InlinePalette::InlinePalette( QWidget* parent) : ScDockPalette(parent,
"Inline", Qt::WindowFlags())
+{
+ setContentsMargins(3, 3, 3, 3);
+ setMinimumSize( QSize( 220, 240 ) );
+ setObjectName(QString::fromLocal8Bit("Inline"));
+ setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
InlineViewWidget = new InlineView(this);
InlineViewWidget->clear();
setWidget( InlineViewWidget );
Modified: trunk/Scribus/scribus/ui/layers.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp (original)
+++ trunk/Scribus/scribus/ui/layers.cpp Thu Jan 7 12:33:40 2021
@@ -49,12 +49,12 @@
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
containerWidget = new QWidget(this);
LayerPaletteLayout = new QVBoxLayout();
- LayerPaletteLayout->setMargin(2);
- LayerPaletteLayout->setSpacing(2);
+ LayerPaletteLayout->setContentsMargins(3, 3, 3, 3);
+ LayerPaletteLayout->setSpacing(3);
layout1 = new QHBoxLayout;
- layout1->setMargin(0);
- layout1->setSpacing(2);
+ layout1->setContentsMargins(0, 0, 0, 0);
+ layout1->setSpacing(3);
textLabel1 = new QLabel( this);
layout1->addWidget( textLabel1 );
blendMode = new QComboBox( this);
@@ -107,7 +107,7 @@
LayerPaletteLayout->addWidget( Table );
Layout1 = new QHBoxLayout;
- Layout1->setMargin(0);
+ Layout1->setContentsMargins(0, 0, 0, 0);
Layout1->setSpacing(0);
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding,
QSizePolicy::Minimum );
Layout1->addItem( spacer );
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Thu Jan 7 12:33:40 2021
@@ -473,7 +473,8 @@
layout->addWidget( filterLabel, 0, 0 );
layout->addWidget( filterEdit, 0, 1 );
layout->addWidget( reportDisplay, 1, 0, 1, 2 );
- layout->setContentsMargins( 3, 3, 3, 3);
+ layout->setSpacing(3);
+ layout->setContentsMargins(3, 3, 3, 3);
containerWidget->setLayout( layout );
setWidget( containerWidget );
Modified: trunk/Scribus/scribus/ui/pagelayout.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/pagelayout.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.cpp (original)
+++ trunk/Scribus/scribus/ui/pagelayout.cpp Thu Jan 7 12:33:40 2021
@@ -72,8 +72,8 @@
modus = false;
layoutGroupLayout = new QVBoxLayout(this);
- layoutGroupLayout->setSpacing(6);
- layoutGroupLayout->setContentsMargins(9, 9, 9, 9);
+ layoutGroupLayout->setSpacing(3);
+ layoutGroupLayout->setContentsMargins(6, 6, 6, 6);
layoutsCombo = new QComboBox( this );
layoutGroupLayout->addWidget( layoutsCombo );
Modified: trunk/Scribus/scribus/ui/pagepalette_masterpagesbase.ui
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/pagepalette_masterpagesbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpagesbase.ui (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpagesbase.ui Thu Jan 7
12:33:40 2021
@@ -24,16 +24,16 @@
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="leftMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>5</number>
+ <number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="buttonLayout">
Modified: trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui Thu Jan 7 12:33:40 2021
@@ -14,20 +14,17 @@
<string>Arrange Pages</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>5</number>
- </property>
<property name="leftMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>5</number>
+ <number>3</number>
</property>
<item>
<widget class="QSplitter" name="splitter">
Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Thu Jan 7 12:33:40 2021
@@ -724,12 +724,12 @@
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
containerWidget = new QWidget(this);
BiblioLayout = new QVBoxLayout( containerWidget );
- BiblioLayout->setSpacing( 0 );
- BiblioLayout->setMargin( 0 );
+ BiblioLayout->setSpacing(3);
+ BiblioLayout->setContentsMargins(3, 3, 3, 3);
buttonLayout = new QHBoxLayout;
- buttonLayout->setSpacing( 5 );
- buttonLayout->setMargin( 0 );
+ buttonLayout->setSpacing(3);
+ buttonLayout->setContentsMargins(0, 0, 0, 0);
newButton = new QToolButton(this);
newButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
QSizePolicy::Fixed));
newButton->setIcon(IconManager::instance().loadPixmap("16/document-new.png"));
Modified: trunk/Scribus/scribus/ui/symbolpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/ui/symbolpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/symbolpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/symbolpalette.cpp Thu Jan 7 12:33:40 2021
@@ -149,12 +149,13 @@
drag->exec(Qt::CopyAction);
clearSelection();
}
-
-SymbolPalette::SymbolPalette( QWidget* parent) : ScDockPalette(parent, "Symb",
Qt::WindowFlags())
-{
- setMinimumSize( QSize( 220, 240 ) );
- setObjectName(QString::fromLocal8Bit("Symb"));
- setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+
+SymbolPalette::SymbolPalette( QWidget* parent) : ScDockPalette(parent, "Symb",
Qt::WindowFlags())
+{
+ setContentsMargins(3, 3, 3, 3);
+ setMinimumSize( QSize( 220, 240 ) );
+ setObjectName(QString::fromLocal8Bit("Symb"));
+ setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
SymbolViewWidget = new SymbolView(this);
SymbolViewWidget->clear();
setWidget( SymbolViewWidget );
Modified: trunk/Scribus/scribus/undogui.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24381&path=/trunk/Scribus/scribus/undogui.cpp
==============================================================================
--- trunk/Scribus/scribus/undogui.cpp (original)
+++ trunk/Scribus/scribus/undogui.cpp Thu Jan 7 12:33:40 2021
@@ -199,8 +199,8 @@
currentSelection = 0;
redoItems = 0;
QVBoxLayout* layout = new QVBoxLayout(container);
- layout->setMargin(5);
- layout->setSpacing(5);
+ layout->setContentsMargins(3, 3, 3, 3);
+ layout->setSpacing(3);
objectBox = new QCheckBox(this);
layout->addWidget(objectBox);
@@ -210,8 +210,8 @@
layout->addWidget(undoList);
QHBoxLayout* buttonLayout = new QHBoxLayout;
- buttonLayout->setMargin(0);
- buttonLayout->setSpacing(5);
+ buttonLayout->setContentsMargins(0, 0, 0, 0);
+ buttonLayout->setSpacing(6);
undoButton = new
QPushButton(IconManager::instance().loadPixmap("16/edit-undo.png"), "", this);
buttonLayout->addWidget(undoButton);
redoButton = new
QPushButton(IconManager::instance().loadPixmap("16/edit-redo.png"), "", this);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
