Unity

Merge lp:~dandrader/unity/phablet_dashapp_dead_code into lp:unity/phablet

  1. phablet_dashapp_dead_code
  2. Merge into phablet
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 544
Proposed branch: lp:~dandrader/unity/phablet_dashapp_dead_code
Merge into: lp:unity/phablet
Diff against target: 102 lines (+0/-59)
3 files modified
Applications/applications.js (+0/-27)
Dash/Apps/InstalledApplicationsModel.qml (+0/-31)
Dash/DashApps.qml (+0/-1)
To merge this branch: bzr merge lp:~dandrader/unity/phablet_dashapp_dead_code
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+157153@code.launchpad.net

Commit message

Remove dead code from Dash

Installed applications is now taken from a live lens instead of a hardcoded model.

Description of the change

Remove dead code from Dash

Installed applications is now taken from a live lens instead of a hardcoded model.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:536
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/254/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/255
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/130
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/631

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/254/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Shouldn't we also get rid of the corresponding icons that are no longer used?

review: Needs Information
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

> Shouldn't we also get rid of the corresponding icons that are no longer used?

Right. It's done now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:537
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/283/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/159/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/283/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/285/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/286
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/161
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/653

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/285/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/289
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/288
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/164/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/658

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/288/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/293
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/293/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/292
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/168
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/668

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/292/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

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-04 19:01:30 +0000
3+++ Applications/applications.js 2013-04-05 11:50:26 +0000
4@@ -84,39 +84,12 @@
5 'icon': 'ski_safari',
6 'exec': '/usr/bin/qmlscene /usr/share/demo-mock-apps/ski-safari.qml'
7 },
8- '/usr/share/applications/share-app.desktop': {
9- 'name': 'Sharing',
10- 'icon': 'share',
11- 'exec': '/usr/bin/share-app',
12- 'stage': SideStage
13- },
14 '/usr/share/applications/media-player.desktop': {
15 'name': 'Media Player',
16 'icon': 'media-player',
17 'fullscreen': true,
18 'exec': '/usr/bin/media-player'
19 },
20- '/usr/share/applications/ebay-webapp.desktop': {
21- 'name': 'eBay',
22- 'icon': 'ebay',
23- 'exec': '/usr/bin/webbrowser-app --chromeless http://ebay.com'
24- },
25- '/usr/share/applications/amazon-webapp.desktop': {
26- 'name': 'Amazon',
27- 'icon': 'amazon',
28- 'exec': '/usr/bin/webbrowser-app --chromeless http://m.amazon.com'
29- },
30- '/usr/share/applications/ubuntuone-webapp.desktop': {
31- 'name': 'Ubuntu One',
32- 'icon': 'ubuntuone',
33- 'exec': '/usr/bin/webbrowser-app --chromeless http://one.ubuntu.com'
34- },
35- '/usr/share/applications/weather-mockapp.desktop': {
36- 'name': 'Weather',
37- 'icon': 'weather',
38- 'exec': '/usr/bin/qmlscene /usr/share/demo-mock-apps/weather.qml',
39- 'stage': SideStage
40- },
41 '/usr/share/applications/evernote.desktop': {
42 'name': 'Evernote',
43 'icon': 'evernote',
44
45=== removed file 'Dash/Apps/InstalledApplicationsModel.qml'
46--- Dash/Apps/InstalledApplicationsModel.qml 2013-04-04 19:01:30 +0000
47+++ Dash/Apps/InstalledApplicationsModel.qml 1970-01-01 00:00:00 +0000
48@@ -1,31 +0,0 @@
49-/*
50- * Copyright (C) 2013 Canonical, Ltd.
51- *
52- * This program is free software; you can redistribute it and/or modify
53- * it under the terms of the GNU General Public License as published by
54- * the Free Software Foundation; version 3.
55- *
56- * This program is distributed in the hope that it will be useful,
57- * but WITHOUT ANY WARRANTY; without even the implied warranty of
58- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
59- * GNU General Public License for more details.
60- *
61- * You should have received a copy of the GNU General Public License
62- * along with this program. If not, see <http://www.gnu.org/licenses/>.
63- */
64-
65-import QtQuick 2.0
66-
67-ListModel {
68- ListElement { desktopFile: "/usr/share/applications/amazon-webapp.desktop"; }
69- ListElement { desktopFile: "/usr/share/applications/ebay-webapp.desktop"; }
70- ListElement { desktopFile: "/usr/share/applications/media-player.desktop"; }
71- ListElement { desktopFile: "/usr/share/applications/music-player-mockapp.desktop"; }
72- ListElement { desktopFile: "/usr/share/applications/notes-app.desktop"; }
73- ListElement { desktopFile: "/usr/share/applications/phone-app.desktop"; }
74- ListElement { desktopFile: "/usr/share/applications/share-app.desktop"; }
75- ListElement { desktopFile: "/usr/share/applications/ski-safari-mockapp.desktop"; }
76- ListElement { desktopFile: "/usr/share/applications/twitter-webapp.desktop"; }
77- ListElement { desktopFile: "/usr/share/applications/ubuntuone-webapp.desktop"; }
78- ListElement { desktopFile: "/usr/share/applications/weather-mockapp.desktop"; }
79-}
80
81=== modified file 'Dash/DashApps.qml'
82--- Dash/DashApps.qml 2013-04-02 21:34:00 +0000
83+++ Dash/DashApps.qml 2013-04-05 11:50:26 +0000
84@@ -62,7 +62,6 @@
85 ListElement { category: "Available for download"; component: "ApplicationsFilterGrid"; modelName: "AppsAvailableForDownloadModel" }
86 }
87
88- InstalledApplicationsModel { id: installedApplicationsModel }
89 FrequentlyUsedAppsModel { id: frequentlyUsedAppsModel }
90 AppsAvailableForDownloadModel { id: appsAvailableForDownloadModel }
91
92
93=== removed file 'graphics/applicationIcons/amazon@18.png'
94Binary files graphics/applicationIcons/amazon@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/amazon@18.png 1970-01-01 00:00:00 +0000 differ
95=== removed file 'graphics/applicationIcons/ebay@18.png'
96Binary files graphics/applicationIcons/ebay@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/ebay@18.png 1970-01-01 00:00:00 +0000 differ
97=== removed file 'graphics/applicationIcons/share@18.png'
98Binary files graphics/applicationIcons/share@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/share@18.png 1970-01-01 00:00:00 +0000 differ
99=== removed file 'graphics/applicationIcons/ubuntuone@18.png'
100Binary files graphics/applicationIcons/ubuntuone@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/ubuntuone@18.png 1970-01-01 00:00:00 +0000 differ
101=== removed file 'graphics/applicationIcons/weather@18.png'
102Binary files graphics/applicationIcons/weather@18.png 2012-12-20 19:56:57 +0000 and graphics/applicationIcons/weather@18.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches