Skip to content

Commit 9359753

Browse files
dakcartodakcarto
committed
Fix some more icon path warnings
1 parent 8c81032 commit 9359753

1 file changed

Lines changed: 29 additions & 29 deletions

File tree

‎src/ui/qgscomposerbase.ui‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@
125125
<bool>false</bool>
126126
</property>
127127
<property name="icon">
128-
<iconset>
129-
<normaloff>../themes/default/mActionFilePrint.png</normaloff>../themes/default/mActionFilePrint.png</iconset>
128+
<iconset resource="../../images/images.qrc">
129+
<normaloff>:/images/themes/default/mActionFilePrint.png</normaloff>:/images/themes/default/mActionFilePrint.png</iconset>
130130
</property>
131131
<property name="text">
132132
<string>&amp;Print...</string>
@@ -137,8 +137,8 @@
137137
</action>
138138
<action name="mActionZoomAll">
139139
<property name="icon">
140-
<iconset>
141-
<normaloff>../themes/default/mActionZoomFullExtent.svg</normaloff>../themes/default/mActionZoomFullExtent.svg</iconset>
140+
<iconset resource="../../images/images.qrc">
141+
<normaloff>:/images/themes/default/mActionZoomFullExtent.svg</normaloff>:/images/themes/default/mActionZoomFullExtent.svg</iconset>
142142
</property>
143143
<property name="text">
144144
<string>Zoom Full</string>
@@ -149,8 +149,8 @@
149149
</action>
150150
<action name="mActionZoomIn">
151151
<property name="icon">
152-
<iconset>
153-
<normaloff>../themes/default/mActionZoomIn.svg</normaloff>../themes/default/mActionZoomIn.svg</iconset>
152+
<iconset resource="../../images/images.qrc">
153+
<normaloff>:/images/themes/default/mActionZoomIn.svg</normaloff>:/images/themes/default/mActionZoomIn.svg</iconset>
154154
</property>
155155
<property name="text">
156156
<string>Zoom In</string>
@@ -161,8 +161,8 @@
161161
</action>
162162
<action name="mActionZoomOut">
163163
<property name="icon">
164-
<iconset>
165-
<normaloff>../themes/default/mActionZoomOut.svg</normaloff>../themes/default/mActionZoomOut.svg</iconset>
164+
<iconset resource="../../images/images.qrc">
165+
<normaloff>:/images/themes/default/mActionZoomOut.svg</normaloff>:/images/themes/default/mActionZoomOut.svg</iconset>
166166
</property>
167167
<property name="text">
168168
<string>Zoom Out</string>
@@ -173,8 +173,8 @@
173173
</action>
174174
<action name="mActionAddNewMap">
175175
<property name="icon">
176-
<iconset>
177-
<normaloff>../themes/default/mActionAddMap.png</normaloff>../themes/default/mActionAddMap.png</iconset>
176+
<iconset resource="../../images/images.qrc">
177+
<normaloff>:/images/themes/default/mActionAddMap.png</normaloff>:/images/themes/default/mActionAddMap.png</iconset>
178178
</property>
179179
<property name="text">
180180
<string>Add Map</string>
@@ -185,8 +185,8 @@
185185
</action>
186186
<action name="mActionAddNewLabel">
187187
<property name="icon">
188-
<iconset>
189-
<normaloff>../themes/default/mActionLabel.png</normaloff>../themes/default/mActionLabel.png</iconset>
188+
<iconset resource="../../images/images.qrc">
189+
<normaloff>:/images/themes/default/mActionLabel.png</normaloff>:/images/themes/default/mActionLabel.png</iconset>
190190
</property>
191191
<property name="text">
192192
<string>Add Label</string>
@@ -197,8 +197,8 @@
197197
</action>
198198
<action name="mActionAddNewLegend">
199199
<property name="icon">
200-
<iconset>
201-
<normaloff>../themes/default/mActionAddLegend.png</normaloff>../themes/default/mActionAddLegend.png</iconset>
200+
<iconset resource="../../images/images.qrc">
201+
<normaloff>:/images/themes/default/mActionAddLegend.png</normaloff>:/images/themes/default/mActionAddLegend.png</iconset>
202202
</property>
203203
<property name="text">
204204
<string>Add Legend</string>
@@ -209,8 +209,8 @@
209209
</action>
210210
<action name="mActionSelectMoveItem">
211211
<property name="icon">
212-
<iconset>
213-
<normaloff>../themes/default/mActionPan.png</normaloff>../themes/default/mActionPan.png</iconset>
212+
<iconset resource="../../images/images.qrc">
213+
<normaloff>:/images/themes/default/mActionPan.png</normaloff>:/images/themes/default/mActionPan.png</iconset>
214214
</property>
215215
<property name="text">
216216
<string>Move Item</string>
@@ -221,8 +221,8 @@
221221
</action>
222222
<action name="mActionExportAsImage">
223223
<property name="icon">
224-
<iconset>
225-
<normaloff>../themes/default/mActionSaveMapAsImage.png</normaloff>../themes/default/mActionSaveMapAsImage.png</iconset>
224+
<iconset resource="../../images/images.qrc">
225+
<normaloff>:/images/themes/default/mActionSaveMapAsImage.png</normaloff>:/images/themes/default/mActionSaveMapAsImage.png</iconset>
226226
</property>
227227
<property name="text">
228228
<string>Export as Image...</string>
@@ -233,26 +233,26 @@
233233
</action>
234234
<action name="mActionExportAsPDF">
235235
<property name="icon">
236-
<iconset>
237-
<normaloff>../themes/default/mActionSaveAsPDF.png</normaloff>../themes/default/mActionSaveAsPDF.png</iconset>
236+
<iconset resource="../../images/images.qrc">
237+
<normaloff>:/images/themes/default/mActionSaveAsPDF.png</normaloff>:/images/themes/default/mActionSaveAsPDF.png</iconset>
238238
</property>
239239
<property name="text">
240240
<string>Export as PDF...</string>
241241
</property>
242242
</action>
243243
<action name="mActionExportAsSVG">
244244
<property name="icon">
245-
<iconset>
246-
<normaloff>../themes/default/mActionSaveAsSVG.png</normaloff>../themes/default/mActionSaveAsSVG.png</iconset>
245+
<iconset resource="../../images/images.qrc">
246+
<normaloff>:/images/themes/default/mActionSaveAsSVG.png</normaloff>:/images/themes/default/mActionSaveAsSVG.png</iconset>
247247
</property>
248248
<property name="text">
249249
<string>Export as SVG...</string>
250250
</property>
251251
</action>
252252
<action name="mActionAddNewScalebar">
253253
<property name="icon">
254-
<iconset>
255-
<normaloff>../../plugins/scale_bar/icon.xpm</normaloff>../../plugins/scale_bar/icon.xpm</iconset>
254+
<iconset resource="../../images/images.qrc">
255+
<normaloff>:/images/themes/default/mActionScaleBar.png</normaloff>:/images/themes/default/mActionScaleBar.png</iconset>
256256
</property>
257257
<property name="text">
258258
<string>Add Scalebar</string>
@@ -263,8 +263,8 @@
263263
</action>
264264
<action name="mActionRefreshView">
265265
<property name="icon">
266-
<iconset>
267-
<normaloff>../themes/default/mActionDraw.svg</normaloff>../themes/default/mActionDraw.svg</iconset>
266+
<iconset resource="../../images/images.qrc">
267+
<normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
268268
</property>
269269
<property name="text">
270270
<string>Refresh</string>
@@ -275,8 +275,8 @@
275275
</action>
276276
<action name="mActionAddImage">
277277
<property name="icon">
278-
<iconset>
279-
<normaloff>../themes/default/mActionAddImage.png</normaloff>../themes/default/mActionAddImage.png</iconset>
278+
<iconset resource="../../images/images.qrc">
279+
<normaloff>:/images/themes/default/mActionAddImage.png</normaloff>:/images/themes/default/mActionAddImage.png</iconset>
280280
</property>
281281
<property name="text">
282282
<string>Add Image</string>
@@ -451,7 +451,7 @@
451451
</action>
452452
<action name="mActionUndo">
453453
<property name="icon">
454-
<iconset>
454+
<iconset resource="../../images/images.qrc">
455455
<normalon>:/images/themes/default/mActionUndo.png</normalon>
456456
</iconset>
457457
</property>

0 commit comments

Comments
 (0)