Unity

Merge lp:~fboucault/unity/phablet-use_icon_theme into lp:unity/phablet

  1. phablet-use_icon_theme
  2. Merge into phablet
Proposed by Florian Boucault
Status: Work in progress
Proposed branch: lp:~fboucault/unity/phablet-use_icon_theme
Merge into: lp:unity/phablet
Diff against target: 548 lines (+56/-51)
15 files modified
Applications/applications.js (+4/-4)
Bottombar/HudButton.qml (+3/-3)
Components/PageHeader.qml (+8/-8)
Components/RatingStars.qml (+13/-4)
Dash/Apps/ApplicationsFilterGrid.qml (+2/-2)
Dash/People/Preview/Phone.qml (+3/-3)
Hud/SearchBar.qml (+6/-6)
Hud/ToolBar.qml (+5/-5)
Hud/ToolBarIcon.qml (+3/-2)
Launcher/Launcher.qml (+1/-3)
Launcher/LauncherShortcuts.qml (+2/-3)
Panel/Menus/Overview/FlightModeWidget.qml (+2/-2)
Panel/Menus/Overview/VolumeWidget.qml (+4/-4)
Shell.qml (+0/-1)
tests/qmltests/Launcher/tst_Launcher.qml (+0/-1)
To merge this branch: bzr merge lp:~fboucault/unity/phablet-use_icon_theme
Reviewer Review Type Date Requested Status
Michał Sawicz Needs Information
Review via email: mp+158426@code.launchpad.net

Commit message

Use icons from the ubuntu-mobile theme and the recently introduced Icon class from SDK.

Dash and Launcher: use application icons from theme and removed local icons graphics/applicationIcons.
Dash People Preview:
- use star from theme
- use messages icon from theme
- removed facebook & twitter icons that are provided by the lens right now
Dash Video Preview: use stars from theme.
Dash search: use icons from theme.
HUD: use icons from theme.
PageHeader: use cross from icon theme.
Panel device menu: use volume icons from theme.
Indicators device menu: use flight mode icon from theme.
Removed old unused icons from Panel/graphics.

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

The icons necessary for that to work are in the latest revision of lp:ubuntu-themes

Reply
lp:~fboucault/unity/phablet-use_icon_theme updated
520. By Florian Boucault

Merged with trunk

Revision history for this message
Michał Sawicz (saviq) wrote :

Hey, what's the status of this?

review: Needs Information
Reply

Unmerged revisions

520. By Florian Boucault

Merged with trunk

519. By Florian Boucault

Removed remaining conflicting file.

518. By Florian Boucault

Merged trunk

517. By Florian Boucault

Removed useless import.

516. By Florian Boucault

Dash: always use application icons from the theme.

515. By Florian Boucault

Colorize HUD button.

514. By Florian Boucault

Removed all app icons.

513. By Florian Boucault

Merged trunk

512. By Florian Boucault

Readded telephony icon to allow for merge with trunk

511. By Florian Boucault

