From c475c036ab4402b56ae19cc600bf5967322e786f Mon Sep 17 00:00:00 2001
Message-Id: <c475c036ab4402b56ae19cc600bf5967322e786f.1610906482.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sun, 17 Jan 2021 19:01:09 +0100
Subject: [PATCH] Layout inspired by Benedek

---
 scribus/ui/effectsdialog.cpp | 30 ++++++++++--------------------
 scribus/ui/effectsdialog.h   |  2 +-
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/scribus/ui/effectsdialog.cpp b/scribus/ui/effectsdialog.cpp
index abe704b04..12e7949a1 100644
--- a/scribus/ui/effectsdialog.cpp
+++ b/scribus/ui/effectsdialog.cpp
@@ -84,6 +84,9 @@ EffectsDialog::EffectsDialog( QWidget* parent, PageItem* item, ScribusDoc* docc
 	layout16 = new QVBoxLayout;
 	layout16->setContentsMargins(0, 0, 0, 0);
 	layout16->setSpacing(6);
+	textLabel16 = new QLabel( this );
+	textLabel16->setText( tr( "Preview" ) );
+	layout16->addWidget( textLabel16 );
 	pixmapLabel1 = new QLabel( this );
 	pixmapLabel1->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 	pixmapLabel1->setMinimumSize( QSize( 220, 220 ) );
@@ -93,7 +96,7 @@ EffectsDialog::EffectsDialog( QWidget* parent, PageItem* item, ScribusDoc* docc
 	pixmapLabel1->setScaledContents( false );
 	layout16->addWidget( pixmapLabel1 );
 	textLabel5 = new QLabel( this );
-	textLabel5->setText( tr( "Options:" ) );
+	textLabel5->setText( tr( "Options" ) );
 	layout16->addWidget( textLabel5 );
 	optionStack = new QStackedWidget( this );
 //	optionStack->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, optionStack->sizePolicy().hasHeightForWidth() ) );
@@ -496,24 +499,11 @@ EffectsDialog::EffectsDialog( QWidget* parent, PageItem* item, ScribusDoc* docc
 
 	availableEffects->setMinimumSize(availableEffectsAdvance + 40, 180);
 	layout2->addWidget(availableEffects);
-	layout10->addLayout(layout2, 0, 0);
-
-	layout1 = new QVBoxLayout;
-	layout1->setContentsMargins(0, 0, 0, 0);
-	layout1->setSpacing(6);
-	auto* spacer1 = new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding );
-	layout1->addItem( spacer1 );
 	toEffects = new QPushButton( this );
 	toEffects->setText( tr( "Add" ) );
 	toEffects->setEnabled(false);
-	layout1->addWidget( toEffects );
-	fromEffects = new QPushButton( this );
-	fromEffects->setText( tr( "Remove" ) );
-	fromEffects->setEnabled(false);
-	layout1->addWidget( fromEffects );
-	auto* spacer2 = new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding );
-	layout1->addItem( spacer2 );
-	layout10->addLayout( layout1, 0, 1 );
+	layout2->addWidget( toEffects );
+	layout10->addLayout(layout2, 0, 0);
 
 	layout8 = new QVBoxLayout;
 	layout8->setContentsMargins(0, 0, 0, 0);
@@ -613,8 +603,10 @@ EffectsDialog::EffectsDialog( QWidget* parent, PageItem* item, ScribusDoc* docc
 	layout7 = new QHBoxLayout;
 	layout7->setContentsMargins(0, 0, 0, 0);
 	layout7->setSpacing(6);
-	QSpacerItem* spacer4 = new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
-	layout7->addItem( spacer4 );
+	fromEffects = new QPushButton( this );
+	fromEffects->setText( tr( "Remove" ) );
+	fromEffects->setEnabled(false);
+	layout7->addWidget( fromEffects );
 	effectUp = new QPushButton( this );
 	effectUp->setText( "" );
 	effectUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
@@ -625,8 +617,6 @@ EffectsDialog::EffectsDialog( QWidget* parent, PageItem* item, ScribusDoc* docc
 	effectDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
 	effectDown->setEnabled(false);
 	layout7->addWidget( effectDown );
-	QSpacerItem* spacer5 = new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
-	layout7->addItem( spacer5 );
 	layout8->addLayout( layout7 );
 	layout10->addLayout( layout8, 0, 2 );
 	layout18->addLayout( layout10 );
diff --git a/scribus/ui/effectsdialog.h b/scribus/ui/effectsdialog.h
index 80bc09580..4a359ada9 100644
--- a/scribus/ui/effectsdialog.h
+++ b/scribus/ui/effectsdialog.h
@@ -60,6 +60,7 @@ public:
 	QLabel* textLabel12;
 	QLabel* textLabel14;
 	QLabel* textLabel15;
+	QLabel* textLabel16;
 	QStackedWidget* optionStack;
 	QWidget* WStackPage;
 	QWidget* WStackPage_2;
@@ -207,7 +208,6 @@ protected:
 	QGridLayout* layout10;
 	QVBoxLayout* layout8;
 	QHBoxLayout* layout7;
-	QVBoxLayout* layout1;
 	QVBoxLayout* layout2;
 	QVBoxLayout* layout16;
 	QVBoxLayout* layout18;
-- 
2.27.0

