Unity API

Merge lp:~lukas-kde/unity-api/launcheritem-description into lp:unity-api

  1. launcheritem-description
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Approved
Approved by: Albert Astals Cid
Approved revision: 286
Proposed branch: lp:~lukas-kde/unity-api/launcheritem-description
Merge into: lp:unity-api
Prerequisite: lp:~mzanetti/unity-api/launcheritems-popularity
Diff against target: 124 lines (+29/-1)
6 files modified
debian/changelog (+2/-1)
include/unity/shell/launcher/AppDrawerModelInterface.h (+2/-0)
include/unity/shell/launcher/LauncherItemInterface.h (+7/-0)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp (+13/-0)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h (+4/-0)
test/qmltest/unity/shell/launcher/tst_Launcher.qml (+1/-0)
To merge this branch: bzr merge lp:~lukas-kde/unity-api/launcheritem-description
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+321992@code.launchpad.net

This proposal supersedes a proposal from 2017-04-04.

Commit message

Add LauncherItemInterface::description

Description of the change

Add LauncherItemInterface::description

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

FAILED: Continuous integration, rev:281
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/174/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4880/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4908/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:281
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/175/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4881/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4909/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:281
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/176/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4892/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4920/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:282
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/178/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4901
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4929
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4737/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4737/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4737/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4737/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4737/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4737/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:285
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/179/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4904/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4932
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4739/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4739/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4739/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4739/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4739/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4739/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:286
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/180/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4905
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4933
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4741
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4741/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4741
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4741/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4741
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4741/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4741
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4741/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4741
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4741/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4741
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4741/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good.

review: Approve
Reply

Unmerged revisions

286. By Lukáš Tinkl

resolve conflict

285. By Lukáš Tinkl

add a property test

284. By Lukáš Tinkl

merge changelog

283. By Lukáš Tinkl

rebase on top of lp:~mzanetti/unity-api/launcheritems-popularity

282. By Lukáš Tinkl

validate changelog

281. By Lukáš Tinkl

Add LauncherItemInterface::description

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 2017-04-05 13:41:15 +0000
3+++ debian/changelog 2017-04-05 13:41:15 +0000
4@@ -1,8 +1,9 @@
5 unity-api (8.7) UNRELEASED; urgency=medium
6
7 * Add popularity field to LauncherItem
8+ * Add LauncherItemInterface::description
9
10- -- Michael Zanetti <michael.zanetti@canonical.com> Tue, 04 Apr 2017 10:26:39 +0200
11+ -- Lukáš Tinkl <lukas.tinkl@canonical.com> Tue, 4 Apr 2017 16:00:00 +0200
12
13 unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium
14
15
16=== modified file 'include/unity/shell/launcher/AppDrawerModelInterface.h'
17--- include/unity/shell/launcher/AppDrawerModelInterface.h 2016-12-23 09:14:43 +0000
18+++ include/unity/shell/launcher/AppDrawerModelInterface.h 2017-04-05 13:41:15 +0000
19@@ -43,6 +43,7 @@
20 RoleName,
21 RoleIcon,
22 RoleKeywords,
23+ RoleDescription,
24 RoleUsage
25 };
26 Q_ENUM(Roles)
27@@ -60,6 +61,7 @@
28 roles.insert(RoleName, "name");
29 roles.insert(RoleIcon, "icon");
30 roles.insert(RoleKeywords, "keywords");
31+ roles.insert(RoleDescription, "description");
32 roles.insert(RoleUsage, "usage");
33 return roles;
34 }
35
36=== modified file 'include/unity/shell/launcher/LauncherItemInterface.h'
37--- include/unity/shell/launcher/LauncherItemInterface.h 2017-04-05 13:41:15 +0000
38+++ include/unity/shell/launcher/LauncherItemInterface.h 2017-04-05 13:41:15 +0000
39@@ -52,6 +52,11 @@
40 Q_PROPERTY(QString name READ name NOTIFY nameChanged)
41
42 /**
43+ * @brief Textual description of the application
44+ */
45+ Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
46+
47+ /**
48 * @brief The full path to the icon to be shown for the item.
49 */
50 Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
51@@ -145,6 +150,7 @@
52 virtual QString name() const = 0;
53 virtual QString icon() const = 0;
54 virtual QStringList keywords() const = 0;
55+ virtual QString description() const = 0;
56 virtual uint popularity() const = 0;
57 virtual bool pinned() const = 0;
58 virtual bool running() const = 0;
59@@ -161,6 +167,7 @@
60 void nameChanged(const QString &name);
61 void iconChanged(const QString &icon);
62 void keywordsChanged(const QStringList &keywords);
63+ void descriptionChanged(const QString &description);
64 void popularityChanged(uint popularity);
65 void pinnedChanged(bool pinned);
66 void runningChanged(bool running);
67
68=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp'
69--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp 2017-04-05 13:41:15 +0000
70+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp 2017-04-05 13:41:15 +0000
71@@ -76,6 +76,19 @@
72 }
73 }
74
75+QString MockLauncherItem::description() const
76+{
77+ return m_description;
78+}
79+
80+void MockLauncherItem::setDescription(const QString &description)
81+{
82+ if (m_description != description) {
83+ m_description = description;
84+ Q_EMIT descriptionChanged(m_description);
85+ }
86+}
87+
88 uint MockLauncherItem::popularity() const
89 {
90 return m_popularity;
91
92=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h'
93--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h 2017-04-05 13:41:15 +0000
94+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h 2017-04-05 13:41:15 +0000
95@@ -40,6 +40,9 @@
96 QStringList keywords() const override;
97 void setKeywords(const QStringList &keywords);
98
99+ QString description() const override;
100+ void setDescription(const QString &description);
101+
102 uint popularity() const override;
103 void setPopularity(uint popularity);
104
105@@ -76,6 +79,7 @@
106 QString m_name;
107 QString m_icon;
108 QStringList m_keywords;
109+ QString m_description;
110 uint m_popularity;
111 bool m_pinned;
112 bool m_running;
113
114=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
115--- test/qmltest/unity/shell/launcher/tst_Launcher.qml 2017-04-05 13:41:15 +0000
116+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml 2017-04-05 13:41:15 +0000
117@@ -145,6 +145,7 @@
118 { tag: "Item.properties[name]", constant: "name", type: "string" },
119 { tag: "Item.properties[icon]", constant: "icon", type: "string" },
120 { tag: "Item.properties[keywords]", constant: "keywords", type: "object" },
121+ { tag: "Item.properties[description]", constant: "description", type: "string" },
122 { tag: "Item.properties[popularity]", constant: "popularity", type: "number" },
123 { tag: "Item.properties[pinned]", property: "pinned", type: "boolean" },
124 { tag: "Item.properties[recent]", property: "recent", type: "boolean" },

Subscribers

People subscribed via source and target branches

to all changes: