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
=== modified file 'debian/changelog'
--- debian/changelog 2017-04-05 13:41:15 +0000
+++ debian/changelog 2017-04-05 13:41:15 +0000
@@ -1,8 +1,9 @@
1unity-api (8.7) UNRELEASED; urgency=medium1unity-api (8.7) UNRELEASED; urgency=medium
22
3 * Add popularity field to LauncherItem3 * Add popularity field to LauncherItem
4 * Add LauncherItemInterface::description
45
5 -- Michael Zanetti <michael.zanetti@canonical.com> Tue, 04 Apr 2017 10:26:39 +02006 -- Lukáš Tinkl <lukas.tinkl@canonical.com> Tue, 4 Apr 2017 16:00:00 +0200
67
7unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium8unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium
89
910
=== modified file 'include/unity/shell/launcher/AppDrawerModelInterface.h'
--- include/unity/shell/launcher/AppDrawerModelInterface.h 2016-12-23 09:14:43 +0000
+++ include/unity/shell/launcher/AppDrawerModelInterface.h 2017-04-05 13:41:15 +0000
@@ -43,6 +43,7 @@
43 RoleName,43 RoleName,
44 RoleIcon,44 RoleIcon,
45 RoleKeywords,45 RoleKeywords,
46 RoleDescription,
46 RoleUsage47 RoleUsage
47 };48 };
48 Q_ENUM(Roles)49 Q_ENUM(Roles)
@@ -60,6 +61,7 @@
60 roles.insert(RoleName, "name");61 roles.insert(RoleName, "name");
61 roles.insert(RoleIcon, "icon");62 roles.insert(RoleIcon, "icon");
62 roles.insert(RoleKeywords, "keywords");63 roles.insert(RoleKeywords, "keywords");
64 roles.insert(RoleDescription, "description");
63 roles.insert(RoleUsage, "usage");65 roles.insert(RoleUsage, "usage");
64 return roles;66 return roles;
65 }67 }
6668
=== modified file 'include/unity/shell/launcher/LauncherItemInterface.h'
--- include/unity/shell/launcher/LauncherItemInterface.h 2017-04-05 13:41:15 +0000
+++ include/unity/shell/launcher/LauncherItemInterface.h 2017-04-05 13:41:15 +0000
@@ -52,6 +52,11 @@
52 Q_PROPERTY(QString name READ name NOTIFY nameChanged)52 Q_PROPERTY(QString name READ name NOTIFY nameChanged)
5353
54 /**54 /**
55 * @brief Textual description of the application
56 */
57 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
58
59 /**
55 * @brief The full path to the icon to be shown for the item.60 * @brief The full path to the icon to be shown for the item.
56 */61 */
57 Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)62 Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
@@ -145,6 +150,7 @@
145 virtual QString name() const = 0;150 virtual QString name() const = 0;
146 virtual QString icon() const = 0;151 virtual QString icon() const = 0;
147 virtual QStringList keywords() const = 0;152 virtual QStringList keywords() const = 0;
153 virtual QString description() const = 0;
148 virtual uint popularity() const = 0;154 virtual uint popularity() const = 0;
149 virtual bool pinned() const = 0;155 virtual bool pinned() const = 0;
150 virtual bool running() const = 0;156 virtual bool running() const = 0;
@@ -161,6 +167,7 @@
161 void nameChanged(const QString &name);167 void nameChanged(const QString &name);
162 void iconChanged(const QString &icon);168 void iconChanged(const QString &icon);
163 void keywordsChanged(const QStringList &keywords);169 void keywordsChanged(const QStringList &keywords);
170 void descriptionChanged(const QString &description);
164 void popularityChanged(uint popularity);171 void popularityChanged(uint popularity);
165 void pinnedChanged(bool pinned);172 void pinnedChanged(bool pinned);
166 void runningChanged(bool running);173 void runningChanged(bool running);
167174
=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp 2017-04-05 13:41:15 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp 2017-04-05 13:41:15 +0000
@@ -76,6 +76,19 @@
76 }76 }
77}77}
7878
79QString MockLauncherItem::description() const
80{
81 return m_description;
82}
83
84void MockLauncherItem::setDescription(const QString &description)
85{
86 if (m_description != description) {
87 m_description = description;
88 Q_EMIT descriptionChanged(m_description);
89 }
90}
91
79uint MockLauncherItem::popularity() const92uint MockLauncherItem::popularity() const
80{93{
81 return m_popularity;94 return m_popularity;
8295
=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h 2017-04-05 13:41:15 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h 2017-04-05 13:41:15 +0000
@@ -40,6 +40,9 @@
40 QStringList keywords() const override;40 QStringList keywords() const override;
41 void setKeywords(const QStringList &keywords);41 void setKeywords(const QStringList &keywords);
4242
43 QString description() const override;
44 void setDescription(const QString &description);
45
43 uint popularity() const override;46 uint popularity() const override;
44 void setPopularity(uint popularity);47 void setPopularity(uint popularity);
4548
@@ -76,6 +79,7 @@
76 QString m_name;79 QString m_name;
77 QString m_icon;80 QString m_icon;
78 QStringList m_keywords;81 QStringList m_keywords;
82 QString m_description;
79 uint m_popularity;83 uint m_popularity;
80 bool m_pinned;84 bool m_pinned;
81 bool m_running;85 bool m_running;
8286
=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml 2017-04-05 13:41:15 +0000
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml 2017-04-05 13:41:15 +0000
@@ -145,6 +145,7 @@
145 { tag: "Item.properties[name]", constant: "name", type: "string" },145 { tag: "Item.properties[name]", constant: "name", type: "string" },
146 { tag: "Item.properties[icon]", constant: "icon", type: "string" },146 { tag: "Item.properties[icon]", constant: "icon", type: "string" },
147 { tag: "Item.properties[keywords]", constant: "keywords", type: "object" },147 { tag: "Item.properties[keywords]", constant: "keywords", type: "object" },
148 { tag: "Item.properties[description]", constant: "description", type: "string" },
148 { tag: "Item.properties[popularity]", constant: "popularity", type: "number" },149 { tag: "Item.properties[popularity]", constant: "popularity", type: "number" },
149 { tag: "Item.properties[pinned]", property: "pinned", type: "boolean" },150 { tag: "Item.properties[pinned]", property: "pinned", type: "boolean" },
150 { tag: "Item.properties[recent]", property: "recent", type: "boolean" },151 { tag: "Item.properties[recent]", property: "recent", type: "boolean" },

Subscribers

People subscribed via source and target branches

to all changes: