From f420e2596bb2bec14949f41734193387328e8ea1 Mon Sep 17 00:00:00 2001
Message-Id: <f420e2596bb2bec14949f41734193387328e8ea1.1612391154.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Wed, 3 Feb 2021 23:25:44 +0100
Subject: [PATCH] Unify window margin for file open/save/export dialog

---
 .../plugins/export/xpsexport/xpsexplugin.cpp  |  3 +-
 scribus/ui/customfdialog.cpp                  | 46 ++++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/scribus/plugins/export/xpsexport/xpsexplugin.cpp b/scribus/plugins/export/xpsexport/xpsexplugin.cpp
index 9adcec711..004638823 100644
--- a/scribus/plugins/export/xpsexport/xpsexplugin.cpp
+++ b/scribus/plugins/export/xpsexport/xpsexplugin.cpp
@@ -139,7 +139,8 @@ bool XPSExportPlugin::run(ScribusDoc* doc, const QString& filename)
 
 		QFrame *Layout = new QFrame(openDia.data());
 		QHBoxLayout *Layout1 = new QHBoxLayout(Layout);
-		Layout1->setSpacing( 5 );
+		Layout1->setSpacing(6);
+		Layout1->setContentsMargins(0, 0, 0, 0);
 		QLabel *text = new QLabel(QObject::tr("Output Settings:"), Layout);
 		Layout1->addWidget(text);
 		QComboBox* compress = new QComboBox(Layout);
diff --git a/scribus/ui/customfdialog.cpp b/scribus/ui/customfdialog.cpp
index c4076776f..1045bed50 100644
--- a/scribus/ui/customfdialog.cpp
+++ b/scribus/ui/customfdialog.cpp
@@ -288,21 +288,23 @@ CustomFDialog::CustomFDialog(QWidget *parent, const QString& wDir, const QString
 	setWindowTitle(caption);
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	vboxLayout = new QVBoxLayout(this);
-	vboxLayout->setSpacing(5);
-	vboxLayout->setMargin(10);
-    hboxLayout = new QHBoxLayout;
-	hboxLayout->setSpacing(5);
-	hboxLayout->setMargin(0);
+	vboxLayout->setSpacing(6);
+	vboxLayout->setContentsMargins(9, 9, 9, 9);
+	hboxLayout = new QHBoxLayout;
+	hboxLayout->setSpacing(6);
+	hboxLayout->setContentsMargins(0, 0, 0, 0);
 	fileDialog = new ScFileWidget(this);
-	hboxLayout->addWidget(fileDialog);
+	// The margins' content should be set both on the widget and its layout.
+	fileDialog->setContentsMargins(0, 0, 0, 0);
+	fileDialog->layout()->setContentsMargins(0, 0, 0, 0);
 	fileDialog->setIconProvider(new ImIconProvider());
 	fileDialog->setNameFilter(filter);
 	fileDialog->selectNameFilter(filter);
 	fileDialog->setDirectory(wDir);
+	hboxLayout->addWidget(fileDialog);
 	vboxLayout1 = new QVBoxLayout;
-	vboxLayout1->setSpacing(0);
-	vboxLayout1->setMargin(0);
-	vboxLayout1->setContentsMargins(0, 37, 0, 0);
+	vboxLayout1->setSpacing(6);
+	vboxLayout1->setContentsMargins(0, 28, 0, 0);
 	vboxLayout1->setAlignment( Qt::AlignTop );
 	filePreview = new FDialogPreview( this );
 	filePreview->setMinimumSize(QSize(200, 200));
@@ -310,9 +312,9 @@ CustomFDialog::CustomFDialog(QWidget *parent, const QString& wDir, const QString
 	vboxLayout1->addWidget(filePreview);
 	hboxLayout->addLayout(vboxLayout1);
 	vboxLayout->addLayout(hboxLayout);
-    QHBoxLayout *hboxLayout1 = new QHBoxLayout;
-	hboxLayout1->setSpacing(5);
-	hboxLayout1->setContentsMargins(9, 0, 0, 0);
+	QHBoxLayout *hboxLayout1 = new QHBoxLayout;
+	hboxLayout1->setSpacing(6);
+	hboxLayout1->setContentsMargins(0, 0, 0, 0);
 	showPreview = new QCheckBox(this);
 	showPreview->setText( tr("Show Preview"));
 	showPreview->setToolTip( tr("Show a preview and information for the selected file"));
@@ -335,8 +337,8 @@ CustomFDialog::CustomFDialog(QWidget *parent, const QString& wDir, const QString
 	{
 		Layout = new QFrame(this);
 		Layout1 = new QHBoxLayout(Layout);
-		Layout1->setSpacing( 0 );
-		Layout1->setContentsMargins(9, 0, 0, 0);
+		Layout1->setSpacing(6);
+		Layout1->setContentsMargins(0, 0, 0, 0);
 		saveZip = new QCheckBox( tr( "&Compress File" ), Layout);
 		Layout1->addWidget(saveZip, Qt::AlignLeft);
 		QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -344,8 +346,8 @@ CustomFDialog::CustomFDialog(QWidget *parent, const QString& wDir, const QString
 		vboxLayout->addWidget(Layout);
 		LayoutC = new QFrame(this);
 		Layout1C = new QHBoxLayout(LayoutC);
-		Layout1C->setSpacing( 0 );
-		Layout1C->setContentsMargins(9, 0, 0, 0);
+		Layout1C->setSpacing(6);
+		Layout1C->setContentsMargins(0, 0, 0, 0);
 		withFonts = new QCheckBox( tr( "&Include Fonts" ), LayoutC);
 		Layout1C->addWidget(withFonts, Qt::AlignLeft);
 		withProfiles = new QCheckBox( tr( "&Include Color Profiles" ), LayoutC);
@@ -366,8 +368,8 @@ CustomFDialog::CustomFDialog(QWidget *parent, const QString& wDir, const QString
 		{
 			Layout = new QFrame(this);
 			Layout1 = new QHBoxLayout(Layout);
-			Layout1->setSpacing( 5 );
-			Layout1->setContentsMargins(9, 0, 0, 0);
+			Layout1->setSpacing(6);
+			Layout1->setContentsMargins(0, 0, 0, 0);
 			saveZip = new QCheckBox( tr( "&Compress File" ), Layout);
 			Layout1->addWidget(saveZip);
 			QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -395,8 +397,8 @@ CustomFDialog::CustomFDialog(QWidget *parent, const QString& wDir, const QString
 		{
 			LayoutC = new QFrame(this);
 			Layout1C = new QHBoxLayout(LayoutC);
-			Layout1C->setSpacing( 0 );
-			Layout1C->setContentsMargins(9, 0, 0, 0);
+			Layout1C->setSpacing(6);
+			Layout1C->setContentsMargins(0, 0, 0, 0);
 			optionLabel = new QLabel(this);
 			optionLabel->setText( tr("Encoding:"));
 			Layout1C->addWidget(optionLabel);
@@ -441,8 +443,8 @@ CustomFDialog::CustomFDialog(QWidget *parent, const QString& wDir, const QString
 		{
 			LayoutC = new QFrame(this);
 			Layout1C = new QHBoxLayout(LayoutC);
-			Layout1C->setSpacing( 0 );
-			Layout1C->setContentsMargins(9, 0, 0, 0);
+			Layout1C->setSpacing(6);
+			Layout1C->setContentsMargins(0, 0, 0, 0);
 			optionLabel = new QLabel(this);
 			optionLabel->setText( tr("Import Option:"));
 			Layout1C->addWidget(optionLabel);
-- 
2.27.0