Skip to content
Permalink
Browse files

[styledock] improve categorized, graduated, and rule-based renderer l…

…ayout (#3247)
  • Loading branch information
nirvn authored and NathanW2 committed Jun 28, 2016
1 parent 00dc27f commit 002ace2882b93ad6e6153ededcde66e459104cb2
@@ -151,8 +151,8 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="btnAddCategory">
<property name="text">
<widget class="QPushButton" name="btnAddCategory">
<property name="toolTip">
<string>Add</string>
</property>
<property name="icon">
@@ -162,8 +162,8 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="btnDeleteCategories">
<property name="text">
<widget class="QPushButton" name="btnDeleteCategories">
<property name="toolTip">
<string>Delete</string>
</property>
<property name="icon">
@@ -177,10 +177,6 @@
<property name="text">
<string>Delete all</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.png</normaloff>:/images/themes/default/symbologyRemove.png</iconset>
</property>
</widget>
</item>
<item>
@@ -308,6 +308,12 @@ Negative rounds to powers of 10</string>
<string>Classes</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@@ -378,13 +384,6 @@ Negative rounds to powers of 10</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnGraduatedClassify">
<property name="text">
<string>Classify</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
@@ -428,8 +427,15 @@ Negative rounds to powers of 10</string>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QToolButton" name="btnGraduatedAdd">
<widget class="QPushButton" name="btnGraduatedClassify">
<property name="text">
<string>Classify</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnGraduatedAdd">
<property name="toolTip">
<string>Add class</string>
</property>
<property name="icon">
@@ -439,8 +445,8 @@ Negative rounds to powers of 10</string>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnGraduatedDelete">
<property name="text">
<widget class="QPushButton" name="btnGraduatedDelete">
<property name="toolTip">
<string>Delete</string>
</property>
<property name="icon">
@@ -454,20 +460,6 @@ Negative rounds to powers of 10</string>
<property name="text">
<string>Delete all</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.png</normaloff>:/images/themes/default/symbologyRemove.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbxLinkBoundaries">
<property name="text">
<string>Link class boundaries</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@@ -477,12 +469,33 @@ Negative rounds to powers of 10</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnAdvanced">
<property name="text">
<string>Advanced</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="_2">
<item>
<widget class="QCheckBox" name="cbxLinkBoundaries">
<property name="text">
<string>Link class boundaries</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
@@ -499,30 +512,6 @@ Negative rounds to powers of 10</string>
</widget>
</widget>
</item>
<item row="6" column="0" colspan="2">
<layout class="QHBoxLayout" name="_2">
<item>
<spacer>
<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="btnAdvanced">
<property name="text">
<string>Advanced</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
@@ -11,18 +11,6 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<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="QTreeView" name="viewRules">
<property name="contextMenuPolicy">
@@ -71,33 +59,68 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="btnEditRule">
<widget class="QPushButton" name="btnRemoveRule">
<property name="toolTip">
<string>Edit current rule</string>
<string>Remove selected rules</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyEdit.png</normaloff>:/images/themes/default/symbologyEdit.png</iconset>
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnRemoveRule">
<widget class="QPushButton" name="btnEditRule">
<property name="toolTip">
<string>Remove selected rules</string>
<string>Edit current rule</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
<normaloff>:/images/themes/default/symbologyEdit.png</normaloff>:/images/themes/default/symbologyEdit.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnCountFeatures">
<property name="toolTip">
<string>Count features</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionSum.svg</normaloff>:/images/themes/default/mActionSum.svg</iconset>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnRenderingOrder">
<property name="text">
<string>Symbol levels...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout2">
<item>
<widget class="QPushButton" name="btnRefineRule">
<property name="enabled">
@@ -121,14 +144,7 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="btnCountFeatures">
<property name="text">
<string>Count features</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<spacer name="horizontalSpacer2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -140,13 +156,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnRenderingOrder">
<property name="text">
<string>Symbol levels...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>

0 comments on commit 002ace2

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