Merge lp:~aacid/unity8/cleanup_assets into lp:unity8
- cleanup_assets
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Michael Zanetti |
Approved revision: | 2033 |
Merged at revision: | 2086 |
Proposed branch: | lp:~aacid/unity8/cleanup_assets |
Merge into: | lp:unity8 |
Prerequisite: | lp:~mzanetti/unity8/move-screenshots-to-tests |
Diff against target: |
343 lines (+38/-39) 14 files modified
tests/autopilot/unity8/shell/tests/test_notifications.py (+1/-1) tests/mocks/Unity/Application/ApplicationInfo.cpp (+1/-2) tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+1/-1) tests/mocks/Unity/fake_resultsmodel.cpp (+1/-1) tests/mocks/Unity/fake_scopesoverview.cpp (+1/-1) tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml (+2/-2) tests/qmltests/Dash/Previews/tst_PreviewComment.qml (+2/-2) tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml (+2/-2) tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml (+3/-3) tests/qmltests/Notifications/tst_Notifications.qml (+11/-11) tests/qmltests/Notifications/tst_OptionToggle.qml (+2/-2) tests/qmltests/Notifications/tst_SwipeToAct.qml (+5/-5) tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml (+4/-4) tests/qmltests/tst_Shell.qml (+2/-2) |
To merge this branch: | bzr merge lp:~aacid/unity8/cleanup_assets |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Michael Zanetti (community) | Approve | ||
Review via email: mp+278340@code.launchpad.net |
Commit message
Move images only used in tests to tests folder
Description of the change
* Are there any related MPs required for this MP to build/function as expected?
Prerequisite
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
N/A
Albert Astals Cid (aacid) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2030
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michael Zanetti (mzanetti) wrote : | # |
* Did you perform an exploratory manual test run of the code change and any related functionality?
No production code touched, just tests
* Did CI run pass? If not, please explain why.
yes
* Did you make sure that the branch does not contain spurious tags?
yes
Daniel d'Andrada (dandrader) wrote : | # |
Why do I see a bunch of .po changed in the diff?
Albert Astals Cid (aacid) wrote : | # |
> Why do I see a bunch of .po changed in the diff?
Like i said in the first comment my guess:
* It's coming from the parent https:/
* Launchpad is being weird
- 2031. By Albert Astals Cid
-
Merge
- 2032. By Albert Astals Cid
-
Fix wrong merge
- 2033. By Albert Astals Cid
-
Bring po from trunk to make the diff nicer
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2033
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === removed file 'qml/graphics/12_10_background_wide@12.png' |
2 | Binary files qml/graphics/12_10_background_wide@12.png 2013-06-20 13:42:39 +0000 and qml/graphics/12_10_background_wide@12.png 1970-01-01 00:00:00 +0000 differ |
3 | === modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py' |
4 | --- tests/autopilot/unity8/shell/tests/test_notifications.py 2015-05-15 07:15:36 +0000 |
5 | +++ tests/autopilot/unity8/shell/tests/test_notifications.py 2015-11-30 08:33:35 +0000 |
6 | @@ -61,7 +61,7 @@ |
7 | return '/usr/share/unity8/graphics/' + icon_name |
8 | else: |
9 | return os.path.dirname(__file__) + ( |
10 | - "/../../../../../qml/graphics/" + icon_name) |
11 | + "/../../../../../tests/graphics/" + icon_name) |
12 | |
13 | def _get_notifications_list(self): |
14 | return self.main_window.select_single( |
15 | |
16 | === added directory 'tests/graphics' |
17 | === renamed directory 'qml/graphics/applicationIcons' => 'tests/graphics/applicationIcons' |
18 | === renamed directory 'qml/graphics/avatars' => 'tests/graphics/avatars' |
19 | === renamed file 'qml/graphics/clock@18.png' => 'tests/graphics/clock@18.png' |
20 | === modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp' |
21 | --- tests/mocks/Unity/Application/ApplicationInfo.cpp 2015-11-06 09:11:53 +0000 |
22 | +++ tests/mocks/Unity/Application/ApplicationInfo.cpp 2015-11-30 08:33:35 +0000 |
23 | @@ -114,8 +114,7 @@ |
24 | |
25 | void ApplicationInfo::setIconId(const QString &iconId) |
26 | { |
27 | - setIcon(QString("file://%1/graphics/applicationIcons/%2@18.png") |
28 | - .arg(qmlDirectory()) |
29 | + setIcon(QString("../../tests/graphics/applicationIcons/%2@18.png") |
30 | .arg(iconId)); |
31 | } |
32 | |
33 | |
34 | === modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp' |
35 | --- tests/mocks/Unity/Launcher/MockLauncherItem.cpp 2015-09-22 10:44:21 +0000 |
36 | +++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp 2015-11-30 08:33:35 +0000 |
37 | @@ -29,7 +29,7 @@ |
38 | m_appId(appId), |
39 | m_desktopFile(desktopFile), |
40 | m_name(name), |
41 | - m_icon(qmlDirectory() + "/graphics/applicationIcons/" + icon + ".png"), |
42 | + m_icon("../../tests/graphics/applicationIcons/" + icon + ".png"), |
43 | m_pinned(false), |
44 | m_running(false), |
45 | m_recent(false), |
46 | |
47 | === modified file 'tests/mocks/Unity/fake_resultsmodel.cpp' |
48 | --- tests/mocks/Unity/fake_resultsmodel.cpp 2015-09-30 13:09:38 +0000 |
49 | +++ tests/mocks/Unity/fake_resultsmodel.cpp 2015-11-30 08:33:35 +0000 |
50 | @@ -78,7 +78,7 @@ |
51 | case RoleTitle: |
52 | return QString("Title.%1.%2").arg(m_categoryId).arg(index.row()); |
53 | case RoleArt: |
54 | - return QString(qmlDirectory() + "/graphics/applicationIcons/dash.png"); |
55 | + return QString("../../../tests/graphics/applicationIcons/dash.png"); |
56 | case RoleSubtitle: |
57 | return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row()); |
58 | case RoleMascot: |
59 | |
60 | === modified file 'tests/mocks/Unity/fake_scopesoverview.cpp' |
61 | --- tests/mocks/Unity/fake_scopesoverview.cpp 2015-10-26 13:51:58 +0000 |
62 | +++ tests/mocks/Unity/fake_scopesoverview.cpp 2015-11-30 08:33:35 +0000 |
63 | @@ -298,7 +298,7 @@ |
64 | case RoleSubtitle: |
65 | return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString(); |
66 | case RoleArt: |
67 | - return QString(qmlDirectory() + "/graphics/applicationIcons/dash.png"); |
68 | + return QString("../../tests/graphics/applicationIcons/dash.png"); |
69 | case RoleMascot: |
70 | case RoleEmblem: |
71 | case RoleSummary: |
72 | |
73 | === modified file 'tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml' |
74 | --- tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml 2015-11-09 09:18:41 +0000 |
75 | +++ tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml 2015-11-30 08:33:35 +0000 |
76 | @@ -29,8 +29,8 @@ |
77 | |
78 | ListModel { |
79 | id: fakeModel |
80 | - ListElement { icon: "../graphics/applicationIcons/facebook.png"; name: "Facebook" } |
81 | - ListElement { icon: "../graphics/applicationIcons/gmail.png"; name: "Mail" } |
82 | + ListElement { icon: "../../tests/graphics/applicationIcons/facebook.png"; name: "Facebook" } |
83 | + ListElement { icon: "../../tests/graphics/applicationIcons/gmail.png"; name: "Mail" } |
84 | } |
85 | |
86 | function openWarning() { |
87 | |
88 | === modified file 'tests/qmltests/Dash/Previews/tst_PreviewComment.qml' |
89 | --- tests/qmltests/Dash/Previews/tst_PreviewComment.qml 2015-07-21 14:40:36 +0000 |
90 | +++ tests/qmltests/Dash/Previews/tst_PreviewComment.qml 2015-11-30 08:33:35 +0000 |
91 | @@ -30,7 +30,7 @@ |
92 | "author": "Claire Thompson", |
93 | "subtitle": "28/04/2015 3:48pm", |
94 | "comment": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", |
95 | - "source": "../../graphics/avatars/amanda@12.png" |
96 | + "source": "../../../tests/graphics/avatars/amanda.png" |
97 | } |
98 | |
99 | property var commentNoImage: { |
100 | @@ -43,7 +43,7 @@ |
101 | property var commentNoSubtitle: { |
102 | "author": "Claire Thompson", |
103 | "comment": "Been quite a while since I really liked one.", |
104 | - "source": "../../graphics/avatars/amanda@12.png" |
105 | + "source": "../../../tests/graphics/avatars/amanda.png" |
106 | } |
107 | |
108 | PreviewComment { |
109 | |
110 | === modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml' |
111 | --- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-11-19 16:55:31 +0000 |
112 | +++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-11-30 08:33:35 +0000 |
113 | @@ -45,7 +45,7 @@ |
114 | property var commentData: { |
115 | "author": "Claire Thompson", |
116 | "comment": "C.", |
117 | - "source": "../../graphics/avatars/amanda@12.png" |
118 | + "source": "../../../tests/graphics/avatars/amanda.png" |
119 | } |
120 | |
121 | property var commentInputData: { |
122 | @@ -56,7 +56,7 @@ |
123 | "sources": [ |
124 | "../../graphics/phone_background.jpg", |
125 | "../../graphics/tablet_background.jpg", |
126 | - "../../graphics/clock@18.png", |
127 | + "../../../tests/graphics/clock@18.png", |
128 | "../../graphics/borked" |
129 | ] |
130 | } |
131 | |
132 | === modified file 'tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml' |
133 | --- tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml 2015-07-15 15:07:19 +0000 |
134 | +++ tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml 2015-11-30 08:33:35 +0000 |
135 | @@ -33,7 +33,7 @@ |
136 | "sources": [ |
137 | "../../graphics/phone_background.jpg", |
138 | "../../graphics/tablet_background.jpg", |
139 | - "../../graphics/clock@18.png", |
140 | + "../../../tests/graphics/clock@18.png", |
141 | "../../graphics/borked" |
142 | ] |
143 | } |
144 | @@ -42,10 +42,10 @@ |
145 | "sources": [ |
146 | "../../graphics/phone_background.jpg", |
147 | "../../graphics/tablet_background.jpg", |
148 | - "../../graphics/clock@18.png", |
149 | + "../../../tests/graphics/clock@18.png", |
150 | "../../graphics/borked" |
151 | ] |
152 | - , "fallback": "../../graphics/clock@18.png" |
153 | + , "fallback": "../../../tests/graphics/clock@18.png" |
154 | } |
155 | |
156 | PreviewImageGallery { |
157 | |
158 | === modified file 'tests/qmltests/Notifications/tst_Notifications.qml' |
159 | --- tests/qmltests/Notifications/tst_Notifications.qml 2015-11-06 10:00:29 +0000 |
160 | +++ tests/qmltests/Notifications/tst_Notifications.qml 2015-11-30 08:33:35 +0000 |
161 | @@ -76,8 +76,8 @@ |
162 | "hints": {}, |
163 | "summary": "Cole Raby", |
164 | "body": "I did not expect it to be <b>that</b> late.", |
165 | - "icon": "../graphics/avatars/amanda.png", |
166 | - "secondaryIcon": "../graphics/applicationIcons/facebook.png", |
167 | + "icon": "../../tests/graphics/avatars/amanda.png", |
168 | + "secondaryIcon": "../../tests/graphics/applicationIcons/facebook.png", |
169 | "rawActions": ["reply_id", "Dummy"]}) |
170 | n.completed.connect(mockModel.onCompleted) |
171 | mockModel.append(n) |
172 | @@ -90,7 +90,7 @@ |
173 | "hints": {"x-canonical-non-shaped-icon": "true"}, |
174 | "summary": "Contacts", |
175 | "body": "Synchronised contacts-database & cloud-storage.", |
176 | - "icon": "../graphics/applicationIcons/contacts-app.png", |
177 | + "icon": "../../tests/graphics/applicationIcons/contacts-app.png", |
178 | "secondaryIcon": "", |
179 | "rawActions": ["reply_id", "Dummy"]}) |
180 | n.completed.connect(mockModel.onCompleted) |
181 | @@ -104,7 +104,7 @@ |
182 | "hints": {"x-canonical-non-shaped-icon": "false"}, |
183 | "summary": "Photo upload completed", |
184 | "body": "", |
185 | - "icon": "../graphics/applicationIcons/facebook.png", |
186 | + "icon": "../../tests/graphics/applicationIcons/facebook.png", |
187 | "secondaryIcon": "", |
188 | "rawActions": ["reply_id", "Dummy"]}) |
189 | n.completed.connect(mockModel.onCompleted) |
190 | @@ -118,7 +118,7 @@ |
191 | "hints": {}, |
192 | "summary": "Interactive notification", |
193 | "body": "This is a notification that can be clicked", |
194 | - "icon": "../graphics/avatars/anna_olsson.png", |
195 | + "icon": "../../tests/graphics/avatars/anna_olsson.png", |
196 | "secondaryIcon": "", |
197 | "rawActions": ["reply_id", "Dummy"]}) |
198 | n.completed.connect(mockModel.onCompleted) |
199 | @@ -288,7 +288,7 @@ |
200 | type: Notification.Ephemeral |
201 | summary: "Photo upload completed" |
202 | body: "" |
203 | - icon: "../graphics/applicationIcons/facebook.png" |
204 | + icon: "../../tests/graphics/applicationIcons/facebook.png" |
205 | secondaryIcon: "" |
206 | value: 0 |
207 | rawActions: [] |
208 | @@ -302,7 +302,7 @@ |
209 | summary: "New comment successfully published" |
210 | body: "" |
211 | icon: "" |
212 | - secondaryIcon: "../graphics/applicationIcons/facebook.png" |
213 | + secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png" |
214 | value: 0 |
215 | rawActions: [] |
216 | }, |
217 | @@ -313,7 +313,7 @@ |
218 | "sound-file": "dummy.ogg"} |
219 | summary: "Interactive notification" |
220 | body: "This is a notification that can be clicked" |
221 | - icon: "../graphics/avatars/amanda.png" |
222 | + icon: "../../tests/graphics/avatars/amanda.png" |
223 | secondaryIcon: "" |
224 | value: 0 |
225 | rawActions: ["reply_id", "Dummy"] |
226 | @@ -325,7 +325,7 @@ |
227 | "sound-file": "dummy.ogg"} |
228 | summary: "Bro Coly" |
229 | body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." |
230 | - icon: "../graphics/avatars/anna_olsson.png" |
231 | + icon: "../../tests/graphics/avatars/anna_olsson.png" |
232 | secondaryIcon: "" |
233 | value: 0 |
234 | rawActions: ["accept_id", "Accept", |
235 | @@ -338,8 +338,8 @@ |
236 | "sound-file": "dummy.ogg"} |
237 | summary: "Cole Raby" |
238 | body: "I did not expect it to be that late." |
239 | - icon: "../graphics/avatars/funky.png" |
240 | - secondaryIcon: "../graphics/applicationIcons/facebook.png" |
241 | + icon: "../../tests/graphics/avatars/funky.png" |
242 | + secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png" |
243 | value: 0 |
244 | rawActions: [] |
245 | }, |
246 | |
247 | === modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml' |
248 | --- tests/qmltests/Notifications/tst_OptionToggle.qml 2015-10-26 15:54:13 +0000 |
249 | +++ tests/qmltests/Notifications/tst_OptionToggle.qml 2015-11-30 08:33:35 +0000 |
250 | @@ -70,7 +70,7 @@ |
251 | hints: {"x-canonical-private-affirmative-tint": "true"}, |
252 | summary: "Incoming call", |
253 | body: "Frank Zappa\n+44 (0)7736 027340", |
254 | - icon: "../graphics/avatars/funky.png", |
255 | + icon: "../../tests/graphics/avatars/funky.png", |
256 | secondaryIcon: "image://theme/incoming-call", |
257 | actions: [{ id: "ok_id", label: "Ok"}, |
258 | { id: "cancel_id", label: "Cancel"}, |
259 | @@ -159,7 +159,7 @@ |
260 | hints: {"x-canonical-private-affirmative-tint": "true"}, |
261 | summary: "Incoming call", |
262 | body: "Frank Zappa\n+44 (0)7736 027340", |
263 | - icon: "../graphics/avatars/funky.png", |
264 | + icon: "../../tests/graphics/avatars/funky.png", |
265 | secondaryIcon: "image://theme/incoming-call", |
266 | actions: [{ id: "ok_id", label: "Ok"}, |
267 | { id: "cancel_id", label: "Cancel"}, |
268 | |
269 | === modified file 'tests/qmltests/Notifications/tst_SwipeToAct.qml' |
270 | --- tests/qmltests/Notifications/tst_SwipeToAct.qml 2015-11-06 10:00:29 +0000 |
271 | +++ tests/qmltests/Notifications/tst_SwipeToAct.qml 2015-11-30 08:33:35 +0000 |
272 | @@ -72,7 +72,7 @@ |
273 | hints: {"x-canonical-snap-decisions-swipe": "true"}, |
274 | summary: "Incoming call", |
275 | body: "Frank Zappa\n+44 (0)7736 027340", |
276 | - icon: "../graphics/avatars/amanda.png", |
277 | + icon: "../../tests/graphics/avatars/amanda.png", |
278 | secondaryIcon: "incoming-call", |
279 | actions: [{ id: "ok_id", label: "Ok"}, |
280 | { id: "cancel_id", label: "Cancel"}, |
281 | @@ -182,8 +182,8 @@ |
282 | hints: {"x-canonical-snap-decisions-swipe": "true"}, |
283 | summary: "Incoming call", |
284 | body: "Frank Zappa\n+44 (0)7736 027340", |
285 | - icon: "../graphics/avatars/amanda.png", |
286 | - secondaryIcon: "../graphics/applicationIcons/facebook.png", |
287 | + icon: "../../tests/graphics/avatars/amanda.png", |
288 | + secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png", |
289 | actions: myActionModel, |
290 | summaryVisible: true, |
291 | bodyVisible: true, |
292 | @@ -201,8 +201,8 @@ |
293 | hints: {"x-canonical-snap-decisions-swipe": "true"}, |
294 | summary: "Incoming call", |
295 | body: "Bro Coly\n+49 (0)221 426973", |
296 | - icon: "../graphics/avatars/funky.png", |
297 | - secondaryIcon: "../graphics/applicationIcons/facebook.png", |
298 | + icon: "../../tests/graphics/avatars/funky.png", |
299 | + secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png", |
300 | actions: myActionModel, |
301 | summaryVisible: true, |
302 | bodyVisible: true, |
303 | |
304 | === modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml' |
305 | --- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2015-07-15 15:07:19 +0000 |
306 | +++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2015-11-30 08:33:35 +0000 |
307 | @@ -66,8 +66,8 @@ |
308 | hints: {"x-canonical-private-button-tint": "true"}, |
309 | summary: "Incoming call", |
310 | body: "Frank Zappa\n+44 (0)7736 027340", |
311 | - icon: "../graphics/avatars/funky.png", |
312 | - secondaryIcon: "../graphics/applicationIcons/dialer-app.png", |
313 | + icon: "../../tests/graphics/avatars/funky.png", |
314 | + secondaryIcon: "../../tests/graphics/applicationIcons/dialer-app.png", |
315 | actions: [{ id: "pickup_id", label: "Pick up"}, |
316 | { id: "decline_1_id", label: "Decline"}, |
317 | { id: "decline_2_id", label: "Can't talk now, what's up?"}, |
318 | @@ -109,8 +109,8 @@ |
319 | hints: {"x-canonical-private-button-tint": "true"}, |
320 | summary: "Jenny Sample", |
321 | body: "Hey there! Have you been watching the latest episode of that TV-show I told you about last week?", |
322 | - icon: "../graphics/avatars/amanda.png", |
323 | - secondaryIcon: "../graphics/applicationIcons/messages-app.png", |
324 | + icon: "../../tests/graphics/avatars/amanda.png", |
325 | + secondaryIcon: "../../tests/graphics/applicationIcons/messages-app.png", |
326 | actions: [{ id: "reply_id", label: "Reply"}, |
327 | { id: "ignore_id", label: "Ignore"}] |
328 | }] |
329 | |
330 | === modified file 'tests/qmltests/tst_Shell.qml' |
331 | --- tests/qmltests/tst_Shell.qml 2015-11-24 17:44:18 +0000 |
332 | +++ tests/qmltests/tst_Shell.qml 2015-11-30 08:33:35 +0000 |
333 | @@ -454,8 +454,8 @@ |
334 | hints: {"x-canonical-private-affirmative-tint": "true"}, |
335 | summary: "Tom Ato", |
336 | body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", |
337 | - icon: "../graphics/avatars/funky.png", |
338 | - secondaryIcon: "../graphics/applicationIcons/facebook.png", |
339 | + icon: "../../tests/graphics/avatars/funky.png", |
340 | + secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png", |
341 | actions: [{ id: "ok_id", label: "Ok"}, |
342 | { id: "cancel_id", label: "Cancel"}, |
343 | { id: "notreally_id", label: "Not really"}, |
No idea why the change on po/shn.po, i think i'm inheriting it from the prerequisite somehow.