Make use of new SDK's Icon class.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Applications/applications.js'
2--- Applications/applications.js 2013-04-05 11:42:20 +0000
3+++ Applications/applications.js 2013-04-17 13:56:25 +0000
4@@ -37,13 +37,13 @@
5 },
6 '/usr/share/applications/camera-app.desktop': {
7 'name': 'Camera',
8- 'icon': 'camera',
9+ 'icon': 'camera-app',
10 'fullscreen': true,
11 'exec': '/usr/bin/camera-app --fullscreen'
12 },
13 '/usr/share/applications/gallery-app.desktop': {
14 'name': 'Gallery',
15- 'icon': 'gallery',
16+ 'icon': 'gallery-app',
17 'exec': '/usr/bin/gallery-app'
18 },
19 '/usr/share/applications/facebook-webapp.desktop': {
20@@ -54,7 +54,7 @@
21 },
22 '/usr/share/applications/webbrowser-app.desktop': {
23 'name': 'Browser',
24- 'icon': 'browser',
25+ 'icon': 'webbrowser-app',
26 'exec': '/usr/bin/webbrowser-app'
27 },
28 '/usr/share/applications/twitter-webapp.desktop': {
29@@ -81,7 +81,7 @@
30 },
31 '/usr/share/applications/ski-safari-mockapp.desktop': {
32 'name': 'Ski Safari',
33- 'icon': 'ski_safari',
34+ 'icon': 'ski-safari',
35 'exec': '/usr/bin/qmlscene /usr/share/demo-mock-apps/ski-safari.qml'
36 },
37 '/usr/share/applications/media-player.desktop': {
38
39=== modified file 'Bottombar/HudButton.qml'
40--- Bottombar/HudButton.qml 2013-04-09 12:30:58 +0000
41+++ Bottombar/HudButton.qml 2013-04-17 13:56:25 +0000
42@@ -52,12 +52,12 @@
43 }
44 }
45
46- Image {
47+ Icon {
48 width: units.gu(4)
49 height: width
50- source: "graphics/hud.png"
51+ name: "hud"
52+ color: "#cccccc"
53 anchors.centerIn: parent
54- fillMode: Image.PreserveAspectFit
55 }
56 }
57 }
58
59=== removed file 'Bottombar/graphics/hud@20.png'
60Binary files Bottombar/graphics/hud@20.png 2013-02-18 15:36:17 +0000 and Bottombar/graphics/hud@20.png 1970-01-01 00:00:00 +0000 differ
61=== modified file 'Components/PageHeader.qml'
62--- Components/PageHeader.qml 2013-04-05 14:18:10 +0000
63+++ Components/PageHeader.qml 2013-04-17 13:56:25 +0000
64@@ -157,7 +157,7 @@
65 height: parent.height
66 width: height
67
68- Image {
69+ Icon {
70 id: primaryImage
71 anchors {
72 verticalCenter: parent.verticalCenter
73@@ -202,27 +202,27 @@
74 name: "active"
75 extend: "wide"
76 PropertyChanges { target: searchContainer; width: units.gu(40) }
77- PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }
78+ PropertyChanges { target: primaryImage; name: searchField.text ? "clear-search" : "search"; color: "#555555" }
79 PropertyChanges { target: searchField; highlighted: true }
80 },
81 State {
82 name: "inactive"
83 extend: "wide"
84 PropertyChanges { target: searchContainer; width: units.gu(25) }
85- PropertyChanges { target: primaryImage; source: "../Dash/graphics/icon_search_inactive.png" }
86+ PropertyChanges { target: primaryImage; name: "search"; color: "white"; opacity: 0.5 }
87 PropertyChanges { target: searchField; highlighted: false }
88 },
89 State {
90 name: "narrowActive"
91 extend: "narrow"
92 PropertyChanges { target: header; contentY: 0 }
93- PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }
94+ PropertyChanges { target: primaryImage; name: searchField.text ? "clear-search" : "search"; color: "#555555" }
95 },
96 State {
97 name: "narrowInactive"
98 extend: "narrow"
99 PropertyChanges { target: header; contentY: header.height }
100- PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }
101+ PropertyChanges { target: primaryImage; name: searchField.text ? "clear-search" : "search"; color: "#555555" }
102 }
103 ]
104
105@@ -232,7 +232,7 @@
106 SequentialAnimation {
107 ParallelAnimation {
108 NumberAnimation { targets: [searchContainer, searchField]; property: "width"; duration: 200; easing.type: Easing.InOutQuad }
109- PropertyAction { target: primaryImage; property: "source" }
110+ PropertyAction { target: primaryImage; properties: ["name", "color", "opacity"] }
111 AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }
112 }
113 ScriptAction { script: searchContainer.openPopover() }
114@@ -280,11 +280,11 @@
115
116 onClicked: searchContainer.closePopover()
117
118- Image {
119+ Icon {
120 anchors.centerIn: parent
121 width: units.gu(2)
122 height: units.gu(2)
123- source: "../Dash/graphics/icon_listview_clear.png"
124+ name: "close"
125 }
126 }
127
128
129=== modified file 'Components/RatingStars.qml'
130--- Components/RatingStars.qml 2013-02-27 18:19:51 +0000
131+++ Components/RatingStars.qml 2013-04-17 13:56:25 +0000
132@@ -15,6 +15,7 @@
133 */
134
135 import QtQuick 2.0
136+import Ubuntu.Components 0.1
137
138 Row {
139 id: root
140@@ -23,19 +24,27 @@
141 property int starCount: 5
142 height: childrenRect.height
143 width: childrenRect.width
144+ spacing: units.gu(0.5)
145
146 readonly property int effectiveRating: Math.max(0, Math.min(root.starCount * root.rating / root.maximumRating, root.maximumRating))
147
148 Repeater {
149 model: root.effectiveRating
150- Image {
151- source: "graphics/icon_star_on.png"
152+ Icon {
153+ width: units.gu(2)
154+ height: units.gu(2)
155+ name: "favorite-unselected"
156+ color: "#f3f3e7"
157 }
158 }
159 Repeater {
160 model: root.starCount - root.effectiveRating
161- Image {
162- source: "graphics/icon_star_off.png"
163+ Icon {
164+ width: units.gu(2)
165+ height: units.gu(2)
166+ name: "favorite-unselected"
167+ color: "#f3f3e7"
168+ opacity: 0.5
169 }
170 }
171 }
172
173=== removed file 'Components/graphics/icon_star_off@20.png'
174Binary files Components/graphics/icon_star_off@20.png 2013-02-03 00:28:31 +0000 and Components/graphics/icon_star_off@20.png 1970-01-01 00:00:00 +0000 differ
175=== removed file 'Components/graphics/icon_star_on@20.png'
176Binary files Components/graphics/icon_star_on@20.png 2013-02-03 00:28:31 +0000 and Components/graphics/icon_star_on@20.png 1970-01-01 00:00:00 +0000 differ
177=== modified file 'Dash/Apps/ApplicationsFilterGrid.qml'
178--- Dash/Apps/ApplicationsFilterGrid.qml 2013-04-02 15:29:04 +0000
179+++ Dash/Apps/ApplicationsFilterGrid.qml 2013-04-17 13:56:25 +0000
180@@ -40,14 +40,14 @@
181 }
182 }
183
184- property string icon: model.column_1 ? model.column_1 : "../../graphics/applicationIcons/" + application.icon + ".png" // FIXME: this is temporary
185+ property string icon: model.column_1 ? model.column_1 : application.icon
186
187 width: filterGrid.cellWidth
188 height: filterGrid.cellHeight
189 text: model.column_4 ? model.column_4 : application.name // FIXME: this is temporary
190 imageWidth: units.gu(8)
191 imageHeight: units.gu(7.5)
192- source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
193+ source: "image://gicon/" + icon
194 onClicked: shell.activateApplication(application.desktopFile)
195 }
196 }
197
198=== modified file 'Dash/People/Preview/Phone.qml'
199--- Dash/People/Preview/Phone.qml 2013-01-15 11:37:07 +0000
200+++ Dash/People/Preview/Phone.qml 2013-04-17 13:56:25 +0000
201@@ -89,12 +89,12 @@
202 width: units.gu(7)
203 height: parent.height
204
205- Image {
206+ Icon {
207 anchors.centerIn: parent
208 width: units.gu(4)
209 height: units.gu(4)
210- source: "../graphics/icon_write_text.png"
211- fillMode: Image.PreserveAspectFit
212+ name: "messages"
213+ color: "#f3f3e7"
214 }
215
216 ListItems.Highlight {
217
218=== removed file 'Dash/People/graphics/icon_facebook@18.png'
219Binary files Dash/People/graphics/icon_facebook@18.png 2012-12-11 12:08:10 +0000 and Dash/People/graphics/icon_facebook@18.png 1970-01-01 00:00:00 +0000 differ
220=== removed file 'Dash/People/graphics/icon_twitter@18.png'
221Binary files Dash/People/graphics/icon_twitter@18.png 2012-12-11 12:08:10 +0000 and Dash/People/graphics/icon_twitter@18.png 1970-01-01 00:00:00 +0000 differ
222=== removed file 'Dash/People/graphics/icon_write_text@18.png'
223Binary files Dash/People/graphics/icon_write_text@18.png 2012-12-11 12:08:10 +0000 and Dash/People/graphics/icon_write_text@18.png 1970-01-01 00:00:00 +0000 differ
224=== removed file 'Dash/People/graphics/star_favourite@18.png'
225Binary files Dash/People/graphics/star_favourite@18.png 2012-12-11 12:08:10 +0000 and Dash/People/graphics/star_favourite@18.png 1970-01-01 00:00:00 +0000 differ
226=== removed file 'Dash/People/graphics/star_not_favourite@18.png'
227Binary files Dash/People/graphics/star_not_favourite@18.png 2012-12-11 12:08:10 +0000 and Dash/People/graphics/star_not_favourite@18.png 1970-01-01 00:00:00 +0000 differ
228=== removed file 'Dash/graphics/icon_clear@20.png'
229Binary files Dash/graphics/icon_clear@20.png 2013-02-04 11:47:47 +0000 and Dash/graphics/icon_clear@20.png 1970-01-01 00:00:00 +0000 differ
230=== removed file 'Dash/graphics/icon_listview_clear@20.png'
231Binary files Dash/graphics/icon_listview_clear@20.png 2013-02-04 11:47:47 +0000 and Dash/graphics/icon_listview_clear@20.png 1970-01-01 00:00:00 +0000 differ
232=== removed file 'Dash/graphics/icon_search_active@20.png'
233Binary files Dash/graphics/icon_search_active@20.png 2013-02-04 11:47:47 +0000 and Dash/graphics/icon_search_active@20.png 1970-01-01 00:00:00 +0000 differ
234=== removed file 'Dash/graphics/icon_search_inactive@20.png'
235Binary files Dash/graphics/icon_search_inactive@20.png 2013-02-04 11:47:47 +0000 and Dash/graphics/icon_search_inactive@20.png 1970-01-01 00:00:00 +0000 differ
236=== modified file 'Hud/SearchBar.qml'
237--- Hud/SearchBar.qml 2013-02-18 15:38:25 +0000
238+++ Hud/SearchBar.qml 2013-04-17 13:56:25 +0000
239@@ -67,21 +67,21 @@
240 height: searchBar.height
241 width: height
242
243- Image {
244+ Icon {
245 id: magnifierImage
246 height: imageSize
247 width: height
248 anchors.centerIn: parent
249- source: "graphics/icon_search.png"
250+ name: "search"
251 visible: !activityIndicator.visible && !clearImage.visible
252 }
253
254- Image {
255+ Icon {
256 id: clearImage
257 height: imageSize
258 width: height
259 anchors.centerIn: parent
260- source: "graphics/icon_clear.png"
261+ name: "clear-search"
262 visible: !activityIndicator.visible && searchBar.text != ""
263 MouseArea {
264 anchors.fill: parent
265@@ -96,11 +96,11 @@
266 width: height
267 onClicked: microphoneClicked()
268
269- Image {
270+ Icon {
271 height: imageSize
272 width: height
273 anchors.centerIn: parent
274- source: "graphics/microphone.png"
275+ name: "microphone"
276 }
277 }
278 }
279
280=== modified file 'Hud/ToolBar.qml'
281--- Hud/ToolBar.qml 2013-02-28 12:04:30 +0000
282+++ Hud/ToolBar.qml 2013-04-17 13:56:25 +0000
283@@ -22,23 +22,23 @@
284
285 spacing: units.gu(3)
286 ToolBarIcon {
287- source: "graphics/close.png"
288+ icon: "close"
289 onClicked: actionTriggered(HudClient.QuitToolBarAction)
290 }
291 ToolBarIcon {
292- source: "graphics/undo.png"
293+ icon: "undo"
294 onClicked: actionTriggered(HudClient.UndoToolBarAction)
295 }
296 ToolBarIcon {
297- source: "graphics/help.png"
298+ icon: "help"
299 onClicked: actionTriggered(HudClient.HelpToolBarAction)
300 }
301 ToolBarIcon {
302- source: "graphics/view-fullscreen.png"
303+ icon: "view-fullscreen"
304 onClicked: actionTriggered(HudClient.FullScreenToolBarAction)
305 }
306 ToolBarIcon {
307- source: "graphics/settings.png"
308+ icon: "settings"
309 onClicked: actionTriggered(HudClient.PreferencesToolBarAction)
310 }
311 }
312
313=== modified file 'Hud/ToolBarIcon.qml'
314--- Hud/ToolBarIcon.qml 2013-02-14 23:18:58 +0000
315+++ Hud/ToolBarIcon.qml 2013-04-17 13:56:25 +0000
316@@ -20,15 +20,16 @@
317 Button {
318 ItemStyle.class: "transparent-button"
319
320- property alias source: image.source
321+ property string icon
322
323 height: units.gu(4)
324 width: height
325 opacity: enabled ? 1 : 0.5
326 Behavior on opacity { NumberAnimation { duration: 150 } }
327
328- Image {
329+ Icon {
330 id: image
331 anchors.fill: parent
332+ name: icon
333 }
334 }
335
336=== removed file 'Hud/graphics/close@20.png'
337Binary files Hud/graphics/close@20.png 2013-02-18 15:29:23 +0000 and Hud/graphics/close@20.png 1970-01-01 00:00:00 +0000 differ
338=== removed file 'Hud/graphics/help@20.png'
339Binary files Hud/graphics/help@20.png 2013-02-18 15:29:23 +0000 and Hud/graphics/help@20.png 1970-01-01 00:00:00 +0000 differ
340=== removed file 'Hud/graphics/icon_clear@20.png'
341Binary files Hud/graphics/icon_clear@20.png 2013-01-30 14:37:42 +0000 and Hud/graphics/icon_clear@20.png 1970-01-01 00:00:00 +0000 differ
342=== removed file 'Hud/graphics/icon_search@20.png'
343Binary files Hud/graphics/icon_search@20.png 2013-01-30 16:02:59 +0000 and Hud/graphics/icon_search@20.png 1970-01-01 00:00:00 +0000 differ
344=== removed file 'Hud/graphics/microphone@20.png'
345Binary files Hud/graphics/microphone@20.png 2013-02-18 15:38:25 +0000 and Hud/graphics/microphone@20.png 1970-01-01 00:00:00 +0000 differ
346=== removed file 'Hud/graphics/settings@20.png'
347Binary files Hud/graphics/settings@20.png 2013-02-18 15:29:23 +0000 and Hud/graphics/settings@20.png 1970-01-01 00:00:00 +0000 differ
348=== removed file 'Hud/graphics/undo@20.png'
349Binary files Hud/graphics/undo@20.png 2013-02-18 15:29:23 +0000 and Hud/graphics/undo@20.png 1970-01-01 00:00:00 +0000 differ
350=== removed file 'Hud/graphics/view-fullscreen@20.png'
351Binary files Hud/graphics/view-fullscreen@20.png 2013-02-18 15:29:23 +0000 and Hud/graphics/view-fullscreen@20.png 1970-01-01 00:00:00 +0000 differ
352=== modified file 'Launcher/Launcher.qml'
353--- Launcher/Launcher.qml 2013-03-28 10:58:41 +0000
354+++ Launcher/Launcher.qml 2013-04-17 13:56:25 +0000
355@@ -74,7 +74,6 @@
356 // interacted with, before it finally hides itself.
357 property int inactivityTimeout: 8000
358
359- property string iconPath: "."
360 property string appScreenshotPath: "."
361 property string gadgetScreenshotPath: "."
362
363@@ -199,7 +198,6 @@
364 launcher.dashItemSelected(index)
365 }
366 releaseModeHighlight: mouseArea.pressed && (launcher.state == "shortcuts" || launcher.state == "spreadHint")
367- iconPath: launcher.iconPath
368 releaseModeMouse: Qt.point(mouseArea.mouseX, mouseArea.mouseY)
369
370 Behavior on x { NumberAnimation {duration: launcher.state == "hint" ? 70 : launcher.state == "moving" ? 0 : 300; easing.type: Easing.OutCubic } }
371@@ -219,7 +217,7 @@
372 width: Math.min(units.gu(40), launcher.width - launcher.shortcutsWidth - 2 * margin)
373 height: shortcuts.iconHeight
374 text: shortcuts.shortcutsModel.get(shortcuts.currentIndex) ? shortcuts.shortcutsModel.get(shortcuts.currentIndex).name : ""
375- iconSource: shortcuts.shortcutsModel.get(shortcuts.currentIndex) ? '../' + iconPath + "/" + shortcuts.shortcutsModel.get(shortcuts.currentIndex).icon + '.png': ""
376+ iconSource: shortcuts.shortcutsModel.get(shortcuts.currentIndex) ? "image://gicon/%1".arg(shortcuts.shortcutsModel.get(shortcuts.currentIndex).icon) : ""
377 opacity: shortcuts.currentIndex != -1 && mouseArea.pressed && (launcher.state == "shortcuts" || launcher.state == "spreadHint") ? 1 : 0
378
379 Behavior on opacity {
380
381=== modified file 'Launcher/LauncherShortcuts.qml'
382--- Launcher/LauncherShortcuts.qml 2013-03-28 10:58:41 +0000
383+++ Launcher/LauncherShortcuts.qml 2013-04-17 13:56:25 +0000
384@@ -28,7 +28,6 @@
385
386 property bool enabled: true
387 property bool releaseModeHighlight: false
388- property string iconPath: "."
389
390 property bool animating: openShortcuts.animating || semiFoldedShortcut.animating || foldedShortcuts.animating // read only
391 property int currentIndex: -1
392@@ -89,7 +88,7 @@
393 function addDashIcon() {
394 shortcutsModel.insert(0, {"desktopFile": "dash.desktop",
395 "name": "Home",
396- "icon": "dash",
397+ "icon": "dash-home",
398 "exec": ""
399 });
400 }
401@@ -248,7 +247,7 @@
402 borderSource: ""
403 image: Image {
404 id: iconImage
405- source: '../' + shortcuts.iconPath + "/" + model.icon + '.png'
406+ source: "image://gicon/%1".arg(model.icon)
407 sourceSize { width: icon.width; height: icon.height }
408 }
409 }
410
411=== modified file 'Panel/Menus/Overview/FlightModeWidget.qml'
412--- Panel/Menus/Overview/FlightModeWidget.qml 2013-02-15 12:32:30 +0000
413+++ Panel/Menus/Overview/FlightModeWidget.qml 2013-04-17 13:56:25 +0000
414@@ -20,9 +20,9 @@
415 Item {
416 id: flightModeWidget
417
418- Image {
419+ Icon {
420 id: flightIcon
421- source: "graphics/plane_icon.png"
422+ name: "airplane-mode"
423 anchors {
424 left: parent.left
425 leftMargin: units.gu(2)
426
427=== modified file 'Panel/Menus/Overview/VolumeWidget.qml'
428--- Panel/Menus/Overview/VolumeWidget.qml 2013-04-12 20:16:47 +0000
429+++ Panel/Menus/Overview/VolumeWidget.qml 2013-04-17 13:56:25 +0000
430@@ -21,10 +21,10 @@
431 Item {
432 id: volumeWidget
433
434- Image {
435+ Icon {
436 id: minVolumeIcon
437 objectName: "minVolumeIcon"
438- source: "graphics/sound_off_icon.png"
439+ name: "audio-volume-low-zero"
440 anchors {
441 left: parent.left
442 leftMargin: units.gu(2)
443@@ -68,10 +68,10 @@
444 }
445 }
446
447- Image {
448+ Icon {
449 id: maxVolumeIcon
450 objectName: "maxVolumeIcon"
451- source: "graphics/sound_on_icon.png"
452+ name: "audio-volume-high"
453 anchors {
454 right: parent.right
455 rightMargin: units.gu(2)
456
457=== removed file 'Panel/Menus/Overview/graphics/plane_icon@18.png'
458Binary files Panel/Menus/Overview/graphics/plane_icon@18.png 2013-02-15 12:10:32 +0000 and Panel/Menus/Overview/graphics/plane_icon@18.png 1970-01-01 00:00:00 +0000 differ
459=== removed file 'Panel/Menus/Overview/graphics/sound_off_icon@18.png'
460Binary files Panel/Menus/Overview/graphics/sound_off_icon@18.png 2013-02-15 12:10:32 +0000 and Panel/Menus/Overview/graphics/sound_off_icon@18.png 1970-01-01 00:00:00 +0000 differ
461=== removed file 'Panel/Menus/Overview/graphics/sound_on_icon@18.png'
462Binary files Panel/Menus/Overview/graphics/sound_on_icon@18.png 2013-02-15 12:10:32 +0000 and Panel/Menus/Overview/graphics/sound_on_icon@18.png 1970-01-01 00:00:00 +0000 differ
463=== removed file 'Panel/graphics/Battery@18.png'
464Binary files Panel/graphics/Battery@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Battery@18.png 1970-01-01 00:00:00 +0000 differ
465=== removed file 'Panel/graphics/Bluetooth@18.png'
466Binary files Panel/graphics/Bluetooth@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Bluetooth@18.png 1970-01-01 00:00:00 +0000 differ
467=== removed file 'Panel/graphics/Clock@18.png'
468Binary files Panel/graphics/Clock@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Clock@18.png 1970-01-01 00:00:00 +0000 differ
469=== removed file 'Panel/graphics/Location@18.png'
470Binary files Panel/graphics/Location@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Location@18.png 1970-01-01 00:00:00 +0000 differ
471=== removed file 'Panel/graphics/Messages@18.png'
472Binary files Panel/graphics/Messages@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Messages@18.png 1970-01-01 00:00:00 +0000 differ
473=== removed file 'Panel/graphics/Network@18.png'
474Binary files Panel/graphics/Network@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Network@18.png 1970-01-01 00:00:00 +0000 differ
475=== removed file 'Panel/graphics/Sound@18.png'
476Binary files Panel/graphics/Sound@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Sound@18.png 1970-01-01 00:00:00 +0000 differ
477=== removed file 'Panel/graphics/Sync@18.png'
478Binary files Panel/graphics/Sync@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Sync@18.png 1970-01-01 00:00:00 +0000 differ
479=== removed file 'Panel/graphics/System@18.png'
480Binary files Panel/graphics/System@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/System@18.png 1970-01-01 00:00:00 +0000 differ
481=== removed file 'Panel/graphics/Time@18.png'
482Binary files Panel/graphics/Time@18.png 2012-11-21 16:37:29 +0000 and Panel/graphics/Time@18.png 1970-01-01 00:00:00 +0000 differ
483=== removed file 'Panel/graphics/search@12.png'
484Binary files Panel/graphics/search@12.png 2013-02-12 13:44:02 +0000 and Panel/graphics/search@12.png 1970-01-01 00:00:00 +0000 differ
485=== modified file 'Shell.qml'
486--- Shell.qml 2013-04-15 08:58:53 +0000
487+++ Shell.qml 2013-04-17 13:56:25 +0000
488@@ -485,7 +485,6 @@
489 applicationFocused: stages.shown
490 shortcutsWidth: units.gu(9)
491 shortcutsThreshold: shell.edgeSize
492- iconPath: "graphics/applicationIcons"
493 available: !greeter.locked
494 onDashItemSelected: {
495 greeter.hide()
496
497=== removed directory 'graphics/applicationIcons'
498=== removed file 'graphics/applicationIcons/angrybirds@18.png'
499Binary files graphics/applicationIcons/angrybirds@18.png 2012-11-23 21:01:50 +0000 and graphics/applicationIcons/angrybirds@18.png 1970-01-01 00:00:00 +0000 differ
500=== removed file 'graphics/applicationIcons/browser@18.png'
501Binary files graphics/applicationIcons/browser@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/browser@18.png 1970-01-01 00:00:00 +0000 differ
502=== removed file 'graphics/applicationIcons/camera@18.png'
503Binary files graphics/applicationIcons/camera@18.png 2012-11-29 20:01:04 +0000 and graphics/applicationIcons/camera@18.png 1970-01-01 00:00:00 +0000 differ
504=== removed file 'graphics/applicationIcons/dash@18.png'
505Binary files graphics/applicationIcons/dash@18.png 2012-12-18 18:05:44 +0000 and graphics/applicationIcons/dash@18.png 1970-01-01 00:00:00 +0000 differ
506=== removed file 'graphics/applicationIcons/evernote@18.png'
507Binary files graphics/applicationIcons/evernote@18.png 2012-11-23 21:01:50 +0000 and graphics/applicationIcons/evernote@18.png 1970-01-01 00:00:00 +0000 differ
508=== removed file 'graphics/applicationIcons/facebook@18.png'
509Binary files graphics/applicationIcons/facebook@18.png 2012-11-29 20:01:04 +0000 and graphics/applicationIcons/facebook@18.png 1970-01-01 00:00:00 +0000 differ
510=== removed file 'graphics/applicationIcons/gallery@18.png'
511Binary files graphics/applicationIcons/gallery@18.png 2012-11-29 20:01:04 +0000 and graphics/applicationIcons/gallery@18.png 1970-01-01 00:00:00 +0000 differ
512=== removed file 'graphics/applicationIcons/gmail@18.png'
513Binary files graphics/applicationIcons/gmail@18.png 2012-12-14 12:27:10 +0000 and graphics/applicationIcons/gmail@18.png 1970-01-01 00:00:00 +0000 differ
514=== removed file 'graphics/applicationIcons/map@18.png'
515Binary files graphics/applicationIcons/map@18.png 2012-11-29 20:01:04 +0000 and graphics/applicationIcons/map@18.png 1970-01-01 00:00:00 +0000 differ
516=== removed file 'graphics/applicationIcons/media-player@18.png'
517Binary files graphics/applicationIcons/media-player@18.png 2012-12-20 19:47:06 +0000 and graphics/applicationIcons/media-player@18.png 1970-01-01 00:00:00 +0000 differ
518=== removed file 'graphics/applicationIcons/music@18.png'
519Binary files graphics/applicationIcons/music@18.png 2012-11-29 20:01:04 +0000 and graphics/applicationIcons/music@18.png 1970-01-01 00:00:00 +0000 differ
520=== removed file 'graphics/applicationIcons/notepad@18.png'
521Binary files graphics/applicationIcons/notepad@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/notepad@18.png 1970-01-01 00:00:00 +0000 differ
522=== removed file 'graphics/applicationIcons/phone-app@18.png'
523Binary files graphics/applicationIcons/phone-app@18.png 2013-03-28 12:11:54 +0000 and graphics/applicationIcons/phone-app@18.png 1970-01-01 00:00:00 +0000 differ
524=== removed file 'graphics/applicationIcons/pinterest@18.png'
525Binary files graphics/applicationIcons/pinterest@18.png 2012-12-10 13:35:35 +0000 and graphics/applicationIcons/pinterest@18.png 1970-01-01 00:00:00 +0000 differ
526=== removed file 'graphics/applicationIcons/ski_safari@18.png'
527Binary files graphics/applicationIcons/ski_safari@18.png 2012-12-10 13:35:35 +0000 and graphics/applicationIcons/ski_safari@18.png 1970-01-01 00:00:00 +0000 differ
528=== removed file 'graphics/applicationIcons/skype@18.png'
529Binary files graphics/applicationIcons/skype@18.png 2012-11-29 20:01:04 +0000 and graphics/applicationIcons/skype@18.png 1970-01-01 00:00:00 +0000 differ
530=== removed file 'graphics/applicationIcons/soundcloud@18.png'
531Binary files graphics/applicationIcons/soundcloud@18.png 2012-12-20 19:56:57 +0000 and graphics/applicationIcons/soundcloud@18.png 1970-01-01 00:00:00 +0000 differ
532=== removed file 'graphics/applicationIcons/twitter@18.png'
533Binary files graphics/applicationIcons/twitter@18.png 2012-11-29 20:01:04 +0000 and graphics/applicationIcons/twitter@18.png 1970-01-01 00:00:00 +0000 differ
534=== removed file 'graphics/applicationIcons/wikipedia@18.png'
535Binary files graphics/applicationIcons/wikipedia@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/wikipedia@18.png 1970-01-01 00:00:00 +0000 differ
536=== removed file 'graphics/applicationIcons/youtube@18.png'
537Binary files graphics/applicationIcons/youtube@18.png 2012-11-23 21:01:50 +0000 and graphics/applicationIcons/youtube@18.png 1970-01-01 00:00:00 +0000 differ
538=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
539--- tests/qmltests/Launcher/tst_Launcher.qml 2013-04-09 14:49:00 +0000
540+++ tests/qmltests/Launcher/tst_Launcher.qml 2013-04-17 13:56:25 +0000
541@@ -39,7 +39,6 @@
542
543 shortcutsWidth: units.gu(9)
544 shortcutsThreshold: units.gu(2)
545- iconPath: "graphics/applicationIcons"
546 __dateTime: testCase.fakeDateTime
547
548 property string latestApplicationSelected

Subscribers

People subscribed via source and target branches