Skip to content

Commit 06c438d

Browse files
committed
Fix the resource location in the *.ui files
1 parent 5c08a48 commit 06c438d

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

gcodefileserver/gcodefileserver.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowIcon">
14-
<iconset resource="application.qrc">
14+
<iconset resource="../gcodeshared/application.qrc">
1515
<normaloff>:/images/serial.png</normaloff>:/images/serial.png</iconset>
1616
</property>
1717
<widget class="QWidget" name="centralwidget">
@@ -99,7 +99,7 @@
9999
</widget>
100100
</widget>
101101
<resources>
102-
<include location="../src-common/application.qrc"/>
102+
<include location="../gcodeshared/application.qrc"/>
103103
</resources>
104104
<connections/>
105105
</ui>

gcodeworkshop/src/findinfilesdialog.ui

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
<string>&amp;Browse</string>
184184
</property>
185185
<property name="icon">
186-
<iconset resource="application.qrc">
186+
<iconset resource="../../gcodeshared/application.qrc">
187187
<normaloff>:/images/browse.png</normaloff>:/images/browse.png</iconset>
188188
</property>
189189
<property name="autoDefault">
@@ -282,7 +282,7 @@
282282
<string>&amp;Find files</string>
283283
</property>
284284
<property name="icon">
285-
<iconset resource="application.qrc">
285+
<iconset resource="../../gcodeshared/application.qrc">
286286
<normaloff>:/images/findnext.png</normaloff>:/images/findnext.png</iconset>
287287
</property>
288288
<property name="autoDefault">
@@ -407,7 +407,7 @@
407407
<string>Find files</string>
408408
</property>
409409
<property name="icon">
410-
<iconset resource="application.qrc">
410+
<iconset resource="../../gcodeshared/application.qrc">
411411
<normaloff>:/images/filefind.png</normaloff>
412412
<disabledoff>:/images/filefind.png</disabledoff>:/images/filefind.png</iconset>
413413
</property>
@@ -425,7 +425,7 @@
425425
<string>...</string>
426426
</property>
427427
<property name="icon">
428-
<iconset resource="application.qrc">
428+
<iconset resource="../../gcodeshared/application.qrc">
429429
<normaloff>:/images/arrow-down.png</normaloff>
430430
<normalon>:/images/arrow-up.png</normalon>:/images/arrow-down.png</iconset>
431431
</property>
@@ -442,7 +442,7 @@
442442
</layout>
443443
</widget>
444444
<resources>
445-
<include location="../src-common/application.qrc"/>
445+
<include location="../../gcodeshared/application.qrc"/>
446446
</resources>
447447
<connections/>
448448
</ui>

gcodeworkshop/src/gcodeworkshop.ui

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</property>
7979
<widget class="QWidget" name="projectTab">
8080
<attribute name="icon">
81-
<iconset resource="application.qrc">
81+
<iconset resource="../../gcodeshared/application.qrc">
8282
<normaloff>:/images/project_new.png</normaloff>:/images/project_new.png</iconset>
8383
</attribute>
8484
<attribute name="title">
@@ -127,7 +127,7 @@
127127
<string/>
128128
</property>
129129
<property name="icon">
130-
<iconset resource="application.qrc">
130+
<iconset resource="../../gcodeshared/application.qrc">
131131
<normaloff>:/images/project_new.png</normaloff>:/images/project_new.png</iconset>
132132
</property>
133133
</widget>
@@ -144,7 +144,7 @@
144144
<string/>
145145
</property>
146146
<property name="icon">
147-
<iconset resource="application.qrc">
147+
<iconset resource="../../gcodeshared/application.qrc">
148148
<normaloff>:/images/project_open.png</normaloff>:/images/project_open.png</iconset>
149149
</property>
150150
</widget>
@@ -161,7 +161,7 @@
161161
<string/>
162162
</property>
163163
<property name="icon">
164-
<iconset resource="application.qrc">
164+
<iconset resource="../../gcodeshared/application.qrc">
165165
<normaloff>:/images/project_save.png</normaloff>:/images/project_save.png</iconset>
166166
</property>
167167
</widget>
@@ -178,7 +178,7 @@
178178
<string/>
179179
</property>
180180
<property name="icon">
181-
<iconset resource="application.qrc">
181+
<iconset resource="../../gcodeshared/application.qrc">
182182
<normaloff>:/images/project_save_as.png</normaloff>:/images/project_save_as.png</iconset>
183183
</property>
184184
</widget>
@@ -211,7 +211,7 @@
211211
<string/>
212212
</property>
213213
<property name="icon">
214-
<iconset resource="application.qrc">
214+
<iconset resource="../../gcodeshared/application.qrc">
215215
<normaloff>:/images/project_add.png</normaloff>:/images/project_add.png</iconset>
216216
</property>
217217
</widget>
@@ -228,7 +228,7 @@
228228
<string/>
229229
</property>
230230
<property name="icon">
231-
<iconset resource="application.qrc">
231+
<iconset resource="../../gcodeshared/application.qrc">
232232
<normaloff>:/images/project_remove.png</normaloff>:/images/project_remove.png</iconset>
233233
</property>
234234
</widget>
@@ -281,7 +281,7 @@
281281
</widget>
282282
<widget class="QWidget" name="fileTab">
283283
<attribute name="icon">
284-
<iconset resource="application.qrc">
284+
<iconset resource="../../gcodeshared/application.qrc">
285285
<normaloff>:/images/folder.png</normaloff>:/images/folder.png</iconset>
286286
</attribute>
287287
<attribute name="title">
@@ -372,7 +372,7 @@
372372
</widget>
373373
<widget class="QWidget" name="clipboardTab">
374374
<attribute name="icon">
375-
<iconset resource="application.qrc">
375+
<iconset resource="../../gcodeshared/application.qrc">
376376
<normaloff>:/images/clipboard.png</normaloff>:/images/clipboard.png</iconset>
377377
</attribute>
378378
<attribute name="title">
@@ -424,7 +424,7 @@
424424
<string>...</string>
425425
</property>
426426
<property name="icon">
427-
<iconset resource="application.qrc">
427+
<iconset resource="../../gcodeshared/application.qrc">
428428
<normaloff>:/images/list-remove.png</normaloff>:/images/list-remove.png</iconset>
429429
</property>
430430
</widget>
@@ -581,7 +581,7 @@ Items with non empty titles are not deleted automatically.</string>
581581
</widget>
582582
</widget>
583583
<resources>
584-
<include location="../src-common/application.qrc"/>
584+
<include location="../../gcodeshared/application.qrc"/>
585585
</resources>
586586
<connections/>
587587
</ui>

