Merge lp:~mzanetti/unity-api/mirsurface-appid into lp:unity-api

[Michael Zanetti]

add appId property to MirSurfaceInterface

[lp:~mzanetti/unity-api/mirsurface-appid]

280. By Michael Zanetti on 2017-03-15

Add appId property to MirSurfaceInterface

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-23 11:22:38 +0000
+++ debian/changelog	2017-03-15 16:51:45 +0000
@@ -1,3 +1,16 @@
+unity-api (8.6) UNRELEASED; urgency=medium
+
+  * Add appId property to MirSurfaceInterface
+
+ -- Michael Zanetti <[e-mail]>  Wed, 15 Mar 2017 17:38:36 +0100
+
+unity-api (8.5) zesty; urgency=medium
+
+  [ Michael Zanetti ]
+  * Add RoleIsPrivate to launcher's quicklist entries
+
+ -- Michael Zanetti <[e-mail]>  Fri, 24 Feb 2017 13:57:12 +0000
+
 unity-api (8.4+17.04.20170223-0ubuntu1) zesty; urgency=medium
 
   [ Pete Woods ]
 
=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2017-01-26 11:07:35 +0000
+++ include/unity/shell/application/CMakeLists.txt	2017-03-15 16:51:45 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 26)
+set(VERSION 27)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")
 
=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
--- include/unity/shell/application/MirSurfaceInterface.h	2017-01-26 11:07:35 +0000
+++ include/unity/shell/application/MirSurfaceInterface.h	2017-03-15 16:51:45 +0000
@@ -58,6 +58,11 @@
     Q_PROPERTY(QString persistentId READ persistentId CONSTANT)
 
     /**
+     * @brief App Id of the app this surface belongs to
+     */
+    Q_PROPERTY(QString appId READ appId CONSTANT)
+
+    /**
      * @brief Position of the current surface buffer, in pixels.
      */
     Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
@@ -188,6 +193,8 @@
 
     virtual QString persistentId() const = 0;
 
+    virtual QString appId() const = 0;
+
     virtual QPoint position() const = 0;
 
     virtual QSize size() const = 0;
 
=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
--- include/unity/shell/launcher/CMakeLists.txt	2016-11-30 10:43:52 +0000
+++ include/unity/shell/launcher/CMakeLists.txt	2017-03-15 16:51:45 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 11)
+set(VERSION 12)
 set(PKGCONFIG_NAME "unity-shell-launcher")
 set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")
 
=== modified file 'include/unity/shell/launcher/QuickListModelInterface.h'
--- include/unity/shell/launcher/QuickListModelInterface.h	2016-12-14 15:57:28 +0000
+++ include/unity/shell/launcher/QuickListModelInterface.h	2017-03-15 16:51:45 +0000
@@ -39,6 +39,7 @@
   * - RoleIcon (icon): The icon to be shown for this entry (QString).
   * - RoleClickable (clickable): Determines if the entry can be triggered or is just a static text (boolean)
   * - RoleHasSeparator (hasSeparator): Determines if the entry has a separator (boolean)
+  * - RoleIsPrivate (isPrivate): Determines whether the entry should be shown or not in locked mode (e.g. greeter is locked)
   */
 class UNITY_API QuickListModelInterface: public QAbstractListModel
 {
@@ -51,6 +52,7 @@
         m_roleNames.insert(RoleIcon, "icon");
         m_roleNames.insert(RoleClickable, "clickable");
         m_roleNames.insert(RoleHasSeparator, "hasSeparator");
+        m_roleNames.insert(RoleIsPrivate, "isPrivate");
     }
     /// @endcond
 public:
@@ -63,8 +65,10 @@
         RoleLabel,
         RoleIcon,
         RoleClickable,
-        RoleHasSeparator
+        RoleHasSeparator,
+        RoleIsPrivate
     };
+    Q_ENUM(Roles)
 
     /// @cond
     virtual ~QuickListModelInterface() {}
 
=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp	2016-10-28 11:14:37 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp	2017-03-15 16:51:45 +0000
@@ -39,6 +39,8 @@
         return true;
     case RoleHasSeparator:
         return true;
+    case RoleIsPrivate:
+        return false;
     }
     return QVariant();
 }
 
=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml	2016-11-30 10:38:23 +0000
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml	2017-03-15 16:51:45 +0000
@@ -175,7 +175,8 @@
                 { tag: "Model.roles[label]", role: "label", type: "string" },
                 { tag: "Model.roles[icon]", role: "icon", type: "string" },
                 { tag: "Model.roles[clickable]", role: "clickable", type: "boolean" },
-                { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" }
+                { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" },
+                { tag: "Model.roles[isPrivate]", role: "isPrivate", type: "boolean" }
             ];
         }