r24440 by jghali - #16456: Unify margins and spacing for dialogs, set 4 <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 1 00:47:30 UTC 2021
Author: jghali
Date: Mon Feb 1 00:47:30 2021
New Revision: 24440
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24440
Log:
#16456: Unify margins and spacing for dialogs, set 4 <bubu>
Modified:
trunk/Scribus/scribus/ui/insertTable.cpp
trunk/Scribus/scribus/ui/inserttablecolumnsdialog.ui
trunk/Scribus/scribus/ui/inserttablerowsdialog.ui
trunk/Scribus/scribus/ui/picsearch.ui
trunk/Scribus/scribus/ui/picsearchoptions.ui
trunk/Scribus/scribus/ui/picstatus.ui
trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.ui
trunk/Scribus/scribus/ui/tablerowheightsdialog.ui
Modified: trunk/Scribus/scribus/ui/insertTable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/insertTable.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertTable.cpp (original)
+++ trunk/Scribus/scribus/ui/insertTable.cpp Mon Feb 1 00:47:30 2021
@@ -16,11 +16,11 @@
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setModal(true);
InsertTableLayout = new QVBoxLayout( this );
- InsertTableLayout->setMargin(10);
- InsertTableLayout->setSpacing(5);
+ InsertTableLayout->setContentsMargins(9, 9, 9, 9);
+ InsertTableLayout->setSpacing(6);
layout2 = new QGridLayout();
- layout2->setMargin(0);
- layout2->setSpacing(5);
+ layout2->setContentsMargins(0, 0, 0, 0);
+ layout2->setSpacing(6);
Cols = new QSpinBox(this);
Cols->setRange(1, maxCol);
Cols->setValue(1);
@@ -35,14 +35,14 @@
layout2->addWidget( Rows, 0, 1 );
InsertTableLayout->addLayout( layout2 );
layout1 = new QHBoxLayout();
- layout1->setSpacing(5);
+ layout1->setSpacing(6);
okButton = new QPushButton( CommonStrings::tr_OK, this);
cancelButton = new QPushButton( CommonStrings::tr_Cancel, this);
okButton->setDefault( true );
layout1->addWidget( okButton );
layout1->addWidget( cancelButton );
InsertTableLayout->addLayout( layout1 );
- resize( QSize(200, 111).expandedTo(minimumSizeHint()) );
+ resize( QSize(200, 100).expandedTo(minimumSizeHint()) );
setTabOrder ( Rows, Cols );
setTabOrder ( Cols, okButton );
Modified: trunk/Scribus/scribus/ui/inserttablecolumnsdialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/inserttablecolumnsdialog.ui
==============================================================================
--- trunk/Scribus/scribus/ui/inserttablecolumnsdialog.ui (original)
+++ trunk/Scribus/scribus/ui/inserttablecolumnsdialog.ui Mon Feb 1 00:47:30 2021
@@ -14,12 +14,24 @@
<string>Insert Column(s)</string>
</property>
<property name="modal">
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="numColumnsLabel">
<property name="text">
<string>Number of Columns:</string>
Modified: trunk/Scribus/scribus/ui/inserttablerowsdialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/inserttablerowsdialog.ui
==============================================================================
--- trunk/Scribus/scribus/ui/inserttablerowsdialog.ui (original)
+++ trunk/Scribus/scribus/ui/inserttablerowsdialog.ui Mon Feb 1 00:47:30 2021
@@ -14,12 +14,24 @@
<string>Insert Row(s)</string>
</property>
<property name="modal">
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="numRowsLabel">
<property name="text">
<string>Number of Rows:</string>
Modified: trunk/Scribus/scribus/ui/picsearch.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/picsearch.ui
==============================================================================
--- trunk/Scribus/scribus/ui/picsearch.ui (original)
+++ trunk/Scribus/scribus/ui/picsearch.ui Mon Feb 1 00:47:30 2021
@@ -15,38 +15,20 @@
<string>Result</string>
</property>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
<property name="leftMargin">
- <number>10</number>
+ <number>9</number>
</property>
<property name="topMargin">
- <number>10</number>
+ <number>9</number>
</property>
<property name="rightMargin">
- <number>10</number>
+ <number>9</number>
</property>
<property name="bottomMargin">
- <number>10</number>
+ <number>9</number>
</property>
<item>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="textLabel1">
<property name="text">
@@ -80,41 +62,11 @@
</item>
<item>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
<item>
<widget class="QListWidget" name="foundFilesBox"/>
</item>
<item>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
<item>
<widget class="QCheckBox" name="previewCheckBox">
<property name="text">
@@ -145,21 +97,6 @@
</item>
<item>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="previewLabel">
<property name="minimumSize">
@@ -276,7 +213,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>
Modified: trunk/Scribus/scribus/ui/picsearchoptions.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/picsearchoptions.ui
==============================================================================
--- trunk/Scribus/scribus/ui/picsearchoptions.ui (original)
+++ trunk/Scribus/scribus/ui/picsearchoptions.ui Mon Feb 1 00:47:30 2021
@@ -1,53 +1,60 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>PicSearchOptions</class>
- <widget class="QDialog" name="PicSearchOptions" >
- <property name="geometry" >
+ <widget class="QDialog" name="PicSearchOptions">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>513</width>
- <height>139</height>
+ <width>484</width>
+ <height>138</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Search Images</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="leftMargin">
<number>9</number>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="topMargin">
+ <number>9</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="text">
<string>Search for:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>fileEdit</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
<string>Start at:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>directoryEdit</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="directoryEdit" >
- <property name="minimumSize" >
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="directoryEdit">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
@@ -55,62 +62,56 @@
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="fileEdit" />
+ <item row="0" column="1" colspan="2">
+ <widget class="QLineEdit" name="fileEdit"/>
</item>
- <item row="1" column="2" >
- <widget class="QPushButton" name="changeDirButton" >
- <property name="text" >
+ <item row="1" column="2">
+ <widget class="QPushButton" name="changeDirButton">
+ <property name="text">
<string>Change...</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="3" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>5</number>
- </property>
+ <item row="3" column="0" colspan="3">
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="searchLabel" >
- <property name="text" >
+ <widget class="QLabel" name="searchLabel">
+ <property name="text">
<string>Searching</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QProgressBar" name="progressBar1" >
- <property name="minimumSize" >
+ <widget class="QProgressBar" name="progressBar1">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>250</width>
<height>22</height>
</size>
</property>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
@@ -119,48 +120,42 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="startButton" >
- <property name="text" >
+ <widget class="QPushButton" name="startButton">
+ <property name="text">
<string>Start Search</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="2" column="0" colspan="3" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>5</number>
- </property>
+ <item row="2" column="0" colspan="3">
+ <layout class="QHBoxLayout">
<item>
- <widget class="QCheckBox" name="caseInsensitiveCheck" >
- <property name="text" >
+ <widget class="QCheckBox" name="caseInsensitiveCheck">
+ <property name="text">
<string>Case insensitive search</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="recursiveSearch" >
- <property name="text" >
+ <widget class="QCheckBox" name="recursiveSearch">
+ <property name="text">
<string>Search recursively</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>81</width>
<height>20</height>
@@ -172,7 +167,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
<resources/>
<connections/>
</ui>
Modified: trunk/Scribus/scribus/ui/picstatus.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/picstatus.ui
==============================================================================
--- trunk/Scribus/scribus/ui/picstatus.ui (original)
+++ trunk/Scribus/scribus/ui/picstatus.ui Mon Feb 1 00:47:30 2021
@@ -9,19 +9,25 @@
<rect>
<x>0</x>
<y>0</y>
- <width>764</width>
<height>464</height>
+ <width>720</width>
</rect>
</property>
<property name="windowTitle">
<string>Manage Images</string>
</property>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>5</number>
+ <property name="leftMargin">
+ <number>9</number>
</property>
- <property name="margin">
- <number>10</number>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
</property>
<item>
<widget class="QListWidget" name="imageViewArea">
@@ -576,12 +582,6 @@
<string>Image Tools</string>
</attribute>
<layout class="QGridLayout">
- <property name="margin">
- <number>10</number>
- </property>
- <property name="spacing">
- <number>5</number>
- </property>
<item row="0" column="0">
<widget class="QCheckBox" name="isPrinting">
<property name="toolTip">
@@ -657,9 +657,6 @@
</item>
<item>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>5</number>
- </property>
<item>
<spacer>
<property name="orientation">
@@ -690,7 +687,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="5" margin="10"/>
<resources/>
<connections/>
</ui>
Modified: trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.ui
==============================================================================
--- trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.ui (original)
+++ trunk/Scribus/scribus/ui/tablecolumnwidthsdialog.ui Mon Feb 1 00:47:30 2021
@@ -14,12 +14,24 @@
<string>Set Column Widths</string>
</property>
<property name="modal">
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="tableColumnWidthLabel">
<property name="text">
<string>Column Width:</string>
Modified: trunk/Scribus/scribus/ui/tablerowheightsdialog.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24440&path=/trunk/Scribus/scribus/ui/tablerowheightsdialog.ui
==============================================================================
--- trunk/Scribus/scribus/ui/tablerowheightsdialog.ui (original)
+++ trunk/Scribus/scribus/ui/tablerowheightsdialog.ui Mon Feb 1 00:47:30 2021
@@ -14,12 +14,24 @@
<string>Set Row Heights</string>
</property>
<property name="modal">
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="tableRowHeightLabel">
<property name="text">
<string>Row Height:</string>
More information about the scribus-commit
mailing list