Skip to content

Commit 90f435d

Browse files
DelazJnirvn
DelazJ
authored and
nirvn
committedDec 27, 2016
[ui] expression icon cleanups (#3908)
* Add expression icon to several buttons for consistency * Replace mIconExpressionEditorOpen icon with mIconExpresssion
·
ltr-3_40final-3_0_0
1 parent 407991e commit 90f435d

File tree

6 files changed

+75
-81
lines changed

6 files changed

+75
-81
lines changed
 

‎images/images.qrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@
342342
<file>themes/default/mIconExpand.png</file>
343343
<file>themes/default/mIconExpandSmall.svg</file>
344344
<file>themes/default/mIconExpression.svg</file>
345-
<file>themes/default/mIconExpressionEditorOpen.svg</file>
346345
<file>themes/default/mIconExpressionFilter.svg</file>
347346
<file>themes/default/mIconExpressionPreview.svg</file>
348347
<file>themes/default/mIconExpressionSelect.svg</file>

‎images/themes/default/mIconExpressionEditorOpen.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/ui/editorwidgets/qgsvaluerelationconfigdlgbase.ui

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@
108108
<property name="layoutDirection">
109109
<enum>Qt::RightToLeft</enum>
110110
</property>
111-
<property name="text">
112-
<string>...</string>
111+
<property name="icon">
112+
<iconset resource="../../images/images.qrc">
113+
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
113114
</property>
114115
</widget>
115116
</item>
@@ -132,14 +133,14 @@
132133
</widget>
133134
<customwidgets>
134135
<customwidget>
135-
<class>QgsMapLayerComboBox</class>
136+
<class>QgsFieldComboBox</class>
136137
<extends>QComboBox</extends>
137-
<header>qgsmaplayercombobox.h</header>
138+
<header>qgsfieldcombobox.h</header>
138139
</customwidget>
139140
<customwidget>
140-
<class>QgsFieldComboBox</class>
141+
<class>QgsMapLayerComboBox</class>
141142
<extends>QComboBox</extends>
142-
<header>qgsfieldcombobox.h</header>
143+
<header>qgsmaplayercombobox.h</header>
143144
</customwidget>
144145
</customwidgets>
145146
<tabstops>

‎src/ui/qgsattributeactionpropertiesdialogbase.ui

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
<property name="text">
5757
<string>...</string>
5858
</property>
59+
<property name="icon">
60+
<iconset resource="../../images/images.qrc">
61+
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
62+
</property>
5963
</widget>
6064
</item>
6165
</layout>
@@ -132,7 +136,7 @@
132136
<item row="1" column="0">
133137
<layout class="QHBoxLayout" name="horizontalLayout_2">
134138
<item>
135-
<widget class="QgsFieldExpressionWidget" name="mFieldExpression" native="true"/>
139+
<widget class="QgsFieldExpressionWidget" name="mFieldExpression"/>
136140
</item>
137141
<item>
138142
<widget class="QPushButton" name="mInsertFieldOrExpression">
@@ -154,43 +158,37 @@
154158
</item>
155159
<item row="0" column="0">
156160
<layout class="QGridLayout" name="gridLayout_4">
157-
<item row="1" column="0">
161+
<item row="2" column="0">
158162
<widget class="QgsCodeEditorPython" name="mActionText" native="true">
159163
<property name="sizePolicy">
160164
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
161165
<horstretch>0</horstretch>
162166
<verstretch>0</verstretch>
163167
</sizepolicy>
164168
</property>
165-
<widget class="QToolButton" name="mBrowseButton">
166-
<property name="geometry">
167-
<rect>
168-
<x>630</x>
169-
<y>0</y>
170-
<width>30</width>
171-
<height>32</height>
172-
</rect>
173-
</property>
174-
<property name="toolTip">
175-
<string>Browse for action</string>
176-
</property>
177-
<property name="statusTip">
178-
<string>Click to browse for an action</string>
179-
</property>
180-
<property name="whatsThis">
181-
<string>Clicking the button will let you select an application to use as the action</string>
182-
</property>
183-
<property name="text">
184-
<string>...</string>
185-
</property>
186-
<property name="icon">
187-
<iconset resource="../../images/images.qrc">
188-
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
189-
</property>
190-
</widget>
191169
</widget>
192170
</item>
193-
<item row="0" column="0">
171+
<item row="2" column="1" alignment="Qt::AlignTop">
172+
<widget class="QToolButton" name="mBrowseButton">
173+
<property name="toolTip">
174+
<string>Browse for action</string>
175+
</property>
176+
<property name="statusTip">
177+
<string>Click to browse for an action</string>
178+
</property>
179+
<property name="whatsThis">
180+
<string>Clicking the button will let you select an application to use as the action</string>
181+
</property>
182+
<property name="text">
183+
<string>...</string>
184+
</property>
185+
<property name="icon">
186+
<iconset resource="../../images/images.qrc">
187+
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
188+
</property>
189+
</widget>
190+
</item>
191+
<item row="0" column="0" colspan="2">
194192
<widget class="QLabel" name="label_4">
195193
<property name="text">
196194
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The action text defines what happens if the action is triggered.&lt;br/&gt;The content depends on the type.&lt;br/&gt;For the type &lt;span style=&quot; font-style:italic;&quot;&gt;Python&lt;/span&gt; the content should be python code&lt;br/&gt;For other types it should be a file or application with optional parameters&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -276,6 +274,16 @@
276274
<container>1</container>
277275
</customwidget>
278276
</customwidgets>
277+
<tabstops>
278+
<tabstop>mActionType</tabstop>
279+
<tabstop>mCaptureOutput</tabstop>
280+
<tabstop>mActionName</tabstop>
281+
<tabstop>mShortTitle</tabstop>
282+
<tabstop>mActionIcon</tabstop>
283+
<tabstop>mChooseIconButton</tabstop>
284+
<tabstop>mBrowseButton</tabstop>
285+
<tabstop>mInsertFieldOrExpression</tabstop>
286+
</tabstops>
279287
<resources>
280288
<include location="../../images/images.qrc"/>
281289
</resources>

‎src/ui/qgsdiagrampropertiesbase.ui

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,7 @@
383383
</property>
384384
<property name="icon">
385385
<iconset resource="../../images/images.qrc">
386-
<normaloff>:/images/themes/default/mIconExpressionEditorOpen.svg</normaloff>:/images/themes/default/mIconExpressionEditorOpen.svg</iconset>
387-
</property>
388-
<property name="iconSize">
389-
<size>
390-
<width>24</width>
391-
<height>16</height>
392-
</size>
386+
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
393387
</property>
394388
</widget>
395389
</item>
@@ -544,9 +538,9 @@
544538
<property name="geometry">
545539
<rect>
546540
<x>0</x>
547-
<y>-11</y>
548-
<width>614</width>
549-
<height>420</height>
541+
<y>0</y>
542+
<width>348</width>
543+
<height>518</height>
550544
</rect>
551545
</property>
552546
<layout class="QVBoxLayout" name="verticalLayout">
@@ -856,7 +850,7 @@
856850
<number>9</number>
857851
</property>
858852
<item row="0" column="0">
859-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true"/>
853+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget"/>
860854
</item>
861855
</layout>
862856
</widget>
@@ -943,8 +937,8 @@
943937
<rect>
944938
<x>0</x>
945939
<y>0</y>
946-
<width>630</width>
947-
<height>409</height>
940+
<width>478</width>
941+
<height>303</height>
948942
</rect>
949943
</property>
950944
<layout class="QGridLayout" name="gridLayout_11">
@@ -1078,7 +1072,7 @@
10781072
</widget>
10791073
</item>
10801074
<item row="0" column="1" rowspan="2" colspan="4">
1081-
<widget class="QgsFieldExpressionWidget" name="mSizeFieldExpressionWidget" native="true">
1075+
<widget class="QgsFieldExpressionWidget" name="mSizeFieldExpressionWidget">
10821076
<property name="sizePolicy">
10831077
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
10841078
<horstretch>0</horstretch>
@@ -1259,8 +1253,8 @@
12591253
<rect>
12601254
<x>0</x>
12611255
<y>0</y>
1262-
<width>630</width>
1263-
<height>409</height>
1256+
<width>296</width>
1257+
<height>303</height>
12641258
</rect>
12651259
</property>
12661260
<layout class="QGridLayout" name="gridLayout_12">
@@ -1621,8 +1615,8 @@
16211615
<rect>
16221616
<x>0</x>
16231617
<y>0</y>
1624-
<width>630</width>
1625-
<height>409</height>
1618+
<width>106</width>
1619+
<height>161</height>
16261620
</rect>
16271621
</property>
16281622
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -1840,8 +1834,8 @@
18401834
<rect>
18411835
<x>0</x>
18421836
<y>0</y>
1843-
<width>630</width>
1844-
<height>409</height>
1837+
<width>341</width>
1838+
<height>115</height>
18451839
</rect>
18461840
</property>
18471841
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1919,9 +1913,9 @@
19191913
</widget>
19201914
<customwidgets>
19211915
<customwidget>
1922-
<class>QgsFieldExpressionWidget</class>
1923-
<extends>QWidget</extends>
1924-
<header location="global">qgsfieldexpressionwidget.h</header>
1916+
<class>QgsCollapsibleGroupBox</class>
1917+
<extends>QGroupBox</extends>
1918+
<header>qgscollapsiblegroupbox.h</header>
19251919
<container>1</container>
19261920
</customwidget>
19271921
<customwidget>
@@ -1936,26 +1930,26 @@
19361930
<header>qgsdoublespinbox.h</header>
19371931
</customwidget>
19381932
<customwidget>
1939-
<class>QgsUnitSelectionWidget</class>
1933+
<class>QgsFieldExpressionWidget</class>
19401934
<extends>QWidget</extends>
1941-
<header>qgsunitselectionwidget.h</header>
1935+
<header>qgsfieldexpressionwidget.h</header>
19421936
<container>1</container>
19431937
</customwidget>
1938+
<customwidget>
1939+
<class>QgsScaleRangeWidget</class>
1940+
<extends>QWidget</extends>
1941+
<header>qgsscalerangewidget.h</header>
1942+
</customwidget>
19441943
<customwidget>
19451944
<class>QgsSpinBox</class>
19461945
<extends>QSpinBox</extends>
19471946
<header>qgsspinbox.h</header>
19481947
</customwidget>
19491948
<customwidget>
1950-
<class>QgsCollapsibleGroupBox</class>
1951-
<extends>QGroupBox</extends>
1952-
<header>qgscollapsiblegroupbox.h</header>
1953-
<container>1</container>
1954-
</customwidget>
1955-
<customwidget>
1956-
<class>QgsScaleRangeWidget</class>
1949+
<class>QgsUnitSelectionWidget</class>
19571950
<extends>QWidget</extends>
1958-
<header>qgsscalerangewidget.h</header>
1951+
<header>qgsunitselectionwidget.h</header>
1952+
<container>1</container>
19591953
</customwidget>
19601954
</customwidgets>
19611955
<tabstops>

‎src/ui/qgslabelingrulepropswidget.ui

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@
9191
<verstretch>0</verstretch>
9292
</sizepolicy>
9393
</property>
94-
<property name="text">
95-
<string>...</string>
94+
<property name="icon">
95+
<iconset resource="../../images/images.qrc">
96+
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>/images/themes/default/mIconExpression.svg</iconset>
9697
</property>
9798
</widget>
9899
</item>
@@ -120,7 +121,7 @@
120121
</property>
121122
<layout class="QHBoxLayout" name="horizontalLayout_2">
122123
<item>
123-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
124+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
124125
<property name="toolTip">
125126
<string/>
126127
</property>

0 commit comments

Comments
 (0)
Please sign in to comment.