Merge lp:~gerboland/unity-mir/add-focus-requested-signal into lp:unity-mir

[Gerry Boland]

Add focusRequested signal for all apps, and allow shell to override application stage at any time, so shell can properly deal with apps it did not launch itself.

Add focusRequested signal for all apps, and allow shell to override application stage at any time, so shell can properly deal with apps it did not launch itself.

[lp:~gerboland/unity-mir/add-focus-requested-signal]

116. By Gerry Boland on 2013-10-11

Remove debug

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/108

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/108/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

You now have two focusRequested signals. How does QML handle two signals with the same name? I've never tried, but I wouldn't think well, since you can't specify a signal signature...

We could just drop the older one, it's deprecated and unused.

[lp:~gerboland/unity-mir/add-focus-requested-signal]

117. By Gerry Boland on 2013-10-11

Remove Favourite Application enum and focusRequester

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/110

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/110/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2013-09-27 10:20:47 +0000
+++ src/modules/Unity/Application/application.h	2013-10-11 14:40:09 +0000
@@ -40,6 +40,7 @@
     Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
     Q_PROPERTY(QString exec READ exec CONSTANT)
     Q_PROPERTY(bool fullscreen READ fullscreen NOTIFY fullscreenChanged)
+    Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
 
 public:
     Application(const QString &appId, State state, const QStringList &arguments, QObject *parent = 0);
@@ -55,6 +56,8 @@
     State state() const override;
     bool focused() const override;
 
+    void setStage(Stage stage);
+
     bool isValid() const;
     QString desktopFile() const;
     QString exec() const;
@@ -68,11 +71,11 @@
 
 Q_SIGNALS:
     void fullscreenChanged();
+    void stageChanged(Stage stage);
 
 private:
     pid_t pid() const;
     void setPid(pid_t pid);
-    void setStage(Stage stage);
     void setState(State state);
     void setFocused(bool focus);
     void setFullscreen(bool fullscreen);

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2013-10-11 13:25:59 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2013-10-11 14:40:09 +0000
@@ -238,6 +238,7 @@
             return;
         }
         add(application);
+        Q_EMIT focusRequested(appId);
     }
 }
 
@@ -314,7 +315,7 @@
 {
     DLOG("ApplicationManager::onFocusRequested (this=%p, appId=%s)", this, qPrintable(appId));
 
-    focusApplication(appId);
+    Q_EMIT focusRequested(appId);
 }
 
 void ApplicationManager::onResumeRequested(const QString& appId)
@@ -533,6 +534,8 @@
 
 void ApplicationManager::setFocused(Application *application)
 {
+    DLOG("ApplicationManager::setFocused (appId=%s)", qPrintable(application->appId()));
+
     if (application == m_focusedApplication)
         return;
 

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2013-10-02 20:58:18 +0000
+++ src/modules/Unity/Application/application_manager.h	2013-10-11 14:40:09 +0000
@@ -46,14 +46,10 @@
 class ApplicationManager : public unity::shell::application::ApplicationManagerInterface
 {
     Q_OBJECT
-    Q_ENUMS(FavoriteApplication)
     Q_FLAGS(ExecFlags)
 
 public:
     // Mapping enums to Ubuntu Platform API enums.
-    enum FavoriteApplication {
-      CameraApplication, GalleryApplication, BrowserApplication, ShareApplication
-    };
     enum Flag {
         NoFlag = 0x0,
         ForceMainStage = 0x1,
@@ -101,7 +97,7 @@
     void onResumeRequested(const QString& appId);
 
 Q_SIGNALS:
-    void focusRequested(FavoriteApplication favoriteApplication);
+    void focusRequested(const QString &appId);
 
 private:
     void setFocused(Application *application);

=== modified file 'tests/application/Application.qml'
--- tests/application/Application.qml	2013-06-17 20:05:34 +0000
+++ tests/application/Application.qml	2013-10-11 14:40:09 +0000
@@ -38,9 +38,6 @@
 // An application can be stopped by using:
 //     ApplicationManager.stopProcess(application)
 //
-// In order to focus or start a favorite application, that function can be used:
-//     ApplicationManager.focusFavoriteApplication(ApplicationManager.GalleryApplication);
-//
 // A good way to use Application.qml is to launch it using:
 //     qmlscene-ubuntu --fullscreen --session 1 --role 0 Application.qml
 // and then to launch other applications using:
@@ -59,18 +56,7 @@
     Connections {
         target: ApplicationManager
         onFocusRequested: {
-            var favoriteApplicationStr = [
-                'CameraApplication', 'GalleryApplication', 'BrowserApplication', 'ShareApplication'
-            ];
-            print("focus request:", favoriteApplicationStr[favoriteApplication])
-        }
-    }
-
-    MouseArea {
-        id: touchArea
-        anchors.fill: parent
-        onClicked: {
-            // ApplicationManager.focusFavoriteApplication(ApplicationManager.BrowserApplication);
+            print("focus request:", appId)
         }
     }