Unity 8

Merge lp:~bfiller/unity8/add-new-telephony into lp:unity8

  1. add-new-telephony
  2. Merge into trunk
Proposed by Bill Filler
Status: Superseded
Proposed branch: lp:~bfiller/unity8/add-new-telephony
Merge into: lp:unity8
Diff against target: 127 lines (+57/-21)
2 files modified
Dash/Apps/FrequentlyUsedAppsModel.qml (+40/-10)
plugins/Unity/Launcher/backend/launcherbackend.cpp (+17/-11)
To merge this branch: bzr merge lp:~bfiller/unity8/add-new-telephony
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+182162@code.launchpad.net

This proposal has been superseded by a proposal from 2013-08-26.

Commit message

add new telephony apps (dialer, messaging, contacts) to launcher and Home scope. Reverse order of launcher icons so most frequent are at top so they are visible by default

Description of the change

add new telephony apps (dialer, messaging, contacts) to launcher and Home scope. Reverse order of launcher icons so most frequent are at top so they are visible by default

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

FAILED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/unity8-ci/777/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2625/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/252
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1333/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/778
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/778/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/777
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2631/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/254
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/230

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/777/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Note that on the phone, the launcher starts up unfolded at the bottom, folding the top-most icons (Also inverting the order of the icons compared to the Desktop). The reason for this is to have important items easily reachable with the thumb while putting the others far away to the top.

review: Needs Fixing
lp:~bfiller/unity8/add-new-telephony updated
250. By Bill Filler

