Merge lp:~nick-dedekind/unity-api/desktop_menus.gmenumodel into lp:unity-api

Proposed by Nick Dedekind
Status: Work in progress
Proposed branch: lp:~nick-dedekind/unity-api/desktop_menus.gmenumodel
Merge into: lp:unity-api
Diff against target: 66 lines (+23/-1)
3 files modified
debian/changelog (+7/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirSurfaceInterface.h (+15/-0)
To merge this branch: bzr merge lp:~nick-dedekind/unity-api/desktop_menus.gmenumodel
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity8 CI Bot continuous-integration Approve
Unity Team Pending
Review via email: mp+282728@code.launchpad.net

Commit message

Desktop Menus

Description of the change

Desktop Menus

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:205
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/5/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/5/rebuild

review: Approve (continuous-integration)
206. By Nick Dedekind

merged with trunk

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:206
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/6/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/6/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

206. By Nick Dedekind

merged with trunk

205. By Nick Dedekind

dbusMenuInfo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-01-04 15:09:55 +0000
3+++ debian/changelog 2016-01-15 12:27:16 +0000
4@@ -1,3 +1,10 @@
5+unity-api (7.106-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [ Nick Dedekind ]
8+ * Added dbus menu name & path
9+
10+ -- Nick Dedekind <nick.dedekind@canonical.com> Fri, 15 Jan 2016 12:26:08 +0000
11+
12 unity-api (7.105+16.04.20160104-0ubuntu1) xenial; urgency=medium
13
14 [ Michael Zanetti ]
15
16=== modified file 'include/unity/shell/application/CMakeLists.txt'
17--- include/unity/shell/application/CMakeLists.txt 2015-12-03 19:32:37 +0000
18+++ include/unity/shell/application/CMakeLists.txt 2016-01-15 12:27:16 +0000
19@@ -7,7 +7,7 @@
20
21 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
22
23-set(VERSION 12)
24+set(VERSION 13)
25 set(PKGCONFIG_NAME "unity-shell-application")
26 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
27 set(PKGCONFIG_REQUIRES "Qt5Core")
28
29=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
30--- include/unity/shell/application/MirSurfaceInterface.h 2015-10-26 18:26:01 +0000
31+++ include/unity/shell/application/MirSurfaceInterface.h 2016-01-15 12:27:16 +0000
32@@ -78,6 +78,16 @@
33 Q_PROPERTY(Mir::OrientationAngle orientationAngle READ orientationAngle WRITE setOrientationAngle
34 NOTIFY orientationAngleChanged DESIGNABLE false)
35
36+ /**
37+ * @brief DBus menu name of the surface, given by the client application
38+ */
39+ Q_PROPERTY(QString dbusMenuName READ dbusMenuName NOTIFY dbusMenuNameChanged)
40+
41+ /**
42+ * @brief DBus menu object path of the surface, given by the client application
43+ */
44+ Q_PROPERTY(QString dbusMenuObjectPath READ dbusMenuObjectPath NOTIFY dbusMenuObjectPathChanged)
45+
46 public:
47 /// @cond
48 MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
49@@ -100,6 +110,9 @@
50
51 virtual Mir::OrientationAngle orientationAngle() const = 0;
52 virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
53+
54+ virtual QString dbusMenuName() const = 0;
55+ virtual QString dbusMenuObjectPath() const = 0;
56 /// @endcond
57
58 Q_SIGNALS:
59@@ -111,6 +124,8 @@
60 void orientationAngleChanged(Mir::OrientationAngle value);
61 void sizeChanged(const QSize &value);
62 void nameChanged(const QString &name);
63+ void dbusMenuNameChanged(const QString& dbusMenuName);
64+ void dbusMenuObjectPathChanged(const QString& dbusMenuObjectPath);
65 /// @endcond
66 };
67

Subscribers

People subscribed via source and target branches

to all changes: