r24325 by jghali - #16386: Unify minimum size of dock palettes <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Mon Dec 14 22:24:42 UTC 2020
Author: jghali
Date: Mon Dec 14 22:24:42 2020
New Revision: 24325
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24325
Log:
#16386: Unify minimum size of dock palettes <bubu>
Modified:
trunk/Scribus/scribus/ui/bookmarkpalette.cpp
trunk/Scribus/scribus/ui/layers.cpp
trunk/Scribus/scribus/ui/pagelayout.cpp
trunk/Scribus/scribus/ui/pagepalette_pages.cpp
trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
trunk/Scribus/scribus/ui/scrapbookpalette.cpp
trunk/Scribus/scribus/undogui.cpp
Modified: trunk/Scribus/scribus/ui/bookmarkpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24325&path=/trunk/Scribus/scribus/ui/bookmarkpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/bookmarkpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/bookmarkpalette.cpp Mon Dec 14 22:24:42 2020
@@ -26,11 +26,11 @@
#include "bookmarkpalette.h"
BookPalette::BookPalette(QWidget* parent) : ScDockPalette( parent, "Books" )
-{
+{;
setObjectName(QString::fromLocal8Bit("Books"));
+ setMinimumSize( QSize(220, 240) );
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
BView = new BookmarkView(this);
- BView->setMinimumSize(QSize(100,150));
setWidget( BView );
languageChange();
}
Modified: trunk/Scribus/scribus/ui/layers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24325&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp (original)
+++ trunk/Scribus/scribus/ui/layers.cpp Mon Dec 14 22:24:42 2020
@@ -45,6 +45,7 @@
LayerPalette::LayerPalette(QWidget* parent) : ScDockPalette(parent, "Layers", Qt::WindowFlags()), m_Doc(nullptr)
{
setObjectName(QString::fromLocal8Bit("Layers"));
+ setMinimumSize( QSize(220, 240) );
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
containerWidget = new QWidget(this);
LayerPaletteLayout = new QVBoxLayout();
Modified: trunk/Scribus/scribus/ui/pagelayout.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24325&path=/trunk/Scribus/scribus/ui/pagelayout.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.cpp (original)
+++ trunk/Scribus/scribus/ui/pagelayout.cpp Mon Dec 14 22:24:42 2020
@@ -72,8 +72,8 @@
modus = false;
layoutGroupLayout = new QVBoxLayout(this);
- layoutGroupLayout->setSpacing( 5 );
- layoutGroupLayout->setMargin( 10 );
+ layoutGroupLayout->setSpacing(6);
+ layoutGroupLayout->setContentsMargins(9, 9, 9, 9);
layoutsCombo = new QComboBox( this );
layoutGroupLayout->addWidget( layoutsCombo );
@@ -94,8 +94,8 @@
pageSets = pSets;
modus = mode;
layoutGroupLayout = new QVBoxLayout(this);
- layoutGroupLayout->setSpacing( 5 );
- layoutGroupLayout->setMargin( 10 );
+ layoutGroupLayout->setSpacing(6);
+ layoutGroupLayout->setContentsMargins(9, 9, 9, 9);
if (modus)
{
layoutsView = new PageListWidget( this );
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24325&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Mon Dec 14 22:24:42 2020
@@ -38,9 +38,9 @@
setupUi(this);
- setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
-
- masterPageList->setMinimumSize(QSize(130,70));
+ setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
+
+ masterPageList->setMinimumSize(QSize(200, 40));
masterPageList->m_thumb = false;
masterPageList->setIconSize(QSize(60, 60));
@@ -57,7 +57,6 @@
pageView->setRowCount(1);
pageView->setColumnCount(1);
pageView->setIconSize(QSize(60, 60));
- pageView->setMinimumSize(QSize(130,120));
trash->setMinimumSize(QSize(32,32));
trash->setMaximumSize(QSize(32,32));
Modified: trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24325&path=/trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui Mon Dec 14 22:24:42 2020
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>440</width>
+ <width>220</width>
<height>286</height>
</rect>
</property>
@@ -34,6 +34,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
+ <property name="childrenCollapsible">
+ <bool>false</bool>
+ </property>
<widget class="QWidget" name="widget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
@@ -60,12 +63,6 @@
</item>
<item>
<widget class="SeList" name="masterPageList">
- <property name="minimumSize">
- <size>
- <width>130</width>
- <height>70</height>
- </size>
- </property>
<property name="toolTip">
<string><qt>List of master pages in the document. Master page names may be dragged onto the page view below to apply master pages, or onto the empty space between pages to create new pages.</qt></string>
</property>
@@ -105,12 +102,6 @@
</item>
<item>
<widget class="SeView" name="pageView">
- <property name="minimumSize">
- <size>
- <width>130</width>
- <height>120</height>
- </size>
- </property>
<property name="toolTip">
<string><qt>List of normal pages in the document, shown with the document layout. Pages may be dragged to rearrange or delete them.</qt></string>
</property>
Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24325&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Mon Dec 14 22:24:42 2020
@@ -719,8 +719,8 @@
/* This is the main Dialog-Class for the Scrapbook */
Biblio::Biblio(QWidget* parent) : ScDockPalette(parent, "Sclib", Qt::WindowFlags())
{
-// resize( 230, 190 );
setObjectName(QString::fromLocal8Bit("Sclib"));
+ setMinimumSize( QSize(220, 240) );
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
containerWidget = new QWidget(this);
BiblioLayout = new QVBoxLayout( containerWidget );
Modified: trunk/Scribus/scribus/undogui.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24325&path=/trunk/Scribus/scribus/undogui.cpp
==============================================================================
--- trunk/Scribus/scribus/undogui.cpp (original)
+++ trunk/Scribus/scribus/undogui.cpp Mon Dec 14 22:24:42 2020
@@ -192,6 +192,7 @@
UndoPalette::UndoPalette(QWidget* parent, const char* name) : UndoGui(parent, name)
{
setObjectName(QString::fromLocal8Bit(name));
+ setMinimumSize( QSize(220, 240) );
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
container = new QWidget(this);
More information about the scribus-commit
mailing list