gcodeworkshop/src/newfiledialog.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<string>Browse...</string>
4141
</property>
4242
<property name="icon">
43-
<iconset resource="application.qrc">
43+
<iconset resource="../../gcodeshared/application.qrc">
4444
<normaloff>:/images/browse.png</normaloff>:/images/browse.png</iconset>
4545
</property>
4646
</widget>
@@ -142,7 +142,7 @@
142142
</layout>
143143
</widget>
144144
<resources>
145-
<include location="../src-common/application.qrc"/>
145+
<include location="../../gcodeshared/application.qrc"/>
146146
</resources>
147147
<connections>
148148
<connection>

gcodeworkshop/src/setupdialog.ui

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@
565565
<string>Delete</string>
566566
</property>
567567
<property name="icon">
568-
<iconset resource="application.qrc">
568+
<iconset resource="../../gcodeshared/application.qrc">
569569
<normaloff>:/images/list-remove.png</normaloff>:/images/list-remove.png</iconset>
570570
</property>
571571
</widget>
@@ -626,7 +626,7 @@
626626
<string>Add</string>
627627
</property>
628628
<property name="icon">
629-
<iconset resource="application.qrc">
629+
<iconset resource="../../gcodeshared/application.qrc">
630630
<normaloff>:/images/add.png</normaloff>:/images/add.png</iconset>
631631
</property>
632632
</widget>
@@ -781,7 +781,7 @@
781781
<string>Browse...</string>
782782
</property>
783783
<property name="icon">
784-
<iconset resource="application.qrc">
784+
<iconset resource="../../gcodeshared/application.qrc">
785785
<normaloff>:/images/browse.png</normaloff>:/images/browse.png</iconset>
786786
</property>
787787
</widget>
@@ -821,7 +821,7 @@
821821
<string>&amp;Browse</string>
822822
</property>
823823
<property name="icon">
824-
<iconset resource="application.qrc">
824+
<iconset resource="../../gcodeshared/application.qrc">
825825
<normaloff>:/images/browse.png</normaloff>:/images/browse.png</iconset>
826826
</property>
827827
</widget>
@@ -973,7 +973,7 @@
973973
<string>&amp;Ok</string>
974974
</property>
975975
<property name="icon">
976-
<iconset resource="application.qrc">
976+
<iconset resource="../../gcodeshared/application.qrc">
977977
<normaloff>:/images/ok.png</normaloff>:/images/ok.png</iconset>
978978
</property>
979979
<property name="default">
@@ -1000,7 +1000,7 @@
10001000
<string>&amp;Default</string>
10011001
</property>
10021002
<property name="icon">
1003-
<iconset resource="application.qrc">
1003+
<iconset resource="../../gcodeshared/application.qrc">
10041004
<normaloff>:/images/default.png</normaloff>:/images/default.png</iconset>
10051005
</property>
10061006
<property name="autoDefault">
@@ -1027,7 +1027,7 @@
10271027
<string>&amp;Cancel</string>
10281028
</property>
10291029
<property name="icon">
1030-
<iconset resource="application.qrc">
1030+
<iconset resource="../../gcodeshared/application.qrc">
10311031
<normaloff>:/images/window-close.png</normaloff>:/images/window-close.png</iconset>
10321032
</property>
10331033
<property name="autoDefault">
@@ -1103,7 +1103,7 @@
11031103
<tabstop>cancelButton</tabstop>
11041104
</tabstops>
11051105
<resources>
1106-
<include location="../src-common/application.qrc"/>
1106+
<include location="../../gcodeshared/application.qrc"/>
11071107
</resources>
11081108
<connections/>
11091109
</ui>

0 commit comments

Comments
 (0)