Skip to content

Commit

Permalink
Vertically align color widget in Effect properties dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@DelazJ
DelazJ committed Oct 14, 2017
1 parent 5515d68 commit b6ed28b
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 97 deletions.
2 changes: 1 addition & 1 deletion src/ui/effects/widget_blur.ui
View file
Expand Up @@ -105,7 +105,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>189</height>
<height>0</height>
</size>
</property>
</spacer>
Expand Down
40 changes: 20 additions & 20 deletions src/ui/effects/widget_coloreffects.ui
View file
Expand Up @@ -223,25 +223,6 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QgsColorButton" name="mColorizeColorButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelGrayscale">
<property name="text">
Expand All @@ -259,6 +240,25 @@
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QgsColorButton" name="mColorizeColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -272,7 +272,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/effects/widget_drawsource.ui
View file
Expand Up @@ -78,7 +78,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>189</height>
<height>0</height>
</size>
</property>
</spacer>
Expand Down
62 changes: 28 additions & 34 deletions src/ui/effects/widget_glow.ui
View file
Expand Up @@ -45,28 +45,6 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QgsColorButton" name="mColorBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
Expand Down Expand Up @@ -176,6 +154,22 @@
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QgsColorButton" name="mColorBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -189,7 +183,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
Expand All @@ -203,11 +197,6 @@
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
Expand All @@ -223,6 +212,17 @@
<extends>QComboBox</extends>
<header>qgseffectdrawmodecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
Expand All @@ -235,12 +235,6 @@
<header>qgscolorrampbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mSpreadSpnBx</tabstop>
Expand Down
64 changes: 29 additions & 35 deletions src/ui/effects/widget_shadoweffect.ui
View file
Expand Up @@ -76,28 +76,6 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QgsColorButton" name="mShadowColorBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
Expand Down Expand Up @@ -210,6 +188,22 @@
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QgsColorButton" name="mShadowColorBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -223,7 +217,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
Expand All @@ -237,11 +231,6 @@
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
Expand All @@ -253,10 +242,9 @@
<header>qgsblendmodecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
<header>qgsunitselectionwidget.h</header>
<container>1</container>
<class>QgsEffectDrawModeComboBox</class>
<extends>QComboBox</extends>
<header>qgseffectdrawmodecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
Expand All @@ -265,9 +253,15 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsEffectDrawModeComboBox</class>
<extends>QComboBox</extends>
<header>qgseffectdrawmodecombobox.h</header>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
12 changes: 6 additions & 6 deletions src/ui/effects/widget_transform.ui
View file
Expand Up @@ -288,24 +288,24 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>189</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsEffectDrawModeComboBox</class>
<extends>QComboBox</extends>
<header>qgseffectdrawmodecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
Expand Down

0 comments on commit b6ed28b

Please sign in to comment.