View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0016511 | Scribus | User Interface | public | 2021-03-06 09:25 | 2021-03-21 14:59 |
| Reporter | bubu | Assigned To | jghali | ||
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Product Version | 1.5.7.svn | ||||
| Fixed in Version | 1.5.7.svn | ||||
| Summary | 0016511: Unify margins and spacing, last part | ||||
| Description | Craig, thanks for submitted margins.diff. I see that it is committed in Rev 24545. I reviewed this margin adjustments one by one and I propose this patch to finalize them. - scribus/docinfo.cpp -> See 0016510 - scribus/scribus.cpp: Patch here, see the screenshot - scribus/ui/alignselect.cpp -> Corrected in separate patch 0016509 - scribus/ui/contextmenu.cpp: Patch here, see the screenshot - scribus/ui/cupsoptions.cpp: Patch here, see the screenshot - scribus/ui/curvewidget.cpp: OK - scribus/ui/dasheditor.cpp: Patch here, see the screenshot - scribus/ui/directionselect.cpp -> Corrected in separate patch 0016509 - scribus/ui/editor.cpp: Patch here - scribus/ui/fontcombo.cpp: Corrected in separate patch 0016501 - scribus/ui/mergedoc.cpp: OK - scribus/ui/modetoolbar.cpp: Patch here, see the screenshot - scribus/ui/newtemp.cpp: Patch here, see the screenshot - scribus/ui/nodeeditpalette.cpp: -> Corrected in separate patch 0016462 - scribus/ui/pdfexportdialog.cpp: Patch here, see the screenshot - scribus/ui/storyeditor.cpp: Patch here, see the screenshot - scribus/ui/styleselect.cpp: Corrected here 0016501 This was the last outstanding part of "setMargin" calls. Please review the patch. Thanks. | ||||
| Tags | No tags attached. | ||||
| Patch | No | ||||
| child of | 0013906 | acknowledged | Metabug: UI enhancement proposals (1.5.x.svn) |
|
|
0001-Unify-margins-and-spacing-last-part.patch (10,292 bytes)
From 2fd769bafae03d15938dab2f5b2525e461f8d2a4 Mon Sep 17 00:00:00 2001
Message-Id: <2fd769bafae03d15938dab2f5b2525e461f8d2a4.1615022059.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sat, 6 Mar 2021 10:13:58 +0100
Subject: [PATCH] Unify margins and spacing, last part
---
scribus/docinfo.cpp | 8 ++++----
scribus/scribus.cpp | 2 +-
scribus/ui/contextmenu.cpp | 4 ++--
scribus/ui/cupsoptions.cpp | 6 +++---
scribus/ui/dasheditor.cpp | 4 ++--
scribus/ui/editor.cpp | 2 +-
scribus/ui/modetoolbar.cpp | 4 ++--
scribus/ui/newtemp.cpp | 10 +++++-----
scribus/ui/pdfexportdialog.cpp | 10 +++++-----
scribus/ui/storyeditor.cpp | 8 ++++----
10 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/scribus/docinfo.cpp b/scribus/docinfo.cpp
index b81a9f998..516fffd31 100644
--- a/scribus/docinfo.cpp
+++ b/scribus/docinfo.cpp
@@ -32,8 +32,8 @@ DocInfos::DocInfos( QWidget* parent, DocumentInformation& docInfo ) : QTabWidget
page1 = new QWidget( this );
layout1 = new QGridLayout(page1);
- layout1->setSpacing( 5 );
- layout1->setContentsMargins(5, 5, 5, 5);
+ layout1->setSpacing(6);
+ layout1->setContentsMargins(9, 9, 9, 9);
titleEdit = new QLineEdit( page1 );
titleLabel = new QLabel( tr("&Title:"), page1);
@@ -75,8 +75,8 @@ DocInfos::DocInfos( QWidget* parent, DocumentInformation& docInfo ) : QTabWidget
page2 = new QWidget( this );
layout2 = new QGridLayout(page2);
- layout2->setSpacing( 5 );
- layout2->setContentsMargins(5, 5, 5, 5);
+ layout2->setSpacing(6);
+ layout2->setContentsMargins(9, 9, 9, 9);
publisherEdit = new QLineEdit( page2 );
publisherLabel = new QLabel( tr("P&ublisher:") , page2);
diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
index 847cc722a..695b6e194 100644
--- a/scribus/scribus.cpp
+++ b/scribus/scribus.cpp
@@ -1340,7 +1340,7 @@ void ScribusMainWindow::initStatusBar()
QWidget* zoomWidget = new QWidget( statusBar() );
QHBoxLayout* zoomLayout = new QHBoxLayout( zoomWidget );
zoomLayout->setContentsMargins(0, 0, 0, 0);
- zoomLayout->setSpacing(1);
+ zoomLayout->setSpacing(3);
zoomSpinBox = new ScrSpinBox( 1, 32000, zoomWidget, 6 );
zoomSpinBox->setFont(fo);
diff --git a/scribus/ui/contextmenu.cpp b/scribus/ui/contextmenu.cpp
index a852b5fe5..781fd31c0 100644
--- a/scribus/ui/contextmenu.cpp
+++ b/scribus/ui/contextmenu.cpp
@@ -122,8 +122,8 @@ void ContextMenu::createMenuItems_Selection()
infoGroup->setFrameShape( QFrame::NoFrame );
QGridLayout *infoGroupLayout = new QGridLayout( infoGroup );
infoGroupLayout->setAlignment( Qt::AlignTop );
- infoGroupLayout->setSpacing( 2 );
- infoGroupLayout->setContentsMargins(0, 0, 0, 0);
+ infoGroupLayout->setSpacing(3);
+ infoGroupLayout->setContentsMargins(9, 9, 9, 9);
if (currItem->createInfoGroup(infoGroup, infoGroupLayout))
{
int row = infoGroupLayout->rowCount(); // <a.l.e>
diff --git a/scribus/ui/cupsoptions.cpp b/scribus/ui/cupsoptions.cpp
index b4f3853a2..bf8535da1 100644
--- a/scribus/ui/cupsoptions.cpp
+++ b/scribus/ui/cupsoptions.cpp
@@ -58,8 +58,8 @@ CupsOptions::CupsOptions(QWidget* parent, const QString& device) : QDialog( pare
prefs = PrefsManager::instance().prefsFile->getContext("cups_options");
CupsOptionsLayout = new QVBoxLayout( this );
- CupsOptionsLayout->setSpacing( 5 );
- CupsOptionsLayout->setContentsMargins(10, 10, 10, 10);
+ CupsOptionsLayout->setSpacing(6);
+ CupsOptionsLayout->setContentsMargins(9, 9, 9, 9);
Table = new QTableWidget(0, 2, this);
Table->setSortingEnabled(false);
Table->setSelectionMode(QAbstractItemView::NoSelection);
@@ -211,7 +211,7 @@ CupsOptions::CupsOptions(QWidget* parent, const QString& device) : QDialog( pare
CupsOptionsLayout->addWidget( Table );
Layout2 = new QHBoxLayout;
- Layout2->setSpacing( 5 );
+ Layout2->setSpacing(6);
Layout2->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer );
diff --git a/scribus/ui/dasheditor.cpp b/scribus/ui/dasheditor.cpp
index 325d78eef..b77a7fde5 100644
--- a/scribus/ui/dasheditor.cpp
+++ b/scribus/ui/dasheditor.cpp
@@ -303,8 +303,8 @@ DashEditor::DashEditor(QWidget *pa) : QFrame(pa)
setFrameShape( QFrame::Panel );
setLineWidth( 1 );
QGridLayout *gridLayout = new QGridLayout(this);
- gridLayout->setSpacing(2);
- gridLayout->setContentsMargins(2, 2, 2, 2);
+ gridLayout->setSpacing(3);
+ gridLayout->setContentsMargins(6, 6, 6, 6);
Preview = new DashPreview(this);
gridLayout->addWidget(Preview, 0, 0, 1, 2);
diff --git a/scribus/ui/editor.cpp b/scribus/ui/editor.cpp
index bf84f6621..474216ffe 100644
--- a/scribus/ui/editor.cpp
+++ b/scribus/ui/editor.cpp
@@ -96,7 +96,7 @@ Editor::Editor( QWidget* parent, const QString& daten, ScribusView* vie) : QDial
EditorLayout->addWidget( EditTex );
#ifdef Q_OS_MAC
Layout1_2 = new QHBoxLayout;
- Layout1_2->setSpacing( 5 );
+ Layout1_2->setSpacing(6);
Layout1_2->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacerr = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1_2->addItem( spacerr );
diff --git a/scribus/ui/modetoolbar.cpp b/scribus/ui/modetoolbar.cpp
index bd1daffb7..0aa3674d3 100644
--- a/scribus/ui/modetoolbar.cpp
+++ b/scribus/ui/modetoolbar.cpp
@@ -73,8 +73,8 @@ ModeToolBar::ModeToolBar(ScribusMainWindow* parent) : ScToolBar( tr("Tools"), "T
propWidget = new QWidget();
group1Layout = new QGridLayout( propWidget );
- group1Layout->setSpacing( 3 );
- group1Layout->setContentsMargins(2, 2, 2, 2);
+ group1Layout->setSpacing(3);
+ group1Layout->setContentsMargins(3, 3, 3, 3);
group1Layout->setAlignment( Qt::AlignTop );
Angle = new ScrSpinBox( -180, 180, propWidget, 6 );
Angle->setValue( 0 );
diff --git a/scribus/ui/newtemp.cpp b/scribus/ui/newtemp.cpp
index 2540f06ca..07f83a456 100644
--- a/scribus/ui/newtemp.cpp
+++ b/scribus/ui/newtemp.cpp
@@ -28,10 +28,10 @@ NewTm::NewTm( QWidget* parent, const QString& text, const QString& titel, Scribu
setWindowTitle(titel);
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
QueryLayout = new QVBoxLayout( this );
- QueryLayout->setSpacing( 5 );
- QueryLayout->setContentsMargins(5, 5, 5, 5);
+ QueryLayout->setSpacing(6);
+ QueryLayout->setContentsMargins(9, 9, 9, 9);
Layout2 = new QHBoxLayout;
- Layout2->setSpacing( 5 );
+ Layout2->setSpacing(6);
Layout2->setContentsMargins(0, 0, 0, 0);
Answer = new QLineEdit( this );
Frage = new QLabel( text, this );
@@ -46,7 +46,7 @@ NewTm::NewTm( QWidget* parent, const QString& text, const QString& titel, Scribu
if (doc->pagePositioning() != singlePage)
{
Layout3 = new QHBoxLayout;
- Layout3->setSpacing( 5 );
+ Layout3->setSpacing(6);
Layout3->setContentsMargins(0, 0, 0, 0);
Links = new QComboBox( this );
QStringList::Iterator pNames;
@@ -67,7 +67,7 @@ NewTm::NewTm( QWidget* parent, const QString& text, const QString& titel, Scribu
QueryLayout->addLayout( Layout3 );
}
Layout1 = new QHBoxLayout;
- Layout1->setSpacing( 5 );
+ Layout1->setSpacing(6);
Layout1->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
diff --git a/scribus/ui/pdfexportdialog.cpp b/scribus/ui/pdfexportdialog.cpp
index 604f042a0..6477adbad 100644
--- a/scribus/ui/pdfexportdialog.cpp
+++ b/scribus/ui/pdfexportdialog.cpp
@@ -62,13 +62,13 @@ PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
setWindowTitle( tr( "Save as PDF" ) );
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
PDFExportLayout = new QVBoxLayout( this );
- PDFExportLayout->setSpacing( 5 );
- PDFExportLayout->setContentsMargins(10, 10, 10, 10);
+ PDFExportLayout->setSpacing(6);
+ PDFExportLayout->setContentsMargins(9, 9, 9, 9);
Name = new QGroupBox( this );
Name->setTitle( tr( "O&utput to File:" ) );
NameLayout = new QGridLayout( Name );
- NameLayout->setSpacing( 5 );
- NameLayout->setContentsMargins(10, 10, 10, 10);
+ NameLayout->setSpacing(6);
+ NameLayout->setContentsMargins(9, 9, 9, 9);
NameLayout->setAlignment( Qt::AlignTop );
fileNameLineEdit = new QLineEdit( Name );
fileNameLineEdit->setMinimumSize( QSize( 268, 22 ) );
@@ -113,7 +113,7 @@ PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
Options = new TabPDFOptions( this, pdfOptions, AllFonts, PDFXProfiles, DocFonts, currView->m_doc );
PDFExportLayout->addWidget( Options );
Layout7 = new QHBoxLayout;
- Layout7->setSpacing( 5 );
+ Layout7->setSpacing(6);
Layout7->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer_2 = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout7->addItem( spacer_2 );
diff --git a/scribus/ui/storyeditor.cpp b/scribus/ui/storyeditor.cpp
index 9e7798975..4d3398186 100644
--- a/scribus/ui/storyeditor.cpp
+++ b/scribus/ui/storyeditor.cpp
@@ -1864,8 +1864,8 @@ void StoryEditor::buildGUI()
setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
StoryEd2Layout = new QHBoxLayout;
- StoryEd2Layout->setSpacing( 5 );
- StoryEd2Layout->setContentsMargins(5, 5, 5, 5);
+ StoryEd2Layout->setSpacing(6);
+ StoryEd2Layout->setContentsMargins(9, 9, 9, 9);
/* Setting up Toolbars */
FileTools = new QToolBar(this);
@@ -1947,7 +1947,7 @@ void StoryEditor::buildGUI()
ButtonGroup1->setFrameShadow( QFrame::Plain );
ButtonGroup1Layout = new QGridLayout( ButtonGroup1 );
ButtonGroup1Layout->setAlignment( Qt::AlignTop );
- ButtonGroup1Layout->setSpacing( 2 );
+ ButtonGroup1Layout->setSpacing(3);
ButtonGroup1Layout->setContentsMargins(0, 0, 0, 0);
WordCT1 = new QLabel(ButtonGroup1);
ButtonGroup1Layout->addWidget( WordCT1, 0, 0, 1, 3 );
@@ -1965,7 +1965,7 @@ void StoryEditor::buildGUI()
ButtonGroup2->setFrameShadow( QFrame::Plain );
ButtonGroup2Layout = new QGridLayout( ButtonGroup2 );
ButtonGroup2Layout->setAlignment( Qt::AlignTop );
- ButtonGroup2Layout->setSpacing( 2 );
+ ButtonGroup2Layout->setSpacing(3);
ButtonGroup2Layout->setContentsMargins(0, 0, 0, 0);
WordCT3 = new QLabel(ButtonGroup2);
ButtonGroup2Layout->addWidget( WordCT3, 0, 0, 1, 5 );
--
2.27.0
|
|
|
0016510 broke this patch. I updated it. It can be applied. Nothing to comment, there is only trivial fixes. 0001-Unify-margins-and-spacing-last-part-2.patch (9,296 bytes)
From a980ade0bb49bb662b3717f3d8df018451a45e64 Mon Sep 17 00:00:00 2001
Message-Id: <a980ade0bb49bb662b3717f3d8df018451a45e64.1615757670.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sun, 14 Mar 2021 22:34:16 +0100
Subject: [PATCH] Unify margins and spacing, last part
---
scribus/scribus.cpp | 2 +-
scribus/ui/contextmenu.cpp | 4 ++--
scribus/ui/cupsoptions.cpp | 6 +++---
scribus/ui/dasheditor.cpp | 4 ++--
scribus/ui/editor.cpp | 2 +-
scribus/ui/modetoolbar.cpp | 4 ++--
scribus/ui/newtemp.cpp | 10 +++++-----
scribus/ui/pdfexportdialog.cpp | 10 +++++-----
scribus/ui/storyeditor.cpp | 8 ++++----
9 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
index b2491db47..414ce7405 100644
--- a/scribus/scribus.cpp
+++ b/scribus/scribus.cpp
@@ -1339,7 +1339,7 @@ void ScribusMainWindow::initStatusBar()
QWidget* zoomWidget = new QWidget( statusBar() );
QHBoxLayout* zoomLayout = new QHBoxLayout( zoomWidget );
zoomLayout->setContentsMargins(0, 0, 0, 0);
- zoomLayout->setSpacing(1);
+ zoomLayout->setSpacing(3);
zoomSpinBox = new ScrSpinBox( 1, 32000, zoomWidget, 6 );
zoomSpinBox->setFont(fo);
diff --git a/scribus/ui/contextmenu.cpp b/scribus/ui/contextmenu.cpp
index a852b5fe5..781fd31c0 100644
--- a/scribus/ui/contextmenu.cpp
+++ b/scribus/ui/contextmenu.cpp
@@ -122,8 +122,8 @@ void ContextMenu::createMenuItems_Selection()
infoGroup->setFrameShape( QFrame::NoFrame );
QGridLayout *infoGroupLayout = new QGridLayout( infoGroup );
infoGroupLayout->setAlignment( Qt::AlignTop );
- infoGroupLayout->setSpacing( 2 );
- infoGroupLayout->setContentsMargins(0, 0, 0, 0);
+ infoGroupLayout->setSpacing(3);
+ infoGroupLayout->setContentsMargins(9, 9, 9, 9);
if (currItem->createInfoGroup(infoGroup, infoGroupLayout))
{
int row = infoGroupLayout->rowCount(); // <a.l.e>
diff --git a/scribus/ui/cupsoptions.cpp b/scribus/ui/cupsoptions.cpp
index b4f3853a2..bf8535da1 100644
--- a/scribus/ui/cupsoptions.cpp
+++ b/scribus/ui/cupsoptions.cpp
@@ -58,8 +58,8 @@ CupsOptions::CupsOptions(QWidget* parent, const QString& device) : QDialog( pare
prefs = PrefsManager::instance().prefsFile->getContext("cups_options");
CupsOptionsLayout = new QVBoxLayout( this );
- CupsOptionsLayout->setSpacing( 5 );
- CupsOptionsLayout->setContentsMargins(10, 10, 10, 10);
+ CupsOptionsLayout->setSpacing(6);
+ CupsOptionsLayout->setContentsMargins(9, 9, 9, 9);
Table = new QTableWidget(0, 2, this);
Table->setSortingEnabled(false);
Table->setSelectionMode(QAbstractItemView::NoSelection);
@@ -211,7 +211,7 @@ CupsOptions::CupsOptions(QWidget* parent, const QString& device) : QDialog( pare
CupsOptionsLayout->addWidget( Table );
Layout2 = new QHBoxLayout;
- Layout2->setSpacing( 5 );
+ Layout2->setSpacing(6);
Layout2->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer );
diff --git a/scribus/ui/dasheditor.cpp b/scribus/ui/dasheditor.cpp
index 325d78eef..b77a7fde5 100644
--- a/scribus/ui/dasheditor.cpp
+++ b/scribus/ui/dasheditor.cpp
@@ -303,8 +303,8 @@ DashEditor::DashEditor(QWidget *pa) : QFrame(pa)
setFrameShape( QFrame::Panel );
setLineWidth( 1 );
QGridLayout *gridLayout = new QGridLayout(this);
- gridLayout->setSpacing(2);
- gridLayout->setContentsMargins(2, 2, 2, 2);
+ gridLayout->setSpacing(3);
+ gridLayout->setContentsMargins(6, 6, 6, 6);
Preview = new DashPreview(this);
gridLayout->addWidget(Preview, 0, 0, 1, 2);
diff --git a/scribus/ui/editor.cpp b/scribus/ui/editor.cpp
index bf84f6621..474216ffe 100644
--- a/scribus/ui/editor.cpp
+++ b/scribus/ui/editor.cpp
@@ -96,7 +96,7 @@ Editor::Editor( QWidget* parent, const QString& daten, ScribusView* vie) : QDial
EditorLayout->addWidget( EditTex );
#ifdef Q_OS_MAC
Layout1_2 = new QHBoxLayout;
- Layout1_2->setSpacing( 5 );
+ Layout1_2->setSpacing(6);
Layout1_2->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacerr = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1_2->addItem( spacerr );
diff --git a/scribus/ui/modetoolbar.cpp b/scribus/ui/modetoolbar.cpp
index bd1daffb7..0aa3674d3 100644
--- a/scribus/ui/modetoolbar.cpp
+++ b/scribus/ui/modetoolbar.cpp
@@ -73,8 +73,8 @@ ModeToolBar::ModeToolBar(ScribusMainWindow* parent) : ScToolBar( tr("Tools"), "T
propWidget = new QWidget();
group1Layout = new QGridLayout( propWidget );
- group1Layout->setSpacing( 3 );
- group1Layout->setContentsMargins(2, 2, 2, 2);
+ group1Layout->setSpacing(3);
+ group1Layout->setContentsMargins(3, 3, 3, 3);
group1Layout->setAlignment( Qt::AlignTop );
Angle = new ScrSpinBox( -180, 180, propWidget, 6 );
Angle->setValue( 0 );
diff --git a/scribus/ui/newtemp.cpp b/scribus/ui/newtemp.cpp
index 2540f06ca..07f83a456 100644
--- a/scribus/ui/newtemp.cpp
+++ b/scribus/ui/newtemp.cpp
@@ -28,10 +28,10 @@ NewTm::NewTm( QWidget* parent, const QString& text, const QString& titel, Scribu
setWindowTitle(titel);
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
QueryLayout = new QVBoxLayout( this );
- QueryLayout->setSpacing( 5 );
- QueryLayout->setContentsMargins(5, 5, 5, 5);
+ QueryLayout->setSpacing(6);
+ QueryLayout->setContentsMargins(9, 9, 9, 9);
Layout2 = new QHBoxLayout;
- Layout2->setSpacing( 5 );
+ Layout2->setSpacing(6);
Layout2->setContentsMargins(0, 0, 0, 0);
Answer = new QLineEdit( this );
Frage = new QLabel( text, this );
@@ -46,7 +46,7 @@ NewTm::NewTm( QWidget* parent, const QString& text, const QString& titel, Scribu
if (doc->pagePositioning() != singlePage)
{
Layout3 = new QHBoxLayout;
- Layout3->setSpacing( 5 );
+ Layout3->setSpacing(6);
Layout3->setContentsMargins(0, 0, 0, 0);
Links = new QComboBox( this );
QStringList::Iterator pNames;
@@ -67,7 +67,7 @@ NewTm::NewTm( QWidget* parent, const QString& text, const QString& titel, Scribu
QueryLayout->addLayout( Layout3 );
}
Layout1 = new QHBoxLayout;
- Layout1->setSpacing( 5 );
+ Layout1->setSpacing(6);
Layout1->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
diff --git a/scribus/ui/pdfexportdialog.cpp b/scribus/ui/pdfexportdialog.cpp
index 604f042a0..6477adbad 100644
--- a/scribus/ui/pdfexportdialog.cpp
+++ b/scribus/ui/pdfexportdialog.cpp
@@ -62,13 +62,13 @@ PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
setWindowTitle( tr( "Save as PDF" ) );
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
PDFExportLayout = new QVBoxLayout( this );
- PDFExportLayout->setSpacing( 5 );
- PDFExportLayout->setContentsMargins(10, 10, 10, 10);
+ PDFExportLayout->setSpacing(6);
+ PDFExportLayout->setContentsMargins(9, 9, 9, 9);
Name = new QGroupBox( this );
Name->setTitle( tr( "O&utput to File:" ) );
NameLayout = new QGridLayout( Name );
- NameLayout->setSpacing( 5 );
- NameLayout->setContentsMargins(10, 10, 10, 10);
+ NameLayout->setSpacing(6);
+ NameLayout->setContentsMargins(9, 9, 9, 9);
NameLayout->setAlignment( Qt::AlignTop );
fileNameLineEdit = new QLineEdit( Name );
fileNameLineEdit->setMinimumSize( QSize( 268, 22 ) );
@@ -113,7 +113,7 @@ PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
Options = new TabPDFOptions( this, pdfOptions, AllFonts, PDFXProfiles, DocFonts, currView->m_doc );
PDFExportLayout->addWidget( Options );
Layout7 = new QHBoxLayout;
- Layout7->setSpacing( 5 );
+ Layout7->setSpacing(6);
Layout7->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer_2 = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout7->addItem( spacer_2 );
diff --git a/scribus/ui/storyeditor.cpp b/scribus/ui/storyeditor.cpp
index 9e7798975..4d3398186 100644
--- a/scribus/ui/storyeditor.cpp
+++ b/scribus/ui/storyeditor.cpp
@@ -1864,8 +1864,8 @@ void StoryEditor::buildGUI()
setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
StoryEd2Layout = new QHBoxLayout;
- StoryEd2Layout->setSpacing( 5 );
- StoryEd2Layout->setContentsMargins(5, 5, 5, 5);
+ StoryEd2Layout->setSpacing(6);
+ StoryEd2Layout->setContentsMargins(9, 9, 9, 9);
/* Setting up Toolbars */
FileTools = new QToolBar(this);
@@ -1947,7 +1947,7 @@ void StoryEditor::buildGUI()
ButtonGroup1->setFrameShadow( QFrame::Plain );
ButtonGroup1Layout = new QGridLayout( ButtonGroup1 );
ButtonGroup1Layout->setAlignment( Qt::AlignTop );
- ButtonGroup1Layout->setSpacing( 2 );
+ ButtonGroup1Layout->setSpacing(3);
ButtonGroup1Layout->setContentsMargins(0, 0, 0, 0);
WordCT1 = new QLabel(ButtonGroup1);
ButtonGroup1Layout->addWidget( WordCT1, 0, 0, 1, 3 );
@@ -1965,7 +1965,7 @@ void StoryEditor::buildGUI()
ButtonGroup2->setFrameShadow( QFrame::Plain );
ButtonGroup2Layout = new QGridLayout( ButtonGroup2 );
ButtonGroup2Layout->setAlignment( Qt::AlignTop );
- ButtonGroup2Layout->setSpacing( 2 );
+ ButtonGroup2Layout->setSpacing(3);
ButtonGroup2Layout->setContentsMargins(0, 0, 0, 0);
WordCT3 = new QLabel(ButtonGroup2);
ButtonGroup2Layout->addWidget( WordCT3, 0, 0, 1, 5 );
--
2.27.0
|
|
|
Craig committed most of your patch with 0016507. I committed what was missing (contextmenu) with a reduced content margin value: with 9 as value, the info submenu was feeling out of place compared with other submenus. So I reduced this value to 3. |
|
|
Thanks! Fixed in 1.5.7.svn (24569) |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2021-03-06 09:25 | bubu | New Issue | |
| 2021-03-06 09:25 | bubu | File Added: 0001-Unify-margins-and-spacing-last-part.patch | |
| 2021-03-06 09:25 | bubu | File Added: contextmenu _textframe.gif | |
| 2021-03-06 09:25 | bubu | File Added: cupsoptions.gif | |
| 2021-03-06 09:25 | bubu | File Added: dasheditor.gif | |
| 2021-03-06 09:25 | bubu | File Added: newtemp.gif | |
| 2021-03-06 09:25 | bubu | File Added: nodetoolbar.gif | |
| 2021-03-06 09:25 | bubu | File Added: pdfexportdialog.gif | |
| 2021-03-06 09:25 | bubu | File Added: scribus.gif | |
| 2021-03-06 09:25 | bubu | File Added: storyeditor.gif | |
| 2021-03-14 21:38 | bubu | Note Added: 0048933 | |
| 2021-03-14 21:38 | bubu | File Added: 0001-Unify-margins-and-spacing-last-part-2.patch | |
| 2021-03-15 21:16 | jghali | Note Added: 0048938 | |
| 2021-03-15 21:17 | jghali | Assigned To | => jghali |
| 2021-03-15 21:17 | jghali | Status | new => resolved |
| 2021-03-15 21:17 | jghali | Resolution | open => fixed |
| 2021-03-15 21:17 | jghali | Fixed in Version | => 1.5.7.svn |
| 2021-03-16 11:30 | PeterBenedek | Relationship added | child of 0013906 |
| 2021-03-21 14:59 | FirasH | Status | resolved => closed |
| 2021-03-21 14:59 | FirasH | Note Added: 0048986 |
