Skip to content

Commit

Permalink
Update recent symbology widget update for cross-platform consistency
Browse files Browse the repository at this point in the history 
Also:
- Keep color wells from over expanding
- Group color wells together, where appropriate
- Make SVG Groups view wider (was too thin)
  • Loading branch information
@dakcarto
dakcarto committed Apr 10, 2013
1 parent 094a5d8 commit 054f64c
Show file tree
Hide file tree
Showing 13 changed files with 611 additions and 203 deletions.
105 changes: 84 additions & 21 deletions src/ui/symbollayer/widget_ellipse.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>392</width>
<width>404</width>
<height>504</height>
</rect>
</property>
Expand All @@ -22,36 +22,99 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing">
<number>28</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Border color</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsColorButton" name="btnChangeColorBorder">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Fill color</string>
<string>Colors</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="btnChangeColorFill">
<property name="text">
<string/>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Fill</string>
</property>
</widget>
</item>
<item>
<widget class="QgsColorButton" name="btnChangeColorFill">
<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>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Border</string>
</property>
</widget>
</item>
<item>
<widget class="QgsColorButton" name="btnChangeColorBorder">
<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>
<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>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mSymbolWidthLabel">
Expand Down
15 changes: 15 additions & 0 deletions src/ui/symbollayer/widget_fontmarker.ui
View file
Expand Up @@ -25,6 +25,9 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing">
<number>28</number>
</property>
Expand Down Expand Up @@ -53,6 +56,18 @@
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="btnColor">
<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>
Expand Down
15 changes: 15 additions & 0 deletions src/ui/symbollayer/widget_linedecoration.ui
View file
Expand Up @@ -17,6 +17,9 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing">
<number>28</number>
</property>
Expand All @@ -38,6 +41,18 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<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>
Expand Down
17 changes: 16 additions & 1 deletion src/ui/symbollayer/widget_linepatternfill.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>328</width>
<width>368</width>
<height>293</height>
</rect>
</property>
Expand All @@ -17,6 +17,9 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing">
<number>28</number>
</property>
Expand Down Expand Up @@ -169,6 +172,18 @@
</item>
<item row="4" column="1">
<widget class="QgsColorButton" name="mColorPushButton">
<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>
Expand Down
15 changes: 12 additions & 3 deletions src/ui/symbollayer/widget_markerline.ui
View file
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>308</width>
<height>283</height>
<width>368</width>
<height>324</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -17,7 +17,16 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="margin">
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item row="0" column="0" colspan="2">
Expand Down
8 changes: 7 additions & 1 deletion src/ui/symbollayer/widget_pointpatternfill.ui
View file
Expand Up @@ -6,14 +6,20 @@
<rect>
<x>0</x>
<y>0</y>
<width>365</width>
<width>457</width>
<height>271</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing">
<number>28</number>
</property>
Expand Down

0 comments on commit 054f64c

Please sign in to comment.