Merge lp:~mzanetti/unity-api/launcher-onlyPinned into lp:unity-api

[Michael Zanetti]

add an onlyPinned property to the launcher's api

 * Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~mzanetti/unity8/as-based-launcher-for-split-greeter/+merge/244553

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

yes

 * If you changed the UI, has there been a design review?

n/a

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/unity-api-ci/284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/284/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Looks OK to me

review: Approve

[Michał Sawicz (saviq)]

Please bump Version in include/unity/shell/launcher/CMakeLists.txt.

review: Needs Fixing

[lp:~mzanetti/unity-api/launcher-onlyPinned]

167. By Michael Zanetti on 2015-02-11

bump launcher api version

[Michael Zanetti (mzanetti)]

> Please bump Version in include/unity/shell/launcher/CMakeLists.txt.

done

[Michał Sawicz (saviq)]

review: Approve (packaging)

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-05 10:51:44 +0000
+++ debian/changelog	2015-02-11 13:41:37 +0000
@@ -1,3 +1,9 @@
+unity-api (7.95) UNRELEASED; urgency=medium
+
+  * add onlyPinned property to launcher model
+
+ -- Michael Zanetti <[e-mail]>  Mon, 09 Feb 2015 18:16:30 +0100
+
 unity-api (7.94+15.04.20141205-0ubuntu1) vivid; urgency=medium
 
   [ Albert Astals Cid ]

=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
--- include/unity/shell/launcher/CMakeLists.txt	2014-10-06 14:06:42 +0000
+++ include/unity/shell/launcher/CMakeLists.txt	2015-02-11 13:41:37 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 5)
+set(VERSION 6)
 set(PKGCONFIG_NAME "unity-shell-launcher")
 set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/launcher/LauncherModelInterface.h'
--- include/unity/shell/launcher/LauncherModelInterface.h	2014-10-21 18:03:55 +0000
+++ include/unity/shell/launcher/LauncherModelInterface.h	2015-02-11 13:41:37 +0000
@@ -54,6 +54,11 @@
     Q_PROPERTY(unity::shell::application::ApplicationManagerInterface* applicationManager
                READ applicationManager WRITE setApplicationManager NOTIFY applicationManagerChanged)
 
+    /**
+     * @brief Only show pinned apps, hiding the unpinned running/recent ones.
+     */
+    Q_PROPERTY(bool onlyPinned READ onlyPinned WRITE setOnlyPinned NOTIFY onlyPinnedChanged)
+
 protected:
     /// @cond
     LauncherModelInterface(QObject *parent = 0): QAbstractListModel(parent) {
@@ -154,6 +159,9 @@
     virtual unity::shell::application::ApplicationManagerInterface *applicationManager() const = 0;
     virtual void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager) = 0;
 
+    virtual bool onlyPinned() const = 0;
+    virtual void setOnlyPinned(bool onlyPinned) = 0;
+
     virtual QHash<int, QByteArray> roleNames() const
     {
         return m_roleNames;
@@ -163,6 +171,7 @@
 Q_SIGNALS:
     /// @cond
     void applicationManagerChanged();
+    void onlyPinnedChanged();
     /// @endcond
 
     /**

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp	2014-08-26 13:02:32 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp	2015-02-11 13:41:37 +0000
@@ -141,3 +141,13 @@
 {
     Q_UNUSED(applicationManager)
 }
+
+bool MockLauncherModel::onlyPinned() const
+{
+    return false;
+}
+
+void MockLauncherModel::setOnlyPinned(bool onlyPinned)
+{
+    Q_UNUSED(onlyPinned)
+}

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h	2013-09-11 15:28:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h	2015-02-11 13:41:37 +0000
@@ -49,6 +49,9 @@
     unity::shell::application::ApplicationManagerInterface *applicationManager() const;
     void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
 
+    bool onlyPinned() const override;
+    void setOnlyPinned(bool onlyPinned) override;
+
 private:
     int findApp(const QString &appId);
 

=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml	2014-08-26 13:02:32 +0000
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml	2015-02-11 13:41:37 +0000
@@ -121,6 +121,7 @@
         function test_model_properties_data() {
             return [
                 { tag: "Model.properties[applicationManager]", property: "applicationManager", type: "unity::shell::application::ApplicationManagerInterface" },
+                { tag: "Model.properties[onlyPinned]", property: "onlyPinned", type: "boolean" },
             ];
         }