r24322 by jghali - #16381: Update main layout's margins for Style Manager <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Mon Dec 14 22:03:26 UTC 2020
Author: jghali
Date: Mon Dec 14 22:03:26 2020
New Revision: 24322
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24322
Log:
#16381: Update main layout's margins for Style Manager <bubu>
Modified:
trunk/Scribus/scribus/ui/smcellstylewidget.ui
trunk/Scribus/scribus/ui/smcstylewidget.ui
trunk/Scribus/scribus/ui/smlinestylewidget.ui
trunk/Scribus/scribus/ui/smpstylewidget.ui
trunk/Scribus/scribus/ui/smtablestylewidget.ui
trunk/Scribus/scribus/ui/stylemanager.cpp
trunk/Scribus/scribus/ui/stylemanager.ui
Modified: trunk/Scribus/scribus/ui/smcellstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24322&path=/trunk/Scribus/scribus/ui/smcellstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smcellstylewidget.ui Mon Dec 14 22:03:26 2020
@@ -125,13 +125,12 @@
</size>
</property>
</spacer>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <customwidgets>
- <customwidget>
- <class>SMColorCombo</class>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>SMColorCombo</class>
<extends>QComboBox</extends>
<header>ui/smcolorcombo.h</header>
</customwidget>
Modified: trunk/Scribus/scribus/ui/smcstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24322&path=/trunk/Scribus/scribus/ui/smcstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.ui Mon Dec 14 22:03:26 2020
@@ -132,10 +132,10 @@
<string>Font Size</string>
</property>
<property name="minimum">
- <number>1</number>
+ <double>1.000000000000000</double>
</property>
<property name="maximum">
- <number>2048</number>
+ <double>2048.000000000000000</double>
</property>
</widget>
</item>
@@ -164,10 +164,10 @@
<string> %</string>
</property>
<property name="minimum">
- <number>-300</number>
+ <double>-300.000000000000000</double>
</property>
<property name="maximum">
- <number>300</number>
+ <double>300.000000000000000</double>
</property>
</widget>
</item>
@@ -196,13 +196,13 @@
<string> %</string>
</property>
<property name="minimum">
- <number>1</number>
+ <double>1.000000000000000</double>
</property>
<property name="maximum">
- <number>199</number>
+ <double>199.000000000000000</double>
</property>
<property name="value">
- <number>100</number>
+ <double>100.000000000000000</double>
</property>
</widget>
</item>
@@ -330,10 +330,10 @@
<string> %</string>
</property>
<property name="minimum">
- <number>10</number>
+ <double>10.000000000000000</double>
</property>
<property name="maximum">
- <number>400</number>
+ <double>400.000000000000000</double>
</property>
</widget>
</item>
@@ -368,10 +368,10 @@
<string> %</string>
</property>
<property name="minimum">
- <number>10</number>
+ <double>10.000000000000000</double>
</property>
<property name="maximum">
- <number>400</number>
+ <double>400.000000000000000</double>
</property>
</widget>
</item>
@@ -406,10 +406,10 @@
<string> %</string>
</property>
<property name="minimum">
- <number>-100</number>
+ <double>-100.000000000000000</double>
</property>
<property name="maximum">
- <number>100</number>
+ <double>100.000000000000000</double>
</property>
</widget>
</item>
@@ -831,19 +831,20 @@
<string>Font Features</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_7">
- <item>
- <widget class="SMFontFeatures" name="fontfeaturesSetting" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="SMFontFeatures" name="fontfeaturesSetting" native="true"/>
</item>
</layout>
</widget>
@@ -851,7 +852,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>SMScComboBox</class>
Modified: trunk/Scribus/scribus/ui/smlinestylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24322&path=/trunk/Scribus/scribus/ui/smlinestylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smlinestylewidget.ui Mon Dec 14 22:03:26 2020
@@ -269,13 +269,12 @@
</layout>
</item>
</layout>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <customwidgets>
- <customwidget>
- <class>LineCombo</class>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>LineCombo</class>
<extends>QComboBox</extends>
<header>ui/linecombo.h</header>
</customwidget>
Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24322&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui Mon Dec 14 22:03:26 2020
@@ -138,10 +138,10 @@
<string>Line Spacing</string>
</property>
<property name="minimum">
- <number>1</number>
+ <double>1.000000000000000</double>
</property>
<property name="maximum">
- <number>300</number>
+ <double>300.000000000000000</double>
</property>
</widget>
</item>
@@ -190,7 +190,7 @@
<string>Space Above</string>
</property>
<property name="maximum">
- <number>300</number>
+ <double>300.000000000000000</double>
</property>
</widget>
</item>
@@ -235,7 +235,7 @@
<string>Space Below</string>
</property>
<property name="maximum">
- <number>300</number>
+ <double>300.000000000000000</double>
</property>
</widget>
</item>
@@ -1204,10 +1204,10 @@
<string>Paragraph Effects characters offset</string>
</property>
<property name="minimum">
- <number>-3000</number>
+ <double>-3000.000000000000000</double>
</property>
<property name="maximum">
- <number>3000</number>
+ <double>3000.000000000000000</double>
</property>
</widget>
</item>
@@ -1302,25 +1302,7 @@
<number>0</number>
</property>
<item>
- <widget class="QFrame" name="characterBox">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- <property name="lineWidth">
- <number>0</number>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <widget class="SMCStyleWidget" name="cpage" native="true"/>
- </item>
- </layout>
- </widget>
+ <widget class="SMCStyleWidget" name="cpage" native="true"/>
</item>
</layout>
</widget>
@@ -1328,7 +1310,6 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="5" margin="5"/>
<customwidgets>
<customwidget>
<class>SMScComboBox</class>
@@ -1351,6 +1332,11 @@
<header>ui/smshadebutton.h</header>
</customwidget>
<customwidget>
+ <class>SMSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>ui/smspinbox.h</header>
+ </customwidget>
+ <customwidget>
<class>SMRadioButton</class>
<extends>QRadioButton</extends>
<header>ui/smradiobutton.h</header>
@@ -1365,11 +1351,6 @@
<extends>QWidget</extends>
<header>ui/smalignselect.h</header>
<container>1</container>
- </customwidget>
- <customwidget>
- <class>SMSpinBox</class>
- <extends>QSpinBox</extends>
- <header>ui/smspinbox.h</header>
</customwidget>
<customwidget>
<class>SMTabruler</class>
Modified: trunk/Scribus/scribus/ui/smtablestylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24322&path=/trunk/Scribus/scribus/ui/smtablestylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smtablestylewidget.ui Mon Dec 14 22:03:26 2020
@@ -113,13 +113,12 @@
</size>
</property>
</spacer>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <customwidgets>
- <customwidget>
- <class>SMColorCombo</class>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>SMColorCombo</class>
<extends>QComboBox</extends>
<header>ui/smcolorcombo.h</header>
</customwidget>
Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24322&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp Mon Dec 14 22:03:26 2020
@@ -1371,6 +1371,7 @@
//insertShortcutPage(m_widget);
//>>
m_widget->setParent(mainFrame);
+ m_layout->setContentsMargins(0, 0, 0, 0);
m_layout->addWidget(m_widget, 0, 0);
layout()->activate();
m_widget->resize(m_widget->minimumSizeHint());
Modified: trunk/Scribus/scribus/ui/stylemanager.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24322&path=/trunk/Scribus/scribus/ui/stylemanager.ui
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.ui (original)
+++ trunk/Scribus/scribus/ui/stylemanager.ui Mon Dec 14 22:03:26 2020
@@ -25,8 +25,14 @@
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>9</number>
+ </property>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>9</number>
+ </property>
<item>
<widget class="StyleView" name="styleView">
<property name="sizePolicy">
@@ -86,6 +92,18 @@
<number>0</number>
</property>
<layout class="QGridLayout" name="gridLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
<item row="0" column="0">
<widget class="QPushButton" name="newButton">
<property name="sizePolicy">
@@ -203,7 +221,16 @@
<property name="spacing">
<number>0</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -225,19 +252,22 @@
</property>
<layout class="QVBoxLayout">
<property name="spacing">
+ <number>9</number>
+ </property>
+ <property name="leftMargin">
<number>0</number>
</property>
- <property name="margin">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>10</number>
- </property>
- <property name="margin">
- <number>10</number>
- </property>
<item>
<widget class="QLabel" name="nameLabel">
<property name="text">
@@ -318,10 +348,19 @@
<item>
<layout class="QHBoxLayout">
<property name="spacing">
- <number>5</number>
- </property>
- <property name="margin">
<number>6</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
</property>
<item>
<widget class="QPushButton" name="okButton">
More information about the scribus-commit
mailing list