1
=== modified file 'debian/changelog'
2
--- debian/changelog	2017-02-23 11:22:38 +0000
3
+++ debian/changelog	2017-02-27 11:42:12 +0000
4
@@ -1,3 +1,10 @@
5
1
unity-api (8.5) zesty; urgency=medium
6
2
7
3
  [ Michael Zanetti ]
8
4
  * Add RoleIsPrivate to launcher's quicklist entries
9
5
10
6
 -- Michael Zanetti <michael.zanetti@canonical.com>  Fri, 24 Feb 2017 13:57:12 +0000
11
7
12
1
unity-api (8.4+17.04.20170223-0ubuntu1) zesty; urgency=medium
8
unity-api (8.4+17.04.20170223-0ubuntu1) zesty; urgency=medium
13
2
9
14
3
  [ Pete Woods ]
10
  [ Pete Woods ]
15
4
11
16
=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
17
--- include/unity/shell/launcher/CMakeLists.txt	2016-11-30 10:43:52 +0000
18
+++ include/unity/shell/launcher/CMakeLists.txt	2017-02-27 11:42:12 +0000
19
@@ -7,7 +7,7 @@
20
7
7
21
8
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
8
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
22
9
9
24
10
set(VERSION 11)
10
set(VERSION 12)
25
11
set(PKGCONFIG_NAME "unity-shell-launcher")
11
set(PKGCONFIG_NAME "unity-shell-launcher")
26
12
set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
12
set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
27
13
set(PKGCONFIG_REQUIRES "Qt5Core")
13
set(PKGCONFIG_REQUIRES "Qt5Core")
28
14
14
29
=== modified file 'include/unity/shell/launcher/QuickListModelInterface.h'
30
--- include/unity/shell/launcher/QuickListModelInterface.h	2016-12-14 15:57:28 +0000
31
+++ include/unity/shell/launcher/QuickListModelInterface.h	2017-02-27 11:42:12 +0000
32
@@ -39,6 +39,7 @@
33
39
  * - RoleIcon (icon): The icon to be shown for this entry (QString).
39
  * - RoleIcon (icon): The icon to be shown for this entry (QString).
34
40
  * - RoleClickable (clickable): Determines if the entry can be triggered or is just a static text (boolean)
40
  * - RoleClickable (clickable): Determines if the entry can be triggered or is just a static text (boolean)
35
41
  * - RoleHasSeparator (hasSeparator): Determines if the entry has a separator (boolean)
41
  * - RoleHasSeparator (hasSeparator): Determines if the entry has a separator (boolean)
36
42
  * - RoleIsPrivate (isPrivate): Determines whether the entry should be shown or not in locked mode (e.g. greeter is locked)
37
42
  */
43
  */
38
43
class UNITY_API QuickListModelInterface: public QAbstractListModel
44
class UNITY_API QuickListModelInterface: public QAbstractListModel
39
44
{
45
{
40
@@ -51,6 +52,7 @@
41
51
        m_roleNames.insert(RoleIcon, "icon");
52
        m_roleNames.insert(RoleIcon, "icon");
42
52
        m_roleNames.insert(RoleClickable, "clickable");
53
        m_roleNames.insert(RoleClickable, "clickable");
43
53
        m_roleNames.insert(RoleHasSeparator, "hasSeparator");
54
        m_roleNames.insert(RoleHasSeparator, "hasSeparator");
44
55
        m_roleNames.insert(RoleIsPrivate, "isPrivate");
45
54
    }
56
    }
46
55
    /// @endcond
57
    /// @endcond
47
56
public:
58
public:
48
@@ -63,8 +65,10 @@
49
63
        RoleLabel,
65
        RoleLabel,
50
64
        RoleIcon,
66
        RoleIcon,
51
65
        RoleClickable,
67
        RoleClickable,
53
66
        RoleHasSeparator
68
        RoleHasSeparator,
54
69
        RoleIsPrivate
55
67
    };
70
    };
56
71
    Q_ENUM(Roles)
57
68
72
58
69
    /// @cond
73
    /// @cond
59
70
    virtual ~QuickListModelInterface() {}
74
    virtual ~QuickListModelInterface() {}
60
71
75
61
=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp'
62
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp	2016-10-28 11:14:37 +0000
63
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp	2017-02-27 11:42:12 +0000
64
@@ -39,6 +39,8 @@
65
39
        return true;
39
        return true;
66
40
    case RoleHasSeparator:
40
    case RoleHasSeparator:
67
41
        return true;
41
        return true;
68
42
    case RoleIsPrivate:
69
43
        return false;
70
42
    }
44
    }
71
43
    return QVariant();
45
    return QVariant();
72
44
}
46
}
73
45
47
74
=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
75
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml	2016-11-30 10:38:23 +0000
76
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml	2017-02-27 11:42:12 +0000
77
@@ -175,7 +175,8 @@
78
175
                { tag: "Model.roles[label]", role: "label", type: "string" },
175
                { tag: "Model.roles[label]", role: "label", type: "string" },
79
176
                { tag: "Model.roles[icon]", role: "icon", type: "string" },
176
                { tag: "Model.roles[icon]", role: "icon", type: "string" },
80
177
                { tag: "Model.roles[clickable]", role: "clickable", type: "boolean" },
177
                { tag: "Model.roles[clickable]", role: "clickable", type: "boolean" },
82
178
                { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" }
178
                { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" },
83
179
                { tag: "Model.roles[isPrivate]", role: "isPrivate", type: "boolean" }
84
179
            ];
180
            ];
85
180
        }
181
        }
86
181
182
Status:	Merged
Approved by:	Albert Astals Cid on 2017-02-27
Approved revision:	279
Merged at revision:	276
Proposed branch:	lp:~mzanetti/unity-api/private-quicklist-entries
Merge into:	lp:unity-api
Diff against target:	85 lines (+17/-3) 5 files modified debian/changelog (+7/-0) include/unity/shell/launcher/CMakeLists.txt (+1/-1) include/unity/shell/launcher/QuickListModelInterface.h (+5/-1) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp (+2/-0) test/qmltest/unity/shell/launcher/tst_Launcher.qml (+2/-1)
To merge this branch:	bzr merge lp:~mzanetti/unity-api/private-quicklist-entries
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2017-02-24	Approve on 2017-02-27
Unity8 CI Bot	continuous-integration		Approve on 2017-02-27
Review via email: mp+318220@code.launchpad.net