Skip to content

Commit 2d5c1dd

Browse files
committed
Followup e583d88, fix image paths
1 parent 1e6f673 commit 2d5c1dd

7 files changed

+148
-112
lines changed

src/ui/composer/qgsatlascompositionwidgetbase.ui

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -32,15 +41,24 @@
3241
<enum>QFrame::StyledPanel</enum>
3342
</property>
3443
<layout class="QGridLayout" name="gridLayout">
44+
<property name="leftMargin">
45+
<number>0</number>
46+
</property>
47+
<property name="topMargin">
48+
<number>0</number>
49+
</property>
50+
<property name="rightMargin">
51+
<number>0</number>
52+
</property>
53+
<property name="bottomMargin">
54+
<number>0</number>
55+
</property>
3556
<property name="horizontalSpacing">
3657
<number>0</number>
3758
</property>
3859
<property name="verticalSpacing">
3960
<number>3</number>
4061
</property>
41-
<property name="margin">
42-
<number>0</number>
43-
</property>
4462
<item row="0" column="1">
4563
<widget class="QCheckBox" name="mUseAtlasCheckBox">
4664
<property name="text">
@@ -151,7 +169,7 @@
151169
<string>...</string>
152170
</property>
153171
<property name="icon">
154-
<iconset resource="../../images/images.qrc">
172+
<iconset resource="../../../images/images.qrc">
155173
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
156174
</property>
157175
</widget>
@@ -280,7 +298,7 @@
280298
<string>...</string>
281299
</property>
282300
<property name="icon">
283-
<iconset resource="../../images/images.qrc">
301+
<iconset resource="../../../images/images.qrc">
284302
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
285303
</property>
286304
</widget>
@@ -362,7 +380,7 @@
362380
<tabstop>mAtlasSingleFileCheckBox</tabstop>
363381
</tabstops>
364382
<resources>
365-
<include location="../../images/images.qrc"/>
383+
<include location="../../../images/images.qrc"/>
366384
</resources>
367385
<connections/>
368386
</ui>

src/ui/composer/qgsattributeselectiondialogbase.ui

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<string/>
3333
</property>
3434
<property name="icon">
35-
<iconset resource="../../images/images.qrc">
35+
<iconset resource="../../../images/images.qrc">
3636
<normaloff>:/images/themes/default/symbologyUp.svg</normaloff>:/images/themes/default/symbologyUp.svg</iconset>
3737
</property>
3838
</widget>
@@ -43,7 +43,7 @@
4343
<string/>
4444
</property>
4545
<property name="icon">
46-
<iconset resource="../../images/images.qrc">
46+
<iconset resource="../../../images/images.qrc">
4747
<normaloff>:/images/themes/default/symbologyDown.svg</normaloff>:/images/themes/default/symbologyDown.svg</iconset>
4848
</property>
4949
</widget>
@@ -54,7 +54,7 @@
5454
<string/>
5555
</property>
5656
<property name="icon">
57-
<iconset resource="../../images/images.qrc">
57+
<iconset resource="../../../images/images.qrc">
5858
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
5959
</property>
6060
</widget>
@@ -65,7 +65,7 @@
6565
<string/>
6666
</property>
6767
<property name="icon">
68-
<iconset resource="../../images/images.qrc">
68+
<iconset resource="../../../images/images.qrc">
6969
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
7070
</property>
7171
</widget>
@@ -167,7 +167,7 @@
167167
<string/>
168168
</property>
169169
<property name="icon">
170-
<iconset resource="../../images/images.qrc">
170+
<iconset resource="../../../images/images.qrc">
171171
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
172172
</property>
173173
</widget>
@@ -182,7 +182,7 @@
182182
<string/>
183183
</property>
184184
<property name="icon">
185-
<iconset resource="../../images/images.qrc">
185+
<iconset resource="../../../images/images.qrc">
186186
<normaloff>:/images/themes/default/symbologyUp.png</normaloff>:/images/themes/default/symbologyUp.png</iconset>
187187
</property>
188188
</widget>
@@ -193,7 +193,7 @@
193193
<string/>
194194
</property>
195195
<property name="icon">
196-
<iconset resource="../../images/images.qrc">
196+
<iconset resource="../../../images/images.qrc">
197197
<normaloff>:/images/themes/default/symbologyDown.png</normaloff>:/images/themes/default/symbologyDown.png</iconset>
198198
</property>
199199
</widget>
@@ -204,7 +204,7 @@
204204
<string/>
205205
</property>
206206
<property name="icon">
207-
<iconset resource="../../images/images.qrc">
207+
<iconset resource="../../../images/images.qrc">
208208
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
209209
</property>
210210
</widget>
@@ -270,7 +270,7 @@
270270
<tabstop>buttonBox</tabstop>
271271
</tabstops>
272272
<resources>
273-
<include location="../../images/images.qrc"/>
273+
<include location="../../../images/images.qrc"/>
274274
</resources>
275275
<connections>
276276
<connection>

src/ui/composer/qgscomposerattributetablewidgetbase.ui

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<string>...</string>
226226
</property>
227227
<property name="icon">
228-
<iconset resource="../../images/images.qrc">
228+
<iconset resource="../../../images/images.qrc">
229229
<normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
230230
</property>
231231
</widget>
@@ -756,12 +756,6 @@
756756
</layout>
757757
</widget>
758758
<customwidgets>
759-
<customwidget>
760-
<class>QgsColorButtonV2</class>
761-
<extends>QToolButton</extends>
762-
<header>qgscolorbuttonv2.h</header>
763-
<container>1</container>
764-
</customwidget>
765759
<customwidget>
766760
<class>QgsCollapsibleGroupBoxBasic</class>
767761
<extends>QGroupBox</extends>
@@ -771,7 +765,13 @@
771765
<customwidget>
772766
<class>QgsMapLayerComboBox</class>
773767
<extends>QComboBox</extends>
774-
<header>qgsmaplayercombobox.h</header>
768+
<header location="global">qgsmaplayercombobox.h</header>
769+
</customwidget>
770+
<customwidget>
771+
<class>QgsColorButtonV2</class>
772+
<extends>QToolButton</extends>
773+
<header>qgscolorbuttonv2.h</header>
774+
<container>1</container>
775775
</customwidget>
776776
<customwidget>
777777
<class>QgsDoubleSpinBox</class>
@@ -826,7 +826,7 @@
826826
<tabstop>mHideEmptyBgCheckBox</tabstop>
827827
</tabstops>
828828
<resources>
829-
<include location="../../images/images.qrc"/>
829+
<include location="../../../images/images.qrc"/>
830830
</resources>
831831
<connections/>
832832
</ui>

0 commit comments

Comments
 (0)