View Issue Details

IDProjectCategoryView StatusLast Update
0016485ScribusUser Interfacepublic2021-03-21 14:46
Reporterbubu Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.5.7.svn 
Fixed in Version1.5.7.svn 
Summary0016485: Unify margins and spacing for dialogs, set 11
DescriptionI propose a new set of trivial margin/spacing adjustment for some infrequen dialogs.

Comments:
1) tabruler:
affected interfaces:
- Style Manager,
- Text Properties dock > Columns & Text Distances > Tabulators
2) marginwidget:
affected interfaces:
- New Document (/startup)
- Manage Page Properties
not affected: Preferences/Document Setup > Document Setup > Margins&Bleeds, these use newmarginwidget
3) gtdialogs:
- Text frame > Content ... some uncommon file type
4) query.gif:
- I find only one occurrence: Colors and Fills > Save Color Set button
5) pageselector: no visual change, I didn't do a screenshot.

Please review. Thanks.
TagsNo tags attached.
Attached Files
0001-Unify-margins-and-spacing-for-dialogs-set-11.patch (7,849 bytes)   
From 65e394beba201af45b8cac500fbfb9380d0ad64d Mon Sep 17 00:00:00 2001
Message-Id: <65e394beba201af45b8cac500fbfb9380d0ad64d.1613825009.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sat, 20 Feb 2021 13:43:19 +0100
Subject: [PATCH] Unify margins and spacing for dialogs, set 11

