r24348 by jghali - #16395: Unify margins for Import Page, Delete Page, Copy&Move Page dialogs <bubu>

[scribus-commit]

Author: jghali
Date: Tue Dec 22 01:32:16 2020
New Revision: 24348

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24348
Log:
#16395: Unify margins for Import Page, Delete Page, Copy&Move Page dialogs <bubu>

Modified:
    trunk/Scribus/scribus/ui/delpages.cpp
    trunk/Scribus/scribus/ui/mergedoc.cpp
    trunk/Scribus/scribus/ui/movepage.cpp

Modified: trunk/Scribus/scribus/ui/delpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24348&path=/trunk/Scribus/scribus/ui/delpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/delpages.cpp	(original)
+++ trunk/Scribus/scribus/ui/delpages.cpp	Tue Dec 22 01:32:16 2020
@@ -18,11 +18,11 @@
 	setModal(true);
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	dialogLayout = new QVBoxLayout( this );
-	dialogLayout->setSpacing( 5 );
-	dialogLayout->setMargin( 10 );
+	dialogLayout->setSpacing(6);
+	dialogLayout->setContentsMargins(9, 9, 9, 9);
 	fromToLayout = new QHBoxLayout;
-	fromToLayout->setSpacing( 5 );
-	fromToLayout->setMargin( 5 );
+	fromToLayout->setSpacing(6);
+	fromToLayout->setContentsMargins(0, 0, 0, 0);
 	fromLabel = new QLabel( tr( "Delete From:" ), this );
 	fromToLayout->addWidget( fromLabel );
 	fromPageData = new ScrSpinBox(this);
@@ -47,8 +47,8 @@
 	dialogLayout->addLayout( fromToLayout );
 
 	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 );

Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24348&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp	(original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp	Tue Dec 22 01:32:16 2020
@@ -40,11 +40,11 @@
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 
 	dialogLayout = new QVBoxLayout(this);
-	dialogLayout->setMargin(10);
-	dialogLayout->setSpacing(5);
+	dialogLayout->setContentsMargins(9, 9, 9, 9);
+	dialogLayout->setSpacing(6);
 	fromInfoLayout = new QGridLayout;
 	fromInfoLayout->setMargin(0);
-	fromInfoLayout->setSpacing(5);
+	fromInfoLayout->setSpacing(6);
 	fromDocData = new QLineEdit( this );
 	fromDocData->setMinimumWidth(QWidget::fontMetrics().horizontalAdvance('a') * 50);
 	fromDocLabel = new QLabel( tr( "&From Document:"), this );
@@ -98,8 +98,8 @@
 
 	dialogLayout->addLayout( fromInfoLayout );
 	importCancelLayout = new QHBoxLayout;
-	importCancelLayout->setMargin(0);
-	importCancelLayout->setSpacing(5);
+	importCancelLayout->setContentsMargins(0, 0, 0, 0);
+	importCancelLayout->setSpacing(6);
 	QSpacerItem* spacer = new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	importCancelLayout->addItem( spacer );
 	importButton = new QPushButton( tr( "&Import" ), this );

Modified: trunk/Scribus/scribus/ui/movepage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24348&path=/trunk/Scribus/scribus/ui/movepage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/movepage.cpp	(original)
+++ trunk/Scribus/scribus/ui/movepage.cpp	Tue Dec 22 01:32:16 2020
@@ -29,11 +29,11 @@
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	setModal(true);
 	dialogLayout = new QVBoxLayout( this );
-	dialogLayout->setSpacing( 5 );
-	dialogLayout->setMargin( 10 );
+	dialogLayout->setSpacing(6);
+	dialogLayout->setContentsMargins(9, 9, 9, 9);
 	fromToLayout = new QGridLayout();
-	fromToLayout->setSpacing( 5 );
-	fromToLayout->setMargin( 5 );
+	fromToLayout->setSpacing(6);
+	fromToLayout->setContentsMargins(0, 0, 0, 0);
 	moveLabel = new QLabel( (move ? tr("Move Page(s)") : tr("Copy Page")) + ":", this );
 	fromPageData = new ScrSpinBox(this);
 	fromPageData->setDecimals(0);
@@ -97,8 +97,8 @@
 	dialogLayout->addLayout( fromToLayout );
 
 	okCancelLayout = new QHBoxLayout();
-	okCancelLayout->setSpacing( 6 );
-	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 );