r23999 by jghali - #15978: Item Tools color comboboxes does not have enough width for strings
scribus-commit
scribus-commit at lists.scribus.net
Wed Aug 26 23:58:31 UTC 2020
Author: jghali
Date: Wed Aug 26 23:58:30 2020
New Revision: 23999
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23999
Log:
#15978: Item Tools color comboboxes does not have enough width for strings
Modified:
trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
Modified: trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23999&path=/trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui Wed Aug 26 23:58:30 2020
@@ -88,7 +88,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>637</width>
+ <width>635</width>
<height>680</height>
</rect>
</property>
@@ -127,19 +127,6 @@
</property>
</widget>
</item>
- <item row="0" column="2">
- <spacer name="horizontalSpacer_13">
- <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 row="16" column="0">
<spacer name="verticalSpacer_10">
<property name="orientation">
@@ -277,22 +264,222 @@
</item>
</layout>
</item>
- <item row="0" column="0" rowspan="3" colspan="2">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="textFillColorLabel">
- <property name="text">
- <string>Fill Color:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QSpinBox" name="textFrameFillShadingSpinBox">
+ <item row="10" column="0" colspan="3">
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="3" column="3">
+ <widget class="QLabel" name="textColorStrokeLabel">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ColorCombo" name="textStrokeColorComboBox"/>
+ </item>
+ <item row="3" column="4">
+ <widget class="QSpinBox" name="textStrokeShadingSpinBox">
<property name="suffix">
<string> %</string>
</property>
<property name="maximum">
<number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLabel" name="textColorShadingLabel">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="StrokeLabel">
+ <property name="text">
+ <string>Stroke:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4">
+ <widget class="QSpinBox" name="textColorShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="FontLabel">
+ <property name="text">
+ <string>Font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="textSizeSpinBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textColorLabel">
+ <property name="text">
+ <string>Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="ColorCombo" name="textColorComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="SizeLabel">
+ <property name="text">
+ <string>Size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="5" rowspan="3">
+ <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 row="0" column="1" colspan="5">
+ <widget class="FontCombo" name="textFontComboBox"/>
+ </item>
+ </layout>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="label_19">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Text</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="0" colspan="3">
+ <widget class="QLabel" name="textPreviewWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>400</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="7" column="0" colspan="2">
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="12" column="0" colspan="3">
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0" rowspan="3" colspan="3">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLineColorLabel">
+ <property name="text">
+ <string>Line Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ScrSpinBox" name="textTabWidthSpinBox"/>
+ </item>
+ <item row="1" column="1">
+ <widget class="ColorCombo" name="textFrameLineColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="TabFillCharacterLabel">
+ <property name="text">
+ <string>Tab Fill Character:</string>
</property>
</widget>
</item>
@@ -305,9 +492,6 @@
<number>100</number>
</property>
</widget>
- </item>
- <item row="0" column="1">
- <widget class="ColorCombo" name="textFrameFillColorComboBox"/>
</item>
<item row="0" column="3">
<widget class="QLabel" name="textFillColorShadingLabel">
@@ -322,10 +506,13 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLineColorLabel">
- <property name="text">
- <string>Line Color:</string>
+ <item row="0" column="1">
+ <widget class="ColorCombo" name="textFrameFillColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
</widget>
</item>
@@ -335,16 +522,6 @@
<string>Tab Width:</string>
</property>
</widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="TabFillCharacterLabel">
- <property name="text">
- <string>Tab Fill Character:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="textTabFillCharComboBox"/>
</item>
<item row="1" column="3">
<widget class="QLabel" name="textLineColorShadingLabel">
@@ -359,11 +536,45 @@
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="ScrSpinBox" name="textTabWidthSpinBox"/>
- </item>
- <item row="1" column="1">
- <widget class="ColorCombo" name="textFrameLineColorComboBox"/>
+ <item row="0" column="4">
+ <widget class="QSpinBox" name="textFrameFillShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="textTabFillCharComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textFillColorLabel">
+ <property name="text">
+ <string>Fill Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5">
+ <spacer name="horizontalSpacer_13">
+ <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 row="0" column="2" rowspan="4">
<spacer name="horizontalSpacer_8">
@@ -382,196 +593,6 @@
</spacer>
</item>
</layout>
- </item>
- <item row="10" column="0" colspan="3">
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="3" column="3">
- <widget class="QLabel" name="textColorStrokeLabel">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="ColorCombo" name="textStrokeColorComboBox"/>
- </item>
- <item row="3" column="4">
- <widget class="QSpinBox" name="textStrokeShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QLabel" name="textColorShadingLabel">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="StrokeLabel">
- <property name="text">
- <string>Stroke:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QSpinBox" name="textColorShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="FontLabel">
- <property name="text">
- <string>Font:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScrSpinBox" name="textSizeSpinBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="textColorLabel">
- <property name="text">
- <string>Color:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="ColorCombo" name="textColorComboBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="SizeLabel">
- <property name="text">
- <string>Size:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="5" rowspan="3">
- <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 row="0" column="1" colspan="5">
- <widget class="FontCombo" name="textFontComboBox"/>
- </item>
- </layout>
- </item>
- <item row="8" column="0">
- <widget class="QLabel" name="label_19">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Text</string>
- </property>
- </widget>
- </item>
- <item row="15" column="0" colspan="3">
- <widget class="QLabel" name="textPreviewWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>400</width>
- <height>100</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="2">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="7" column="0" colspan="2">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="12" column="0" colspan="3">
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
</item>
</layout>
</widget>
@@ -615,101 +636,11 @@
<rect>
<x>0</x>
<y>0</y>
- <width>637</width>
+ <width>635</width>
<height>680</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout_6">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout_6">
- <item row="1" column="4">
- <widget class="QSpinBox" name="imageFrameLineShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="imageLineColorLabel">
- <property name="text">
- <string>Line Color:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QLabel" name="imageFillShadingLabel">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="imageFillColorLabel">
- <property name="text">
- <string>Fill Color:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="ColorCombo" name="imageFrameFillColorComboBox"/>
- </item>
- <item row="1" column="3">
- <widget class="QLabel" name="imageLineColorShadeLabel">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QSpinBox" name="imageFrameFillShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ColorCombo" name="imageFrameLineColorComboBox"/>
- </item>
- <item row="0" column="2" rowspan="2">
- <spacer name="horizontalSpacer_16">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="0" column="1">
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="1" column="0">
<widget class="QCheckBox" name="imageUseEmbeddedClippingPathCheckBox">
<property name="text">
@@ -957,6 +888,107 @@
</item>
</layout>
</item>
+ <item row="0" column="0" colspan="2">
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="1" column="4">
+ <widget class="QSpinBox" name="imageFrameLineShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="imageFillColorLabel">
+ <property name="text">
+ <string>Fill Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QLabel" name="imageLineColorShadeLabel">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ColorCombo" name="imageFrameFillColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QSpinBox" name="imageFrameFillShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="imageLineColorLabel">
+ <property name="text">
+ <string>Line Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ColorCombo" name="imageFrameLineColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" rowspan="2">
+ <spacer name="horizontalSpacer_16">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="3">
+ <widget class="QLabel" name="imageFillShadingLabel">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5">
+ <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>
+ </layout>
+ </item>
</layout>
</widget>
</widget>
@@ -968,22 +1000,56 @@
<string>Shapes</string>
</attribute>
<layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
+ <item row="1" column="0">
+ <spacer name="verticalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_9">
- <item row="0" column="1">
- <widget class="ColorCombo" name="shapeFrameFillColorComboBox"/>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="shapeFillColorLabel">
- <property name="text">
- <string>Fill Color:</string>
- </property>
- </widget>
- </item>
<item row="0" column="3">
<widget class="QLabel" name="shapeFillColorShadingLabel">
<property name="text">
<string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="shapeLineColorLabel">
+ <property name="text">
+ <string>Line Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QSpinBox" name="shapeFrameFillShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="shapeLineStyleLabel">
+ <property name="text">
+ <string>Line Style:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="shapeLineWidthLabel">
+ <property name="text">
+ <string>Line Width:</string>
</property>
</widget>
</item>
@@ -1000,25 +1066,15 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="shapeLineColorLabel">
- <property name="text">
- <string>Line Color:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QSpinBox" name="shapeFrameFillShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
<item row="1" column="1">
- <widget class="ColorCombo" name="shapeFrameLineColorComboBox"/>
+ <widget class="ColorCombo" name="shapeFrameLineColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
</item>
<item row="1" column="4">
<widget class="QSpinBox" name="shapeFrameLineShadingSpinBox">
@@ -1027,26 +1083,6 @@
</property>
<property name="maximum">
<number>100</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="shapeLineStyleLabel">
- <property name="text">
- <string>Line Style:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="LineCombo" name="shapeFrameLineStyleComboBox"/>
- </item>
- <item row="3" column="1">
- <widget class="ScrSpinBox" name="shapeLineWidthSpinBox"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="shapeLineWidthLabel">
- <property name="text">
- <string>Line Width:</string>
</property>
</widget>
</item>
@@ -1066,33 +1102,50 @@
</property>
</spacer>
</item>
+ <item row="2" column="1">
+ <widget class="LineCombo" name="shapeFrameLineStyleComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ColorCombo" name="shapeFrameFillColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="shapeFillColorLabel">
+ <property name="text">
+ <string>Fill Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ScrSpinBox" name="shapeLineWidthSpinBox"/>
+ </item>
+ <item row="0" column="5">
+ <spacer name="horizontalSpacer_6">
+ <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>
- <item row="0" column="1">
- <spacer name="horizontalSpacer_6">
- <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 row="1" column="0">
- <spacer name="verticalSpacer_8">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
</item>
</layout>
</widget>
@@ -1148,25 +1201,21 @@
<string>Lines</string>
</attribute>
<layout class="QFormLayout" name="formLayout_2">
- <item row="0" column="0">
+ <item row="1" column="0">
+ <spacer name="verticalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_10">
- <item row="0" column="0">
- <widget class="QLabel" name="lineColorLabel">
- <property name="text">
- <string>Line Color:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="endArrowLabel">
- <property name="text">
- <string>End Arrow:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="ScrSpinBox" name="lineWidthSpinBox"/>
- </item>
<item row="0" column="3">
<widget class="QLabel" name="lineColorShadingLabel">
<property name="text">
@@ -1175,41 +1224,14 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="ColorCombo" name="lineFillColorComboBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="lineStyleLabel">
- <property name="text">
- <string>Line Style:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="startArrowLabel">
- <property name="text">
- <string>Start Arrow:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QSpinBox" name="lineFillColorShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="lineWidthLabel">
- <property name="text">
- <string>Line Width:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="LineCombo" name="lineStyleComboBox"/>
+ <widget class="ColorCombo" name="lineFillColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
</item>
<item row="0" column="2" rowspan="3">
<spacer name="horizontalSpacer_7">
@@ -1227,39 +1249,77 @@
</property>
</spacer>
</item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="endArrowLabel">
+ <property name="text">
+ <string>End Arrow:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="lineWidthLabel">
+ <property name="text">
+ <string>Line Width:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="lineStyleLabel">
+ <property name="text">
+ <string>Line Style:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="startArrowLabel">
+ <property name="text">
+ <string>Start Arrow:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QSpinBox" name="lineFillColorShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="LineCombo" name="lineStyleComboBox"/>
+ </item>
<item row="3" column="1" colspan="2">
<widget class="ArrowChooser" name="lineStartArrowComboBox"/>
</item>
<item row="4" column="1" colspan="2">
<widget class="ArrowChooser" name="lineEndArrowComboBox"/>
</item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="lineColorLabel">
+ <property name="text">
+ <string>Line Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="ScrSpinBox" name="lineWidthSpinBox"/>
+ </item>
+ <item row="0" column="5">
+ <spacer name="horizontalSpacer_10">
+ <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>
- <item row="0" column="1">
- <spacer name="horizontalSpacer_10">
- <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 row="1" column="0">
- <spacer name="verticalSpacer_7">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
</item>
</layout>
</widget>
@@ -1268,29 +1328,21 @@
<string>Calligraphic Pen</string>
</attribute>
<layout class="QFormLayout" name="formLayout_3">
- <item row="0" column="0">
+ <item row="1" column="0">
+ <spacer name="verticalSpacer_11">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout">
- <item row="3" column="0">
- <widget class="QLabel" name="calLineWidthLabel">
- <property name="text">
- <string>Line Width:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="calLineStyleLabel">
- <property name="text">
- <string>Line Style:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="calFillColorLabel">
- <property name="text">
- <string>Fill Color:</string>
- </property>
- </widget>
- </item>
<item row="0" column="4">
<widget class="QSpinBox" name="calPenFillShadingSpinBox">
<property name="suffix">
@@ -1301,6 +1353,26 @@
</property>
</widget>
</item>
+ <item row="2" column="4">
+ <widget class="ScrSpinBox" name="calPenAngleSpinBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="calLineStyleLabel">
+ <property name="text">
+ <string>Line Style:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ColorCombo" name="calPenFillColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
<item row="0" column="3">
<widget class="QLabel" name="calFillColorShadingLabel">
<property name="text">
@@ -1315,44 +1387,8 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="ColorCombo" name="calPenFillColorComboBox"/>
- </item>
- <item row="2" column="3">
- <widget class="QLabel" name="calPenAngleLabel">
- <property name="text">
- <string>Pen Angle:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="LineCombo" name="calPenStyleComboBox"/>
- </item>
- <item row="1" column="1">
- <widget class="ColorCombo" name="calPenColorComboBox"/>
- </item>
- <item row="3" column="4">
- <widget class="ScrSpinBox" name="calPenWidthSpinBox"/>
- </item>
- <item row="3" column="3">
- <widget class="QLabel" name="calPenWidthLabel">
- <property name="text">
- <string>Pen Width:</string>
- </property>
- </widget>
- </item>
<item row="3" column="1">
<widget class="ScrSpinBox" name="calPenLineWidthSpinBox"/>
- </item>
- <item row="1" column="3">
- <widget class="QLabel" name="calLineColorShadingLabel">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="ScrSpinBox" name="calPenAngleSpinBox"/>
</item>
<item row="1" column="4">
<widget class="QSpinBox" name="calPenLineShadingSpinBox">
@@ -1361,6 +1397,44 @@
</property>
<property name="maximum">
<number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLabel" name="calPenAngleLabel">
+ <property name="text">
+ <string>Pen Angle:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="calLineWidthLabel">
+ <property name="text">
+ <string>Line Width:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="calFillColorLabel">
+ <property name="text">
+ <string>Fill Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ColorCombo" name="calPenColorComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QLabel" name="calLineColorShadingLabel">
+ <property name="text">
+ <string>Shading:</string>
</property>
</widget>
</item>
@@ -1380,33 +1454,40 @@
</property>
</spacer>
</item>
+ <item row="2" column="1">
+ <widget class="LineCombo" name="calPenStyleComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="4">
+ <widget class="ScrSpinBox" name="calPenWidthSpinBox"/>
+ </item>
+ <item row="3" column="3">
+ <widget class="QLabel" name="calPenWidthLabel">
+ <property name="text">
+ <string>Pen Width:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5">
+ <spacer name="horizontalSpacer_14">
+ <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>
- <item row="0" column="1">
- <spacer name="horizontalSpacer_14">
- <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 row="1" column="0">
- <spacer name="verticalSpacer_11">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
</item>
</layout>
</widget>
@@ -1611,7 +1692,7 @@
<resources/>
<connections/>
<buttongroups>
+ <buttongroup name="previewButtonGroup"/>
<buttongroup name="scalingButtonGroup"/>
- <buttongroup name="previewButtonGroup"/>
</buttongroups>
</ui>
More information about the scribus-commit
mailing list