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

[Bill Filler]

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

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

[PS Jenkins bot (ps-jenkins)]

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)

[Michael Zanetti (mzanetti)]

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]

250. By Bill Filler on 2013-08-26

revert order of launcher icons to original order

Unmerged revisions

=== 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 @@
 
 ListModel {
     ListElement {
+        uri: "application:///usr/share/applications/dialer-app.desktop"
+        icon: "../../graphics/applicationIcons/phone-app.png"
+        category: 0
+        mimetype: "application/x-desktop"
+        title: "Dialer"
+        comment: ""
+        dndUri: "file:///usr/share/applications/dialer-app.desktop"
+        metadata: ""
+    }
+    ListElement {
+        uri: "application:///usr/share/applications/messaging-app.desktop"
+        icon: "../../graphics/applicationIcons/messages-app.png"
+        category: 0
+        mimetype: "application/x-desktop"
+        title: "Messaging"
+        comment: ""
+        dndUri: "file:///usr/share/applications/messaging-app.desktop"
+        metadata: ""
+    }
+    ListElement {
+        uri: "application:///usr/share/applications/address-book-app.desktop"
+        icon: "../../graphics/applicationIcons/contacts-app.png"
+        category: 0
+        mimetype: "application/x-desktop"
+        title: "Contacts"
+        comment: ""
+        dndUri: "file:///usr/share/applications/address-book-app.desktop"
+        metadata: ""
+    }
+    ListElement {
         uri: "application:///usr/share/applications/camera-app.desktop"
         icon: "../../graphics/applicationIcons/camera.png"
         category: 0
@@ -28,16 +58,6 @@
         metadata: ""
     }
     ListElement {
-        uri: "application:///usr/share/applications/phone-app.desktop"
-        icon: "../../graphics/applicationIcons/phone-app.png"
-        category: 0
-        mimetype: "application/x-desktop"
-        title: "Phone"
-        comment: ""
-        dndUri: "file:///usr/share/applications/phone-app.desktop"
-        metadata: ""
-    }
-    ListElement {
         uri: "application:///usr/share/applications/gallery-app.desktop"
         icon: "../../graphics/applicationIcons/gallery.png"
         category: 0
@@ -77,4 +97,14 @@
         dndUri: "file:///usr/share/applications/gmail-webapp.desktop"
         metadata: ""
     }
+    ListElement {
+        uri: "application:///usr/share/applications/ubuntu-system-settings.desktop"
+        icon: "../../graphics/applicationIcons/system-settings.png"
+        category: 0
+        mimetype: "application/x-desktop"
+        title: "System Settings"
+        comment: ""
+        dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"
+        metadata: ""
+    }
 }

=== added file 'graphics/applicationIcons/[e-mail]'
Binary files graphics/applicationIcons/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/applicationIcons/[e-mail]	2013-08-26 17:06:27 +0000 differ
=== added file 'graphics/applicationIcons/[e-mail]'
Binary files graphics/applicationIcons/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/applicationIcons/[e-mail]	2013-08-26 17:06:27 +0000 differ
=== added file 'graphics/applicationIcons/[e-mail]'
Binary files graphics/applicationIcons/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/applicationIcons/[e-mail]	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 @@
     // TODO: load default pinned ones from default config, instead of hardcoding here...
 
     m_storedApps <<
-        QLatin1String("phone-app.desktop") <<
+        QLatin1String("calendar-app.desktop") <<
+        QLatin1String("notes-app.desktop") <<
+        QLatin1String("ubuntu-weather-app.desktop") <<
+        QLatin1String("gmail-webapp.desktop") <<
+        QLatin1String("twitter-webapp.desktop") <<
+        QLatin1String("webbrowser-app.desktop") <<
+        QLatin1String("facebook-webapp.desktop") <<
+        QLatin1String("gallery-app.desktop") <<
         QLatin1String("camera-app.desktop") <<
-        QLatin1String("gallery-app.desktop") <<
-        QLatin1String("facebook-webapp.desktop") <<
-        QLatin1String("webbrowser-app.desktop") <<
-        QLatin1String("twitter-webapp.desktop") <<
-        QLatin1String("gmail-webapp.desktop") <<
-        QLatin1String("ubuntu-weather-app.desktop") <<
-        QLatin1String("notes-app.desktop") <<
-        QLatin1String("calendar-app.desktop");
+        QLatin1String("address-book-app.desktop") <<
+        QLatin1String("messaging-app.desktop") <<
+        QLatin1String("dialer-app.desktop");
 
     // TODO: get stuff from desktop files instead this hardcoded map
-    m_displayNameMap.insert("phone-app.desktop", "Phone");
+    m_displayNameMap.insert("dialer-app.desktop", "Dialer");
+    m_displayNameMap.insert("messaging-app.desktop", "Messaging");
+    m_displayNameMap.insert("address-book-app.desktop", "Contacts");
     m_displayNameMap.insert("camera-app.desktop", "Camera");
     m_displayNameMap.insert("gallery-app.desktop", "Gallery");
     m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");
@@ -52,7 +56,9 @@
     m_displayNameMap.insert("calendar-app.desktop", "Calendar");
 
     // TODO: get stuff from desktop files instead this hardcoded map
-    m_iconMap.insert("phone-app.desktop", "phone-app");
+    m_iconMap.insert("dialer-app.desktop", "phone-app");
+    m_iconMap.insert("messaging-app.desktop", "messages-app");
+    m_iconMap.insert("address-book-app.desktop", "contacts-app");
     m_iconMap.insert("camera-app.desktop", "camera");
     m_iconMap.insert("gallery-app.desktop", "gallery");
     m_iconMap.insert("facebook-webapp.desktop", "facebook");