revert order of launcher icons to original order

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Dash/Apps/FrequentlyUsedAppsModel.qml'
--- Dash/Apps/FrequentlyUsedAppsModel.qml 2013-08-20 22:29:48 +0000
+++ Dash/Apps/FrequentlyUsedAppsModel.qml 2013-08-26 17:06:27 +0000
@@ -18,6 +18,36 @@
1818
19ListModel {19ListModel {
20 ListElement {20 ListElement {
21 uri: "application:///usr/share/applications/dialer-app.desktop"
22 icon: "../../graphics/applicationIcons/phone-app.png"
23 category: 0
24 mimetype: "application/x-desktop"
25 title: "Dialer"
26 comment: ""
27 dndUri: "file:///usr/share/applications/dialer-app.desktop"
28 metadata: ""
29 }
30 ListElement {
31 uri: "application:///usr/share/applications/messaging-app.desktop"
32 icon: "../../graphics/applicationIcons/messages-app.png"
33 category: 0
34 mimetype: "application/x-desktop"
35 title: "Messaging"
36 comment: ""
37 dndUri: "file:///usr/share/applications/messaging-app.desktop"
38 metadata: ""
39 }
40 ListElement {
41 uri: "application:///usr/share/applications/address-book-app.desktop"
42 icon: "../../graphics/applicationIcons/contacts-app.png"
43 category: 0
44 mimetype: "application/x-desktop"
45 title: "Contacts"
46 comment: ""
47 dndUri: "file:///usr/share/applications/address-book-app.desktop"
48 metadata: ""
49 }
50 ListElement {
21 uri: "application:///usr/share/applications/camera-app.desktop"51 uri: "application:///usr/share/applications/camera-app.desktop"
22 icon: "../../graphics/applicationIcons/camera.png"52 icon: "../../graphics/applicationIcons/camera.png"
23 category: 053 category: 0
@@ -28,16 +58,6 @@
28 metadata: ""58 metadata: ""
29 }59 }
30 ListElement {60 ListElement {
31 uri: "application:///usr/share/applications/phone-app.desktop"
32 icon: "../../graphics/applicationIcons/phone-app.png"
33 category: 0
34 mimetype: "application/x-desktop"
35 title: "Phone"
36 comment: ""
37 dndUri: "file:///usr/share/applications/phone-app.desktop"
38 metadata: ""
39 }
40 ListElement {
41 uri: "application:///usr/share/applications/gallery-app.desktop"61 uri: "application:///usr/share/applications/gallery-app.desktop"
42 icon: "../../graphics/applicationIcons/gallery.png"62 icon: "../../graphics/applicationIcons/gallery.png"
43 category: 063 category: 0
@@ -77,4 +97,14 @@
77 dndUri: "file:///usr/share/applications/gmail-webapp.desktop"97 dndUri: "file:///usr/share/applications/gmail-webapp.desktop"
78 metadata: ""98 metadata: ""
79 }99 }
100 ListElement {
101 uri: "application:///usr/share/applications/ubuntu-system-settings.desktop"
102 icon: "../../graphics/applicationIcons/system-settings.png"
103 category: 0
104 mimetype: "application/x-desktop"
105 title: "System Settings"
106 comment: ""
107 dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"
108 metadata: ""
109 }
80}110}
81111
=== added file 'graphics/applicationIcons/contacts-app@18.png'
82Binary files graphics/applicationIcons/contacts-app@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/contacts-app@18.png 2013-08-26 17:06:27 +0000 differ112Binary files graphics/applicationIcons/contacts-app@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/contacts-app@18.png 2013-08-26 17:06:27 +0000 differ
=== added file 'graphics/applicationIcons/messages-app@18.png'
83Binary files graphics/applicationIcons/messages-app@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/messages-app@18.png 2013-08-26 17:06:27 +0000 differ113Binary files graphics/applicationIcons/messages-app@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/messages-app@18.png 2013-08-26 17:06:27 +0000 differ
=== added file 'graphics/applicationIcons/system-settings@18.png'
84Binary files graphics/applicationIcons/system-settings@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/system-settings@18.png 2013-08-26 17:06:27 +0000 differ114Binary files graphics/applicationIcons/system-settings@18.png 1970-01-01 00:00:00 +0000 and graphics/applicationIcons/system-settings@18.png 2013-08-26 17:06:27 +0000 differ
=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp 2013-08-16 11:41:27 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp 2013-08-26 17:06:27 +0000
@@ -28,19 +28,23 @@
28 // TODO: load default pinned ones from default config, instead of hardcoding here...28 // TODO: load default pinned ones from default config, instead of hardcoding here...
2929
30 m_storedApps <<30 m_storedApps <<
31 QLatin1String("phone-app.desktop") <<31 QLatin1String("calendar-app.desktop") <<
32 QLatin1String("notes-app.desktop") <<
33 QLatin1String("ubuntu-weather-app.desktop") <<
34 QLatin1String("gmail-webapp.desktop") <<
35 QLatin1String("twitter-webapp.desktop") <<
36 QLatin1String("webbrowser-app.desktop") <<
37 QLatin1String("facebook-webapp.desktop") <<
38 QLatin1String("gallery-app.desktop") <<
32 QLatin1String("camera-app.desktop") <<39 QLatin1String("camera-app.desktop") <<
33 QLatin1String("gallery-app.desktop") <<40 QLatin1String("address-book-app.desktop") <<
34 QLatin1String("facebook-webapp.desktop") <<41 QLatin1String("messaging-app.desktop") <<
35 QLatin1String("webbrowser-app.desktop") <<42 QLatin1String("dialer-app.desktop");
36 QLatin1String("twitter-webapp.desktop") <<
37 QLatin1String("gmail-webapp.desktop") <<
38 QLatin1String("ubuntu-weather-app.desktop") <<
39 QLatin1String("notes-app.desktop") <<
40 QLatin1String("calendar-app.desktop");
4143
42 // TODO: get stuff from desktop files instead this hardcoded map44 // TODO: get stuff from desktop files instead this hardcoded map
43 m_displayNameMap.insert("phone-app.desktop", "Phone");45 m_displayNameMap.insert("dialer-app.desktop", "Dialer");
46 m_displayNameMap.insert("messaging-app.desktop", "Messaging");
47 m_displayNameMap.insert("address-book-app.desktop", "Contacts");
44 m_displayNameMap.insert("camera-app.desktop", "Camera");48 m_displayNameMap.insert("camera-app.desktop", "Camera");
45 m_displayNameMap.insert("gallery-app.desktop", "Gallery");49 m_displayNameMap.insert("gallery-app.desktop", "Gallery");
46 m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");50 m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");
@@ -52,7 +56,9 @@
52 m_displayNameMap.insert("calendar-app.desktop", "Calendar");56 m_displayNameMap.insert("calendar-app.desktop", "Calendar");
5357
54 // TODO: get stuff from desktop files instead this hardcoded map58 // TODO: get stuff from desktop files instead this hardcoded map
55 m_iconMap.insert("phone-app.desktop", "phone-app");59 m_iconMap.insert("dialer-app.desktop", "phone-app");
60 m_iconMap.insert("messaging-app.desktop", "messages-app");
61 m_iconMap.insert("address-book-app.desktop", "contacts-app");
56 m_iconMap.insert("camera-app.desktop", "camera");62 m_iconMap.insert("camera-app.desktop", "camera");
57 m_iconMap.insert("gallery-app.desktop", "gallery");63 m_iconMap.insert("gallery-app.desktop", "gallery");
58 m_iconMap.insert("facebook-webapp.desktop", "facebook");64 m_iconMap.insert("facebook-webapp.desktop", "facebook");

Subscribers

People subscribed via source and target branches