r24401 by jghali - #16424: Update layout for Edit Colors dialog <bubu>
scribus-commit
scribus-commit at lists.scribus.net
Wed Jan 13 02:15:08 UTC 2021
Author: jghali
Date: Wed Jan 13 02:15:08 2021
New Revision: 24401
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24401
Log:
#16424: Update layout for Edit Colors dialog <bubu>
Modified:
trunk/Scribus/scribus/ui/cmykfwbase.ui
Modified: trunk/Scribus/scribus/ui/cmykfwbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24401&path=/trunk/Scribus/scribus/ui/cmykfwbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfwbase.ui (original)
+++ trunk/Scribus/scribus/ui/cmykfwbase.ui Wed Jan 13 02:15:08 2021
@@ -6,28 +6,25 @@
<rect>
<x>0</x>
<y>0</y>
- <width>652</width>
- <height>361</height>
+ <width>530</width>
+ <height>319</height>
</rect>
</property>
<property name="windowTitle">
<string>Edit Color</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
- <property name="spacing">
- <number>5</number>
- </property>
<property name="leftMargin">
- <number>10</number>
+ <number>9</number>
</property>
<property name="topMargin">
- <number>10</number>
+ <number>9</number>
</property>
<property name="rightMargin">
- <number>10</number>
+ <number>9</number>
</property>
<property name="bottomMargin">
- <number>10</number>
+ <number>9</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -209,20 +206,33 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
- <number>20</number>
+ <number>0</number>
</property>
<property name="leftMargin">
- <number>10</number>
+ <number>0</number>
</property>
<property name="topMargin">
- <number>10</number>
+ <number>0</number>
</property>
<property name="rightMargin">
- <number>10</number>
+ <number>0</number>
</property>
<property name="bottomMargin">
- <number>10</number>
- </property>
+ <number>0</number>
+ </property>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QPushButton" name="buttonOK">
<property name="text">
@@ -234,11 +244,37 @@
</widget>
</item>
<item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<widget class="QPushButton" name="buttonCancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</item>
@@ -253,9 +289,6 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>5</number>
- </property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -286,6 +319,12 @@
</item>
<item>
<widget class="QStackedWidget" name="TabStack">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
@@ -294,9 +333,6 @@
</property>
<widget class="QWidget" name="page">
<layout class="QHBoxLayout" name="horizontalLayout_6">
- <property name="spacing">
- <number>0</number>
- </property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -318,8 +354,26 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
+ <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="QFrame" name="frame_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
<width>182</width>
@@ -339,9 +393,6 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
- <property name="spacing">
- <number>0</number>
- </property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -403,166 +454,6 @@
</widget>
</item>
<item>
- <layout class="QGridLayout" name="slidersLayout">
- <item row="0" column="1">
- <widget class="ScColorSlider" name="CyanSL">
- <property name="minimumSize">
- <size>
- <width>200</width>
- <height>16</height>
- </size>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="ScColorSlider" name="BlackSL">
- <property name="minimumSize">
- <size>
- <width>200</width>
- <height>16</height>
- </size>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="BlackT">
- <property name="text">
- <string>K:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScColorSlider" name="MagentaSL">
- <property name="minimumSize">
- <size>
- <width>200</width>
- <height>16</height>
- </size>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="ScrSpinBox" name="BlackSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="ScColorSlider" name="YellowSL">
- <property name="minimumSize">
- <size>
- <width>200</width>
- <height>16</height>
- </size>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="CyanT">
- <property name="text">
- <string>C:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="ScrSpinBox" name="YellowSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="ScrSpinBox" name="MagentaSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="MagentaT">
- <property name="text">
- <string>M:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="ScrSpinBox" name="CyanSp">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="YellowT">
- <property name="text">
- <string>Y:</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -575,12 +466,225 @@
</property>
</spacer>
</item>
+ <item>
+ <layout class="QGridLayout" name="slidersLayout">
+ <item row="0" column="1">
+ <widget class="ScColorSlider" name="CyanSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ScColorSlider" name="BlackSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="BlackT">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>K:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScColorSlider" name="MagentaSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="ScrSpinBox" name="BlackSp">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="ScColorSlider" name="YellowSL">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="CyanT">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>C:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="ScrSpinBox" name="YellowSp">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="ScrSpinBox" name="MagentaSp">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="MagentaT">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>M:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="ScrSpinBox" name="CyanSp">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="YellowT">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Y:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
+ <customwidget>
+ <class>ScrSpinBox</class>
+ <extends>QDoubleSpinBox</extends>
+ <header location="global">ui/scrspinbox.h</header>
+ </customwidget>
<customwidget>
<class>SwatchCombo</class>
<extends>QToolButton</extends>
@@ -596,11 +700,6 @@
<class>ColorListBox</class>
<extends>QListView</extends>
<header>ui/colorlistbox.h</header>
- </customwidget>
- <customwidget>
- <class>ScrSpinBox</class>
- <extends>QDoubleSpinBox</extends>
- <header>ui/scrspinbox.h</header>
</customwidget>
<customwidget>
<class>ScColorSlider</class>
More information about the scribus-commit
mailing list