Merge lp:~sergiusens/unity/replace_mocks into lp:unity/phablet

[Sergio Schvezov]

Replacing the music and ski safari mock apps with calendar and weather in
the launcher.

I replaced the music and ski safari mock apps with the weather and calendar apps.

I did not delete the icons in graphics/applicationIcons though for the replaced apps as I see others not used in the launcher are still there too.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:685
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1005/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/979
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/880
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/880/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1614

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'Applications/applications.js'
--- Applications/applications.js	2013-05-21 11:49:22 +0000
+++ Applications/applications.js	2013-05-22 21:28:25 +0000
@@ -58,10 +58,11 @@
         'icon': 'gmail',
         'exec': '/usr/bin/webbrowser-app --chromeless http://m.gmail.com'
     },
-    '/usr/share/applications/music-player-mockapp.desktop': {
-        'name': 'Music',
-        'icon': 'music',
-        'exec': '/usr/bin/qmlscene /usr/share/demo-mock-apps/music.qml'
+    '/usr/share/applications/ubuntu-weather-app.desktop': {
+        'name': 'Weather',
+        'icon': 'weather',
+        'exec': '/usr/bin/qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml',
+        'stage': SideStage
     },
     '/usr/share/applications/notes-app.desktop': {
         'name': 'Notepad',
@@ -69,10 +70,11 @@
         'exec': '/usr/bin/qmlscene /usr/share/notes-app/NotesApp.qml',
         'stage': SideStage
     },
-    '/usr/share/applications/ski-safari-mockapp.desktop': {
-        'name': 'Ski Safari',
-        'icon': 'ski_safari',
-        'exec': '/usr/bin/qmlscene /usr/share/demo-mock-apps/ski-safari.qml'
+    '/usr/share/applications/ubuntu-calendar-app.desktop': {
+        'name': 'Calendar',
+        'icon': 'calendar',
+        'exec': '/usr/bin/qmlscene /usr/share/ubuntu-calendar-app/calendar.qml',
+        'stage': SideStage
     },
     '/usr/share/applications/mediaplayer-app.desktop': {
         'name': 'Media Player',

=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml	2013-05-21 11:49:22 +0000
+++ Launcher/Launcher.qml	2013-05-22 21:28:25 +0000
@@ -29,9 +29,9 @@
                               "/usr/share/applications/webbrowser-app.desktop",
                               "/usr/share/applications/twitter-webapp.desktop",
                               "/usr/share/applications/gmail-webapp.desktop",
-                              "/usr/share/applications/music-player-mockapp.desktop",
+                              "/usr/share/applications/ubuntu-weather-app.desktop",
                               "/usr/share/applications/notes-app.desktop",
-                              "/usr/share/applications/ski-safari-mockapp.desktop"]
+                              "/usr/share/applications/ubuntu-calendar-app.desktop"]
     property ListModel model: ListModel {}
     property ListModel applicationsRunning: ListModel {}
     property ListModel gadgetsRunning: ListModel {}

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-22 03:22:19 +0000
+++ debian/changelog	2013-05-22 21:28:25 +0000
@@ -1,3 +1,10 @@
+qml-phone-shell (1.78) UNRELEASED; urgency=low
+
+  * Replacing the music and ski safari mock apps with calendar and weather in 
+    the launcher (LP: #1178262).
+
+ -- Sergio Schvezov <[e-mail]>  Wed, 22 May 2013 17:34:27 -0300
+
 qml-phone-shell (1.77) raring; urgency=low
 
   [ Mathieu Trudel-Lapierre ]

=== 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-05-22 21:28:25 +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-05-22 21:28:25 +0000 differ
=== modified file 'tests/mocks/Ubuntu/Application/ApplicationManager.cpp'
--- tests/mocks/Ubuntu/Application/ApplicationManager.cpp	2013-05-21 11:49:22 +0000
+++ tests/mocks/Ubuntu/Application/ApplicationManager.cpp	2013-05-22 21:28:25 +0000
@@ -302,10 +302,11 @@
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
-    application->setDesktopFile("/usr/share/applications/music-player-mockapp.desktop");
-    application->setName("Music");
-    application->setIcon("music");
-    application->setExec("/usr/bin/qmlscene /usr/share/demo-mock-apps/music.qml");
+    application->setDesktopFile("/usr/share/applications/ubuntu-weather-app.desktop");
+    application->setName("Weather");
+    application->setIcon("weather");
+    application->setExec("/usr/bin/qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml");
+    application->setStage(ApplicationInfo::SideStage);
     application->setHandle(nextHandle++);
     generateQmlStrings(application);
     m_availableApplications.append(application);
@@ -320,10 +321,11 @@
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
-    application->setDesktopFile("/usr/share/applications/ski-safari-mockapp.desktop");
-    application->setName("Ski Safari");
-    application->setIcon("ski_safari");
-    application->setExec("/usr/bin/qmlscene /usr/share/demo-mock-apps/ski-safari.qml");
+    application->setDesktopFile("/usr/share/applications/ubuntu-calendar-app.desktop");
+    application->setName("Calendar");
+    application->setIcon("calendar");
+    application->setExec("/usr/bin/qmlscene /usr/share/ubuntu-calendar-app/calendar.qml");
+    application->setStage(ApplicationInfo::SideStage);
     application->setHandle(nextHandle++);
     m_availableApplications.append(application);