Skip to content
Permalink
Browse files

Conditional UI tweaks

  • Loading branch information
NathanW2 committed Aug 21, 2015
1 parent 8cbfe00 commit 76f4f7c2466d7b55f33922228811c70c20806ab5
Showing with 119 additions and 89 deletions.
  1. +119 −89 src/ui/qgsfieldconditionalformatwidget.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>410</width>
<height>337</height>
<width>387</width>
<height>461</height>
</rect>
</property>
<property name="sizePolicy">
@@ -20,7 +20,16 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<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>
@@ -40,33 +49,18 @@
</property>
<widget class="QWidget" name="page">
<layout class="QGridLayout" name="gridLayout">
<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 row="2" column="0" colspan="2">
<widget class="QPushButton" name="mNewButton">
<property name="text">
<string>New Rule</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.png</normaloff>:/images/themes/default/symbologyAdd.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Field</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QListView" name="listView">
<property name="editTriggers">
@@ -80,27 +74,65 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsFieldComboBox" name="mFieldCombo"/>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Field</string>
</property>
</widget>
</item>
<item>
<widget class="QgsFieldComboBox" name="mFieldCombo"/>
</item>
<item>
<widget class="QPushButton" name="mNewButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>New Rule</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.png</normaloff>:/images/themes/default/symbologyAdd.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="4" column="0">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Condition</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLineEdit" name="mRuleEdit"/>
<widget class="QLineEdit" name="mRuleEdit">
<property name="text">
<string>@value</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnBuildExpression">
@@ -115,19 +147,12 @@
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="2" column="0">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QPushButton" name="mDefault1">
<item row="1" column="1">
<widget class="QPushButton" name="mDefault3">
<property name="styleSheet">
<string notr="true">background-color: rgb(208, 255, 187);</string>
<string notr="true">background-color: rgb(240, 204, 146);</string>
</property>
<property name="text">
<string>abc - 123</string>
@@ -137,66 +162,66 @@
</property>
<property name="backColor" stdset="0">
<color>
<red>154</red>
<green>216</green>
<blue>113</blue>
<red>241</red>
<green>186</green>
<blue>118</blue>
</color>
</property>
<attribute name="buttonGroup">
<string notr="true">mDefaultButtons</string>
</attribute>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="mDefault2">
<item row="2" column="2">
<widget class="QPushButton" name="pushButton_7">
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 167, 151);</string>
<string notr="true">color: rgb(170, 64, 75);</string>
</property>
<property name="text">
<string>abc - 123</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="backColor" stdset="0">
<property name="fontColor" stdset="0">
<color>
<red>255</red>
<green>130</green>
<blue>130</blue>
<red>188</red>
<green>54</green>
<blue>49</blue>
</color>
</property>
<attribute name="buttonGroup">
<string notr="true">mDefaultButtons</string>
</attribute>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="mDefault3">
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_8">
<property name="styleSheet">
<string notr="true">background-color: rgb(240, 204, 146);</string>
<string notr="true">color: rgb(209, 166, 57);</string>
</property>
<property name="text">
<string>abc - 123</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="backColor" stdset="0">
<property name="fontColor" stdset="0">
<color>
<red>241</red>
<green>186</green>
<blue>118</blue>
<red>207</red>
<green>141</green>
<blue>61</blue>
</color>
</property>
<attribute name="buttonGroup">
<string notr="true">mDefaultButtons</string>
</attribute>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_7">
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_3">
<property name="styleSheet">
<string notr="true">color: rgb(170, 64, 75);</string>
<string notr="true">color: rgb(98, 136, 78);</string>
</property>
<property name="text">
<string>abc - 123</string>
@@ -206,32 +231,32 @@
</property>
<property name="fontColor" stdset="0">
<color>
<red>188</red>
<green>54</green>
<blue>49</blue>
<red>80</red>
<green>157</green>
<blue>52</blue>
</color>
</property>
<attribute name="buttonGroup">
<string notr="true">mDefaultButtons</string>
</attribute>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton_8">
<item row="1" column="2">
<widget class="QPushButton" name="mDefault2">
<property name="styleSheet">
<string notr="true">color: rgb(209, 166, 57);</string>
<string notr="true">background-color: rgb(255, 167, 151);</string>
</property>
<property name="text">
<string>abc - 123</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="fontColor" stdset="0">
<property name="backColor" stdset="0">
<color>
<red>207</red>
<green>141</green>
<blue>61</blue>
<red>255</red>
<green>130</green>
<blue>130</blue>
</color>
</property>
<attribute name="buttonGroup">
@@ -240,31 +265,38 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_3">
<widget class="QPushButton" name="mDefault1">
<property name="styleSheet">
<string notr="true">color: rgb(98, 136, 78);</string>
<string notr="true">background-color: rgb(208, 255, 187);</string>
</property>
<property name="text">
<string>abc - 123</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="fontColor" stdset="0">
<property name="backColor" stdset="0">
<color>
<red>80</red>
<green>157</green>
<blue>52</blue>
<red>154</red>
<green>216</green>
<blue>113</blue>
</color>
</property>
<attribute name="buttonGroup">
<string notr="true">mDefaultButtons</string>
</attribute>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="6" column="1">
<item row="3" column="0">
<widget class="QGroupBox" name="horizontalGroupBox_2">
<property name="title">
<string>Custom</string>
@@ -586,7 +618,7 @@
</layout>
</widget>
</item>
<item row="9" column="0" colspan="2">
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -602,7 +634,7 @@
</property>
</spacer>
</item>
<item row="10" column="0" colspan="2">
<item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="mSaveRule">
@@ -667,9 +699,7 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mFieldCombo</tabstop>
<tabstop>listView</tabstop>
<tabstop>mNewButton</tabstop>
<tabstop>mRuleEdit</tabstop>
<tabstop>btnBuildExpression</tabstop>
<tabstop>mDefault1</tabstop>

0 comments on commit 76f4f7c

Please sign in to comment.
You can’t perform that action at this time.