View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0016400 | Scribus | User Interface | public | 2021-01-01 21:56 | 2021-03-21 15:24 |
| 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 | 0016400: Update layout for About and About Plugins dialogs | ||||
| Description | @jghali, thank you for reviewing and correcting my patches. Thank you for your time and attention. In this patch I propose to use the standard 9px margin in About and About Plugins dialogs. Some code style correcting. Nothing else. Please review the attached patch. You can see the the visual changes on pre-after screenshot. 1/5 part of 0016383. | ||||
| Tags | No tags attached. | ||||
| Patch | No | ||||
|
|
about_aboutplugins.diff (4,576 bytes)
diff --git a/scribus/ui/about.cpp b/scribus/ui/about.cpp
index 999b4f8258a76c822767c6c98908dea2e7f8d484..b2c610a0bb565f60e055f056644c4aa300ff1550 100644
--- a/scribus/ui/about.cpp
+++ b/scribus/ui/about.cpp
@@ -98,14 +98,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png", true));
setModal(true);
aboutLayout = new QVBoxLayout( this );
- aboutLayout->setSpacing( 6 );
- aboutLayout->setMargin( 10 );
+ aboutLayout->setSpacing(6);
+ aboutLayout->setContentsMargins(9, 9, 9, 9);
tabWidget2 = new QTabWidget( this );
// tabWidget2->setMinimumSize( QSize( 438, 258 ) );
tab = new QWidget( tabWidget2 );
tabLayout1 = new QVBoxLayout( tab );
- tabLayout1->setSpacing( 6 );
- tabLayout1->setMargin( 15 );
+ tabLayout1->setSpacing(6);
+ tabLayout1->setContentsMargins(9, 9, 9, 9);
double pixelRatio = devicePixelRatioF();
QPixmap splashPixmap = IconManager::instance().loadPixmap("scribus_splash.png", true);
@@ -191,8 +191,8 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
/*! AUTHORS tab */
tab_2 = new QWidget( tabWidget2 );
tabLayout = new QHBoxLayout( tab_2 );
- tabLayout->setSpacing( 6 );
- tabLayout->setMargin( 10 );
+ tabLayout->setSpacing(6);
+ tabLayout->setContentsMargins(9, 9, 9, 9);
authorView = new QTextBrowser( tab_2 );
authorView->setHtml(About::parseAuthorFile(ScPaths::instance().docDir() + "AUTHORS"));
tabLayout->addWidget( authorView );
@@ -201,8 +201,8 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
/*! TRANSLATION tab */
tab_3 = new QWidget( tabWidget2 );
tabLayout_2 = new QHBoxLayout( tab_3 );
- tabLayout_2->setSpacing( 6 );
- tabLayout_2->setMargin( 10 );
+ tabLayout_2->setSpacing(6);
+ tabLayout_2->setContentsMargins(9, 9, 9, 9);
transView = new QTextBrowser( tab_3);
transView->setHtml(About::parseTranslationFile(ScPaths::instance().docDir() + "TRANSLATION"));
tabLayout_2->addWidget( transView );
@@ -214,8 +214,8 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
onlineView->setHtml(About::parseLinksFile(ScPaths::instance().docDir() + "LINKS"));
onlineView->setOpenExternalLinks(true);
tabLayout_4 = new QHBoxLayout( tab_4 );
- tabLayout_4->setSpacing( 6 );
- tabLayout_4->setMargin( 10 );
+ tabLayout_4->setSpacing(6);
+ tabLayout_4->setContentsMargins(9, 9, 9, 9);
tabLayout_4->addWidget( onlineView );
tabWidget2->addTab( tab_4, tr( "&Online" ) );
@@ -224,8 +224,8 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
tab_5 = new QWidget( tabWidget2 );
tabWidget2->addTab( tab_5, tr( "&Updates" ) );
updateLayout = new QVBoxLayout( tab_5 );
- updateLayout->setSpacing( 6 );
- updateLayout->setMargin( 10 );
+ updateLayout->setSpacing(6);
+ updateLayout->setContentsMargins(9, 9, 9, 9);
checkForUpdateButton = new QPushButton( tr( "Check for Updates" ), tab_5 );
updateView = new QTextBrowser( tab_5);
updateLayout->addWidget( checkForUpdateButton );
@@ -235,8 +235,8 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
tab_Licence = new QWidget( tabWidget2 );
tabWidget2->addTab( tab_Licence, tr( "&Licence" ) );
licenceLayout = new QVBoxLayout( tab_Licence );
- licenceLayout->setSpacing( 6 );
- licenceLayout->setMargin( 10 );
+ licenceLayout->setSpacing(6);
+ licenceLayout->setContentsMargins(9, 9, 9, 9);
textViewLicence = new QTextBrowser( tab_Licence);
licenceLayout->addWidget( textViewLicence );
@@ -256,8 +256,8 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent )
aboutLayout->addWidget( tabWidget2 );
layout2 = new QHBoxLayout;
- layout2->setSpacing( 6 );
- layout2->setMargin( 0 );
+ layout2->setSpacing(6);
+ layout2->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout2->addItem( spacer );
okButton = new QPushButton( tr( "&Close" ), this );
diff --git a/scribus/ui/aboutplugins.ui b/scribus/ui/aboutplugins.ui
index a27085db9ff58f86a962240e4a67cb78ebce4817..6cb1ef4123c24930ef49cfdf4eb000591330082f 100644
--- a/scribus/ui/aboutplugins.ui
+++ b/scribus/ui/aboutplugins.ui
@@ -13,12 +13,6 @@
<string>Scribus: About Plug-ins</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>10</number>
- </property>
- <property name="spacing" >
- <number>5</number>
- </property>
<item>
<widget class="QSplitter" name="splitter" >
<property name="orientation" >
|
|
|
Applied, thanks! |
|
|
Thanks! Fixed in 1.5.7.svn (24366) |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2021-01-01 21:56 | bubu | New Issue | |
| 2021-01-01 21:56 | bubu | File Added: about_aboutplugins.diff | |
| 2021-01-01 21:56 | bubu | File Added: about.gif | |
| 2021-01-01 21:56 | bubu | File Added: about_plugins.gif | |
| 2021-01-02 07:30 | PeterBenedek | Relationship added | child of 0013906 |
| 2021-01-02 07:31 | PeterBenedek | Relationship added | related to 0016383 |
| 2021-01-02 22:55 | jghali | Assigned To | => jghali |
| 2021-01-02 22:55 | jghali | Status | new => resolved |
| 2021-01-02 22:55 | jghali | Resolution | open => fixed |
| 2021-01-02 22:55 | jghali | Fixed in Version | => 1.5.7.svn |
| 2021-01-02 22:55 | jghali | Note Added: 0048610 | |
| 2021-03-21 15:24 | FirasH | Status | resolved => closed |
| 2021-03-21 15:24 | FirasH | Note Added: 0049019 |
