Skip to content

Commit

Permalink
Followup e583d88, fix image paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 30, 2015
1 parent 1e6f673 commit 2d5c1dd
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 112 deletions.
32 changes: 25 additions & 7 deletions src/ui/composer/qgsatlascompositionwidgetbase.ui
View file
Expand Up @@ -23,7 +23,16 @@
<property name="spacing">
<number>0</number>
</property>
<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>
Expand All @@ -32,15 +41,24 @@
<enum>QFrame::StyledPanel</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<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>
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>3</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QCheckBox" name="mUseAtlasCheckBox">
<property name="text">
Expand Down Expand Up @@ -151,7 +169,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
</property>
</widget>
Expand Down Expand Up @@ -280,7 +298,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
</property>
</widget>
Expand Down Expand Up @@ -362,7 +380,7 @@
<tabstop>mAtlasSingleFileCheckBox</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
</resources>
<connections/>
</ui>
18 changes: 9 additions & 9 deletions src/ui/composer/qgsattributeselectiondialogbase.ui
View file
Expand Up @@ -32,7 +32,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyUp.svg</normaloff>:/images/themes/default/symbologyUp.svg</iconset>
</property>
</widget>
Expand All @@ -43,7 +43,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyDown.svg</normaloff>:/images/themes/default/symbologyDown.svg</iconset>
</property>
</widget>
Expand All @@ -54,7 +54,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
Expand All @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
Expand Down Expand Up @@ -167,7 +167,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
Expand All @@ -182,7 +182,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyUp.png</normaloff>:/images/themes/default/symbologyUp.png</iconset>
</property>
</widget>
Expand All @@ -193,7 +193,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyDown.png</normaloff>:/images/themes/default/symbologyDown.png</iconset>
</property>
</widget>
Expand All @@ -204,7 +204,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
Expand Down Expand Up @@ -270,7 +270,7 @@
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
</resources>
<connections>
<connection>
Expand Down
18 changes: 9 additions & 9 deletions src/ui/composer/qgscomposerattributetablewidgetbase.ui
View file
Expand Up @@ -225,7 +225,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
</property>
</widget>
Expand Down Expand Up @@ -756,12 +756,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
Expand All @@ -771,7 +765,13 @@
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
<header location="global">qgsmaplayercombobox.h</header>
</customwidget>
<customwidget>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
Expand Down Expand Up @@ -826,7 +826,7 @@
<tabstop>mHideEmptyBgCheckBox</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
</resources>
<connections/>
</ui>

0 comments on commit 2d5c1dd

Please sign in to comment.