---
 scribus/ui/gtdialogs.cpp    | 16 ++++++++--------
 scribus/ui/marginwidget.cpp | 12 ++++++------
 scribus/ui/pageselector.cpp |  2 +-
 scribus/ui/query.cpp        | 12 ++++++------
 scribus/ui/tabruler.cpp     | 20 ++++++++++----------
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/scribus/ui/gtdialogs.cpp b/scribus/ui/gtdialogs.cpp
index eb6d61c69..96af38f22 100644
--- a/scribus/ui/gtdialogs.cpp
+++ b/scribus/ui/gtdialogs.cpp
@@ -57,8 +57,8 @@ gtImporterDialog::gtImporterDialog(const QString& fileName, const QStringList& i
 	QBoxLayout* layout = new QVBoxLayout(this);
 
 	QBoxLayout* llayout = new QHBoxLayout;
-	llayout->setMargin(5);
-	llayout->setSpacing(5);
+	llayout->setContentsMargins(0, 0, 0, 0);
+	llayout->setSpacing(6);
 
 	QString labelText;
 	if (ext.length() > 0)
@@ -70,8 +70,8 @@ gtImporterDialog::gtImporterDialog(const QString& fileName, const QStringList& i
 	layout->addLayout(llayout);
 
 	QBoxLayout* ilayout = new QHBoxLayout;
-	ilayout->setMargin(5);
-	ilayout->setSpacing(5);
+	ilayout->setContentsMargins(0, 0, 0, 0);
+	ilayout->setSpacing(6);
 	importerCombo = new QComboBox(this);
 	importerCombo->setMinimumSize(QSize(150, 0));
 	importerCombo->setToolTip( tr("Choose the importer to use"));
@@ -84,8 +84,8 @@ gtImporterDialog::gtImporterDialog(const QString& fileName, const QStringList& i
 	layout->addLayout(ilayout);
 
 	QBoxLayout* dlayout = new QHBoxLayout;
-	dlayout->setMargin(5);
-	dlayout->setSpacing(5);
+	dlayout->setContentsMargins(0, 0, 0, 0);
+	dlayout->setSpacing(6);
 	rememberCheck = new QCheckBox( tr("Remember association"), this);
 	rememberCheck->setChecked(false);
 	rememberCheck->setToolTip( "<qt>" + tr("Remember the file extension - importer association and do not ask again to select an importer for files of this type.") + "</qt>" );
@@ -94,8 +94,8 @@ gtImporterDialog::gtImporterDialog(const QString& fileName, const QStringList& i
 	layout->addLayout(dlayout);
 
 	QBoxLayout* blayout = new QHBoxLayout;
-	blayout->setMargin(5);
-	blayout->setSpacing(5);
+	blayout->setContentsMargins(0, 0, 0, 0);
+	blayout->setSpacing(6);
 	blayout->addStretch(10);
 	okButton = new QPushButton( CommonStrings::tr_OK, this);
 	blayout->addWidget(okButton);
diff --git a/scribus/ui/marginwidget.cpp b/scribus/ui/marginwidget.cpp
index 54ee28350..258d66e68 100644
--- a/scribus/ui/marginwidget.cpp
+++ b/scribus/ui/marginwidget.cpp
@@ -56,8 +56,8 @@ MarginWidget::MarginWidget( QWidget* parent, const QString& /*title*/, const Mar
 
 	// layout
 	GroupLayout = new QGridLayout( marginPage );
-	GroupLayout->setSpacing( 5 );
-	GroupLayout->setMargin( 10 );
+	GroupLayout->setSpacing(6);
+	GroupLayout->setContentsMargins(9, 9, 9, 9);
 	GroupLayout->addWidget(presetLabel, 0, 0);
 	GroupLayout->addWidget(presetCombo, 0, 1);
 	GroupLayout->addWidget( leftR, 1, 1 );
@@ -72,8 +72,8 @@ MarginWidget::MarginWidget( QWidget* parent, const QString& /*title*/, const Mar
 	if (showChangeAll)
 	{
 		marginsForPagesLayout = new QHBoxLayout;
-		marginsForPagesLayout->setMargin(5);
-		marginsForPagesLayout->setSpacing(5);
+		marginsForPagesLayout->setContentsMargins(9, 9, 9, 9);
+		marginsForPagesLayout->setSpacing(6);
 		marginsForPages = new QLabel( tr( "Apply settings to:" ), marginPage );
 		marginsForPagesLayout->addWidget(marginsForPages);
 		marginsForAllPages = new QCheckBox( marginPage );
@@ -108,8 +108,8 @@ MarginWidget::MarginWidget( QWidget* parent, const QString& /*title*/, const Mar
 	{
 		bleedPage = new QWidget(this);
 		BleedGroupLayout = new QGridLayout( bleedPage );
-		BleedGroupLayout->setSpacing( 5 );
-		BleedGroupLayout->setMargin( 10 );
+		BleedGroupLayout->setSpacing(6);
+		BleedGroupLayout->setContentsMargins(9, 9, 9, 9);
 		BleedGroupLayout->setAlignment( Qt::AlignTop );
 		BleedTxt3 = new QLabel( bleedPage );
 		BleedGroupLayout->addWidget( BleedTxt3, 0, 0 );
diff --git a/scribus/ui/pageselector.cpp b/scribus/ui/pageselector.cpp
index 0670d1420..ca7cb090c 100644
--- a/scribus/ui/pageselector.cpp
+++ b/scribus/ui/pageselector.cpp
@@ -30,7 +30,7 @@ PageSelector::PageSelector( QWidget* parent, int maximumPage ) : QWidget( parent
 	pageCountString = "%1";
 	m_lastPage = maximumPage;
 	pageSelectorLayout = new QHBoxLayout( this );
-	pageSelectorLayout->setMargin(0);
+	pageSelectorLayout->setContentsMargins(0, 0, 0, 0);
 	pageSelectorLayout->setSpacing(1);
 
 	startButton = new QPushButton( this );
diff --git a/scribus/ui/query.cpp b/scribus/ui/query.cpp
index 59ea939c0..ab03e95cb 100644
--- a/scribus/ui/query.cpp
+++ b/scribus/ui/query.cpp
@@ -23,11 +23,11 @@ Query::Query( QWidget* parent,  const char* name, bool modal, const QString& tex
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	setModal(modal);
 	queryLayout = new QVBoxLayout( this );
-	queryLayout->setMargin(5);
-	queryLayout->setSpacing(10);
+	queryLayout->setContentsMargins(9, 9, 9, 9);
+	queryLayout->setSpacing(6);
 	editLayout = new QHBoxLayout;
-	editLayout->setSpacing( 5 );
-	editLayout->setMargin( 0 );
+	editLayout->setSpacing(6);
+	editLayout->setContentsMargins(0, 0, 0, 0);
 	answerEdit = new QLineEdit( this );
 	questionLabel = new QLabel( text, this );
 	questionLabel->setBuddy(answerEdit);
@@ -36,8 +36,8 @@ Query::Query( QWidget* parent,  const char* name, bool modal, const QString& tex
 	editLayout->addWidget( answerEdit );
 	queryLayout->addLayout( editLayout );
 	okCancelLayout = new QHBoxLayout;
-	okCancelLayout->setSpacing( 5 );
-	okCancelLayout->setMargin( 0 );
+	okCancelLayout->setSpacing(6);
+	okCancelLayout->setContentsMargins(0, 0, 0, 0);
 	QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	okCancelLayout->addItem( spacer );
 	okButton = new QPushButton( CommonStrings::tr_OK, this);
diff --git a/scribus/ui/tabruler.cpp b/scribus/ui/tabruler.cpp
index 8e8761907..271573181 100644
--- a/scribus/ui/tabruler.cpp
+++ b/scribus/ui/tabruler.cpp
@@ -506,11 +506,11 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 	m_docUnitRatio=unitGetRatioFromIndex(dEin);
 	double ww = (wid < 0) ? 4000 : wid;
 	tabrulerLayout = new QVBoxLayout( this );
-	tabrulerLayout->setMargin(0);
-	tabrulerLayout->setSpacing(5);
+	tabrulerLayout->setContentsMargins(0, 0, 0, 0);
+	tabrulerLayout->setSpacing(6);
 	layout2 = new QHBoxLayout;
-	layout2->setMargin(0);
-	layout2->setSpacing(5);
+	layout2->setContentsMargins(0, 0, 0, 0);
+	layout2->setSpacing(6);
 
 	rulerScrollL = new QToolButton(this);
 	rulerScrollL->setArrowType(Qt::LeftArrow);
@@ -525,8 +525,8 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 	layout2->addWidget( rulerScrollR );
 
 	layout1 = new QHBoxLayout;
-	layout1->setMargin(0);
-	layout1->setSpacing(5);
+	layout1->setContentsMargins(0, 0, 0, 0);
+	layout1->setSpacing(6);
 	layout1->setAlignment( Qt::AlignTop );
 	typeCombo = new QComboBox(this);
 	typeCombo->setEditable(false);
@@ -556,12 +556,12 @@ Tabruler::Tabruler( QWidget* parent, bool haveFirst, int dEin, const QList<Parag
 	layout1->addWidget( tabFillCombo );
 
 	layout4 = new QHBoxLayout;
-	layout4->setMargin(0);
-	layout4->setSpacing(5);
+	layout4->setContentsMargins(0, 0, 0, 0);
+	layout4->setSpacing(6);
 
 	indentLayout = new QHBoxLayout;
-	indentLayout->setMargin(0);
-	indentLayout->setSpacing(5);
+	indentLayout->setContentsMargins(0, 0, 0, 0);
+	indentLayout->setSpacing(6);
 	if (haveFirst)
 	{
 		firstLineData = new ScrSpinBox( -3000, ww / m_docUnitRatio, this, dEin);
-- 
2.27.0

gtdialogs.gif (15,678 bytes)   
gtdialogs.gif (15,678 bytes)   
marginwidget.gif (107,262 bytes)   
marginwidget.gif (107,262 bytes)   
query.gif (8,045 bytes)   
query.gif (8,045 bytes)   
tabruler.gif (38,305 bytes)   
tabruler.gif (38,305 bytes)   
PatchNo

Relationships

child of 0013906 acknowledged Metabug: UI enhancement proposals (1.5.x.svn) 

Activities

jghali

2021-02-22 21:22

administrator   ~0048871

Applied, thanks!

FirasH

2021-03-21 14:46

reporter   ~0048972

Thanks!
Fixed in 1.5.7.svn (24521)

Issue History

Date Modified Username Field Change
2021-02-20 12:44 bubu New Issue
2021-02-20 12:44 bubu File Added: 0001-Unify-margins-and-spacing-for-dialogs-set-11.patch
2021-02-20 12:44 bubu File Added: gtdialogs.gif
2021-02-20 12:44 bubu File Added: marginwidget.gif
2021-02-20 12:44 bubu File Added: query.gif
2021-02-20 12:44 bubu File Added: tabruler.gif
2021-02-20 21:44 PeterBenedek Relationship added child of 0013906
2021-02-22 21:22 jghali Assigned To => jghali
2021-02-22 21:22 jghali Status new => resolved
2021-02-22 21:22 jghali Resolution open => fixed
2021-02-22 21:22 jghali Fixed in Version => 1.5.7.svn
2021-02-22 21:22 jghali Note Added: 0048871
2021-03-21 14:46 FirasH Status resolved => closed
2021-03-21 14:46 FirasH Note Added: 0048972