Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move classify related wigdets in dialogs #4660

Closed
wants to merge 7 commits into from
Closed

Move classify related wigdets in dialogs #4660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
962f140
Moves Classify related widgets next to the Color Ramp
SrNetoChan May 31, 2017
2f4e716
Reorganizes Classify widgets in Dialogs
SrNetoChan Jul 24, 2017
2308dc9
removes indenting in interpolation mode move classify back to origina…
SrNetoChan Jul 25, 2017
93044ec
Adds Tooltips to dialogs
SrNetoChan Jul 25, 2017
e368314
Cleans move min and max widgets to horizontal layout
SrNetoChan Jul 25, 2017
1fc3ca0
Add spacer to palleted renderer widget
SrNetoChan Jun 5, 2018
90ed1e3
moves classify button to the top of the values table
SrNetoChan Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 100 additions & 94 deletions src/ui/qgscategorizedsymbolrendererv2widget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,11 @@
<rect>
<x>0</x>
<y>0</y>
<width>378</width>
<height>368</height>
<width>381</width>
<height>566</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Column</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsFieldExpressionWidget" name="mExpressionWidget" native="true">
<property name="maximumSize">
<size>
<width>500</width>
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Symbol</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="btnChangeCategorizedSymbol">
<property name="sizePolicy">
Expand All @@ -63,46 +24,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Color ramp</string>
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QgsColorRampButton" name="btnColorRamp">
<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>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<widget class="QTreeView" name="viewCategories">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
Expand Down Expand Up @@ -136,19 +58,12 @@
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<item row="6" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="btnAddCategories">
<property name="text">
<string>Classify</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnAddCategory">
<property name="toolTip">
<string>Add</string>
<string>Add categories manually</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
Expand All @@ -159,7 +74,7 @@
<item>
<widget class="QPushButton" name="btnDeleteCategories">
<property name="toolTip">
<string>Delete</string>
<string>Remove selected categories</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
Expand All @@ -169,6 +84,9 @@
</item>
<item>
<widget class="QPushButton" name="btnDeleteAllCategories">
<property name="toolTip">
<string>Remove all categories</string>
</property>
<property name="text">
<string>Delete all</string>
</property>
Expand All @@ -189,26 +107,115 @@
</item>
<item>
<widget class="QPushButton" name="btnAdvanced">
<property name="toolTip">
<string>Advanced options</string>
</property>
<property name="text">
<string>Advanced</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Column</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_10">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Color ramp</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsFieldExpressionWidget" name="mExpressionWidget" native="true">
<property name="maximumSize">
<size>
<width>500</width>
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Symbol</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QgsColorRampButton" name="btnColorRamp">
<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>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="btnAddCategories">
<property name="toolTip">
<string>Add all missing categories from column or expression unique values</string>
</property>
<property name="text">
<string>Classify</string>
</property>
</widget>
</item>
</layout>
<zorder>viewCategories</zorder>
<zorder>btnChangeCategorizedSymbol</zorder>
<zorder>label_9</zorder>
<zorder>label_10</zorder>
<zorder>mExpressionWidget</zorder>
<zorder>label_3</zorder>
<zorder>btnColorRamp</zorder>
<zorder>btnAddCategories</zorder>
</widget>
<customwidgets>
<customwidget>
<class>QgsFieldExpressionWidget</class>
<extends>QWidget</extends>
<header location="global">qgsfieldexpressionwidget.h</header>
<header>qgsfieldexpressionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
Expand All @@ -222,12 +229,11 @@
<tabstop>mExpressionWidget</tabstop>
<tabstop>btnChangeCategorizedSymbol</tabstop>
<tabstop>btnColorRamp</tabstop>
<tabstop>btnAddCategories</tabstop>
<tabstop>viewCategories</tabstop>
<tabstop>btnAddCategory</tabstop>
<tabstop>btnDeleteCategories</tabstop>
<tabstop>btnDeleteAllCategories</tabstop>
<tabstop>btnAdvanced</tabstop>
<tabstop>viewCategories</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
Expand Down
Loading