r24373 by jghali - #16402: Update margins for Preflight Verifier, Colors and Fills and Print/Output preview dialogs <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Mon Jan 4 21:22:25 UTC 2021
Author: jghali
Date: Mon Jan 4 21:22:25 2021
New Revision: 24373
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24373
Log:
#16402: Update margins for Preflight Verifier, Colors and Fills and Print/Output preview dialogs <bubu>
Modified:
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/colorsandfillsbase.ui
trunk/Scribus/scribus/ui/outputpreview_pdf.ui
trunk/Scribus/scribus/ui/outputpreview_ps.ui
trunk/Scribus/scribus/ui/outputpreviewbase.ui
trunk/Scribus/scribus/ui/printpreviewbase.ui
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24373&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Mon Jan 4 21:22:25 2021
@@ -46,12 +46,12 @@
iconSetChange();
checkDocumentLayout = new QVBoxLayout( this );
- checkDocumentLayout->setMargin(5);
- checkDocumentLayout->setSpacing(5);
+ checkDocumentLayout->setContentsMargins(9, 9, 9, 9);
+ checkDocumentLayout->setSpacing(6);
layout1 = new QHBoxLayout;
- layout1->setMargin(0);
- layout1->setSpacing(5);
+ layout1->setContentsMargins(0, 0, 0, 0);
+ layout1->setSpacing(6);
textLabel1 = new QLabel( this );
layout1->addWidget( textLabel1 );
curCheckProfile = new QComboBox( this );
@@ -66,8 +66,8 @@
checkDocumentLayout->addWidget( reportDisplay );
layout2 = new QHBoxLayout;
- layout2->setMargin(0);
- layout2->setSpacing(5);
+ layout2->setContentsMargins(0, 0, 0, 0);
+ layout2->setSpacing(6);
reScan = new QPushButton(this );
layout2->addWidget( reScan );
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Modified: trunk/Scribus/scribus/ui/colorsandfillsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24373&path=/trunk/Scribus/scribus/ui/colorsandfillsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfillsbase.ui (original)
+++ trunk/Scribus/scribus/ui/colorsandfillsbase.ui Mon Jan 4 21:22:25 2021
@@ -17,26 +17,23 @@
<bool>false</bool>
</property>
<property name="modal">
- <bool>true</bool>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
- <item>
- <widget class="QTreeWidget" name="dataTree">
+ <bool>true</bool>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
+ <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>
+ <widget class="QTreeWidget" name="dataTree">
<property name="toolTip">
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -128,27 +125,12 @@
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
- <string>Color Sets</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
+ <string>Color Sets</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Current Color Set:</string>
</property>
</widget>
Modified: trunk/Scribus/scribus/ui/outputpreview_pdf.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24373&path=/trunk/Scribus/scribus/ui/outputpreview_pdf.ui
==============================================================================
--- trunk/Scribus/scribus/ui/outputpreview_pdf.ui (original)
+++ trunk/Scribus/scribus/ui/outputpreview_pdf.ui Mon Jan 4 21:22:25 2021
@@ -103,21 +103,6 @@
<string>Display Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
<widget class="QCheckBox" name="antiAliasing">
<property name="toolTip">
Modified: trunk/Scribus/scribus/ui/outputpreview_ps.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24373&path=/trunk/Scribus/scribus/ui/outputpreview_ps.ui
==============================================================================
--- trunk/Scribus/scribus/ui/outputpreview_ps.ui (original)
+++ trunk/Scribus/scribus/ui/outputpreview_ps.ui Mon Jan 4 21:22:25 2021
@@ -108,21 +108,6 @@
<string>Display Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
<widget class="QCheckBox" name="antiAliasing">
<property name="toolTip">
Modified: trunk/Scribus/scribus/ui/outputpreviewbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24373&path=/trunk/Scribus/scribus/ui/outputpreviewbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/outputpreviewbase.ui (original)
+++ trunk/Scribus/scribus/ui/outputpreviewbase.ui Mon Jan 4 21:22:25 2021
@@ -14,20 +14,17 @@
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
<property name="leftMargin">
- <number>0</number>
+ <number>9</number>
</property>
<property name="topMargin">
- <number>0</number>
+ <number>9</number>
</property>
<property name="rightMargin">
- <number>0</number>
+ <number>9</number>
</property>
<property name="bottomMargin">
- <number>0</number>
+ <number>9</number>
</property>
<item>
<layout class="QHBoxLayout" name="topHLayout">
@@ -83,9 +80,6 @@
<widget class="QLabel" name="scaleLabel">
<property name="text">
<string>Scaling:</string>
- </property>
- <property name="margin">
- <number>6</number>
</property>
</widget>
</item>
Modified: trunk/Scribus/scribus/ui/printpreviewbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24373&path=/trunk/Scribus/scribus/ui/printpreviewbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/printpreviewbase.ui (original)
+++ trunk/Scribus/scribus/ui/printpreviewbase.ui Mon Jan 4 21:22:25 2021
@@ -14,20 +14,17 @@
<string>Print Preview</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
<property name="leftMargin">
- <number>0</number>
+ <number>9</number>
</property>
<property name="topMargin">
- <number>0</number>
+ <number>9</number>
</property>
<property name="rightMargin">
- <number>0</number>
+ <number>9</number>
</property>
<property name="bottomMargin">
- <number>0</number>
+ <number>9</number>
</property>
<item>
<layout class="QHBoxLayout" name="topHLayout">
@@ -83,21 +80,6 @@
<string>Preview Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
<widget class="PrintLanguageCombo" name="printLanguageCombo"/>
</item>
@@ -159,21 +141,6 @@
<string>Display Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="rightMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
<item>
<widget class="QCheckBox" name="antiAliasing">
<property name="text">
@@ -277,9 +244,6 @@
<widget class="QLabel" name="scaleLabel">
<property name="text">
<string>Scaling:</string>
- </property>
- <property name="margin">
- <number>6</number>
</property>
</widget>
</item>
More information about the scribus-commit
mailing list