Skip to content

Commit

Permalink
[ui] expression icon cleanups (#3908)
Browse files Browse the repository at this point in the history 
* Add expression icon to several buttons for consistency
* Replace mIconExpressionEditorOpen icon with mIconExpresssion
  • Loading branch information
@DelazJ @nirvn
DelazJ authored and nirvn committed Dec 27, 2016
1 parent 407991e commit 90f435d
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 81 deletions.
1 change: 0 additions & 1 deletion images/images.qrc
View file
Expand Up @@ -342,7 +342,6 @@
<file>themes/default/mIconExpand.png</file>
<file>themes/default/mIconExpandSmall.svg</file>
<file>themes/default/mIconExpression.svg</file>
<file>themes/default/mIconExpressionEditorOpen.svg</file>
<file>themes/default/mIconExpressionFilter.svg</file>
<file>themes/default/mIconExpressionPreview.svg</file>
<file>themes/default/mIconExpressionSelect.svg</file>
Expand Down
9 changes: 0 additions & 9 deletions images/themes/default/mIconExpressionEditorOpen.svg
View file

This file was deleted.

13 changes: 7 additions & 6 deletions src/ui/editorwidgets/qgsvaluerelationconfigdlgbase.ui
View file
Expand Up @@ -108,8 +108,9 @@
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>...</string>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
</property>
</widget>
</item>
Expand All @@ -132,14 +133,14 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsMapLayerComboBox</class>
<class>QgsFieldComboBox</class>
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
<header>qgsfieldcombobox.h</header>
</customwidget>
<customwidget>
<class>QgsFieldComboBox</class>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header>qgsfieldcombobox.h</header>
<header>qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
66 changes: 37 additions & 29 deletions src/ui/qgsattributeactionpropertiesdialogbase.ui
View file
Expand Up @@ -56,6 +56,10 @@
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -132,7 +136,7 @@
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsFieldExpressionWidget" name="mFieldExpression" native="true"/>
<widget class="QgsFieldExpressionWidget" name="mFieldExpression"/>
</item>
<item>
<widget class="QPushButton" name="mInsertFieldOrExpression">
Expand All @@ -154,43 +158,37 @@
</item>
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<item row="2" column="0">
<widget class="QgsCodeEditorPython" name="mActionText" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<widget class="QToolButton" name="mBrowseButton">
<property name="geometry">
<rect>
<x>630</x>
<y>0</y>
<width>30</width>
<height>32</height>
</rect>
</property>
<property name="toolTip">
<string>Browse for action</string>
</property>
<property name="statusTip">
<string>Click to browse for an action</string>
</property>
<property name="whatsThis">
<string>Clicking the button will let you select an application to use as the action</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
</property>
</widget>
</widget>
</item>
<item row="0" column="0">
<item row="2" column="1" alignment="Qt::AlignTop">
<widget class="QToolButton" name="mBrowseButton">
<property name="toolTip">
<string>Browse for action</string>
</property>
<property name="statusTip">
<string>Click to browse for an action</string>
</property>
<property name="whatsThis">
<string>Clicking the button will let you select an application to use as the action</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<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>
Expand Down Expand Up @@ -276,6 +274,16 @@
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mActionType</tabstop>
<tabstop>mCaptureOutput</tabstop>
<tabstop>mActionName</tabstop>
<tabstop>mShortTitle</tabstop>
<tabstop>mActionIcon</tabstop>
<tabstop>mChooseIconButton</tabstop>
<tabstop>mBrowseButton</tabstop>
<tabstop>mInsertFieldOrExpression</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
</resources>
Expand Down
60 changes: 27 additions & 33 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Expand Up @@ -383,13 +383,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mIconExpressionEditorOpen.svg</normaloff>:/images/themes/default/mIconExpressionEditorOpen.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>16</height>
</size>
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
</property>
</widget>
</item>
Expand Down Expand Up @@ -544,9 +538,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-11</y>
<width>614</width>
<height>420</height>
<y>0</y>
<width>348</width>
<height>518</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
Expand Down Expand Up @@ -856,7 +850,7 @@
<number>9</number>
</property>
<item row="0" column="0">
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true"/>
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget"/>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -943,8 +937,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>630</width>
<height>409</height>
<width>478</width>
<height>303</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_11">
Expand Down Expand Up @@ -1078,7 +1072,7 @@
</widget>
</item>
<item row="0" column="1" rowspan="2" colspan="4">
<widget class="QgsFieldExpressionWidget" name="mSizeFieldExpressionWidget" native="true">
<widget class="QgsFieldExpressionWidget" name="mSizeFieldExpressionWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -1259,8 +1253,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>630</width>
<height>409</height>
<width>296</width>
<height>303</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
Expand Down Expand Up @@ -1621,8 +1615,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>630</width>
<height>409</height>
<width>106</width>
<height>161</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -1840,8 +1834,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>630</width>
<height>409</height>
<width>341</width>
<height>115</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -1919,9 +1913,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsFieldExpressionWidget</class>
<extends>QWidget</extends>
<header location="global">qgsfieldexpressionwidget.h</header>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
Expand All @@ -1936,26 +1930,26 @@
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<class>QgsFieldExpressionWidget</class>
<extends>QWidget</extends>
<header>qgsunitselectionwidget.h</header>
<header>qgsfieldexpressionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleRangeWidget</class>
<extends>QWidget</extends>
<header>qgsscalerangewidget.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleRangeWidget</class>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
<header>qgsscalerangewidget.h</header>
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
7 changes: 4 additions & 3 deletions src/ui/qgslabelingrulepropswidget.ui
View file
Expand Up @@ -91,8 +91,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>...</string>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>/images/themes/default/mIconExpression.svg</iconset>
</property>
</widget>
</item>
Expand Down Expand Up @@ -120,7 +121,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
<property name="toolTip">
<string/>
</property>
Expand Down

0 comments on commit 90f435d

Please sign in to comment.