1
=== modified file 'debian/changelog'
2
--- debian/changelog	2016-05-25 06:02:38 +0000
3
+++ debian/changelog	2016-06-03 11:15:53 +0000
4
@@ -1,3 +1,9 @@
5
1
unity-api (7.114) UNRELEASED; urgency=medium
6
2
7
3
  * Add ApplicationInfoInterface::surfaceCount property
8
4
9
5
 -- Michael Zanetti <michael.zanetti@canonical.com>  Mon, 09 May 2016 18:43:38 +0200
10
6
11
1
unity-api (7.113+16.10.20160525-0ubuntu1) yakkety; urgency=medium
7
unity-api (7.113+16.10.20160525-0ubuntu1) yakkety; urgency=medium
12
2
8
13
3
  [ Daniel d'Andrada ]
9
  [ Daniel d'Andrada ]
14
4
10
15
=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
16
--- include/unity/shell/application/ApplicationInfoInterface.h	2016-05-17 12:55:00 +0000
17
+++ include/unity/shell/application/ApplicationInfoInterface.h	2016-06-03 11:15:53 +0000
18
@@ -229,6 +229,16 @@
19
229
     */
229
     */
20
230
    Q_PROPERTY(unity::shell::application::MirSurfaceListInterface* promptSurfaceList READ promptSurfaceList CONSTANT)
230
    Q_PROPERTY(unity::shell::application::MirSurfaceListInterface* promptSurfaceList READ promptSurfaceList CONSTANT)
21
231
231
22
232
    /**
23
233
     * @brief Count of application's surfaces
24
234
     *
25
235
     * This is a convenience property and will always be the same as surfaceList->count().
26
236
     * It allows to connect to an application and listen for surface creations/removals for
27
237
     * that particular application without having to keep track of the
28
238
     * application <-> surfaceList relationship.
29
239
     */
30
240
     Q_PROPERTY(int surfaceCount READ surfaceCount NOTIFY surfaceCountChanged)
31
241
32
232
protected:
242
protected:
33
233
    /// @cond
243
    /// @cond
34
234
    ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
244
    ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
35
@@ -305,8 +315,9 @@
36
305
    virtual void setExemptFromLifecycle(bool) = 0;
315
    virtual void setExemptFromLifecycle(bool) = 0;
37
306
    virtual QSize initialSurfaceSize() const = 0;
316
    virtual QSize initialSurfaceSize() const = 0;
38
307
    virtual void setInitialSurfaceSize(const QSize &size) = 0;
317
    virtual void setInitialSurfaceSize(const QSize &size) = 0;
41
308
    virtual MirSurfaceListInterface* surfaceList() = 0;
318
    virtual MirSurfaceListInterface* surfaceList() const = 0;
42
309
    virtual MirSurfaceListInterface* promptSurfaceList() = 0;
319
    virtual MirSurfaceListInterface* promptSurfaceList() const = 0;
43
320
    virtual int surfaceCount() const = 0;
44
310
    /// @endcond
321
    /// @endcond
45
311
322
46
312
Q_SIGNALS:
323
Q_SIGNALS:
47
@@ -320,6 +331,7 @@
48
320
    void focusedChanged(bool focused);
331
    void focusedChanged(bool focused);
49
321
    void exemptFromLifecycleChanged(bool exemptFromLifecycle);
332
    void exemptFromLifecycleChanged(bool exemptFromLifecycle);
50
322
    void initialSurfaceSizeChanged(const QSize &size);
333
    void initialSurfaceSizeChanged(const QSize &size);
51
334
    void surfaceCountChanged(int surfaceCount);
52
323
    /// @endcond
335
    /// @endcond
53
324
336
54
325
    /**
337
    /**
55
326
338
56
=== modified file 'include/unity/shell/application/CMakeLists.txt'
57
--- include/unity/shell/application/CMakeLists.txt	2016-05-18 20:51:23 +0000
58
+++ include/unity/shell/application/CMakeLists.txt	2016-06-03 11:15:53 +0000
59
@@ -7,7 +7,7 @@
60
7
7
61
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)
62
9
9
64
10
set(VERSION 17)
10
set(VERSION 18)
65
11
set(PKGCONFIG_NAME "unity-shell-application")
11
set(PKGCONFIG_NAME "unity-shell-application")
66
12
set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
12
set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
67
13
set(PKGCONFIG_REQUIRES "Qt5Core")
13
set(PKGCONFIG_REQUIRES "Qt5Core")
68
14
14
69
=== modified file 'include/unity/shell/application/MirSurfaceListInterface.h'
70
--- include/unity/shell/application/MirSurfaceListInterface.h	2016-05-25 06:02:36 +0000
71
+++ include/unity/shell/application/MirSurfaceListInterface.h	2016-06-03 11:15:53 +0000
72
@@ -89,7 +89,7 @@
73
89
89
74
90
Q_SIGNALS:
90
Q_SIGNALS:
75
91
    /// @cond
91
    /// @cond
77
92
    void countChanged();
92
    void countChanged(int count);
78
93
    void firstChanged();
93
    void firstChanged();
79
94
    /// @endcond
94
    /// @endcond
80
95
};
95
};
81
96
96
82
=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
83
--- include/unity/shell/launcher/CMakeLists.txt	2015-06-19 16:13:00 +0000
84
+++ include/unity/shell/launcher/CMakeLists.txt	2016-06-03 11:15:53 +0000
85
@@ -7,7 +7,7 @@
86
7
7
87
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)
88
9
9
90
10
set(VERSION 7)
10
set(VERSION 8)
91
11
set(PKGCONFIG_NAME "unity-shell-launcher")
11
set(PKGCONFIG_NAME "unity-shell-launcher")
92
12
set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
12
set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
93
13
set(PKGCONFIG_REQUIRES "Qt5Core")
13
set(PKGCONFIG_REQUIRES "Qt5Core")
94
14
14
95
=== modified file 'include/unity/shell/launcher/LauncherItemInterface.h'
96
--- include/unity/shell/launcher/LauncherItemInterface.h	2015-06-12 11:06:29 +0000
97
+++ include/unity/shell/launcher/LauncherItemInterface.h	2016-06-03 11:15:53 +0000
98
@@ -112,6 +112,13 @@
99
112
    Q_PROPERTY(bool alerting READ alerting NOTIFY alertingChanged)
112
    Q_PROPERTY(bool alerting READ alerting NOTIFY alertingChanged)
100
113
113
101
114
    /**
114
    /**
102
115
     * @brief The number of surfaces that this application entry has opened
103
116
     *
104
117
     * The Launcher will display up to 3 pips, one for each surface
105
118
     */
106
119
    Q_PROPERTY(int surfaceCount READ surfaceCount NOTIFY surfaceCountChanged)
107
120
108
121
    /**
109
115
     * @brief The quick list menu contents for the item
122
     * @brief The quick list menu contents for the item
110
116
     *
123
     *
111
117
     * Items can have a quick list menu. This property holds a model for
124
     * Items can have a quick list menu. This property holds a model for
112
@@ -138,6 +145,7 @@
113
138
    virtual bool countVisible() const = 0;
145
    virtual bool countVisible() const = 0;
114
139
    virtual bool focused() const = 0;
146
    virtual bool focused() const = 0;
115
140
    virtual bool alerting() const = 0;
147
    virtual bool alerting() const = 0;
116
148
    virtual int surfaceCount() const = 0;
117
141
    virtual unity::shell::launcher::QuickListModelInterface *quickList() const = 0;
149
    virtual unity::shell::launcher::QuickListModelInterface *quickList() const = 0;
118
142
150
119
143
Q_SIGNALS:
151
Q_SIGNALS:
120
@@ -151,6 +159,7 @@
121
151
    void countVisibleChanged(bool countVisible);
159
    void countVisibleChanged(bool countVisible);
122
152
    void focusedChanged(bool focused);
160
    void focusedChanged(bool focused);
123
153
    void alertingChanged(bool alerting);
161
    void alertingChanged(bool alerting);
124
162
    void surfaceCountChanged(int surfaceCount);
125
154
    /// @endcond
163
    /// @endcond
126
155
};
164
};
127
156
165
128
157
166
129
=== modified file 'include/unity/shell/launcher/LauncherModelInterface.h'
130
--- include/unity/shell/launcher/LauncherModelInterface.h	2015-06-19 16:13:00 +0000
131
+++ include/unity/shell/launcher/LauncherModelInterface.h	2016-06-03 11:15:53 +0000
132
@@ -73,6 +73,7 @@
133
73
        m_roleNames.insert(RoleCountVisible, "countVisible");
73
        m_roleNames.insert(RoleCountVisible, "countVisible");
134
74
        m_roleNames.insert(RoleFocused, "focused");
74
        m_roleNames.insert(RoleFocused, "focused");
135
75
        m_roleNames.insert(RoleAlerting, "alerting");
75
        m_roleNames.insert(RoleAlerting, "alerting");
136
76
        m_roleNames.insert(RoleSurfaceCount, "surfaceCount");
137
76
    }
77
    }
138
77
    /// @endcond
78
    /// @endcond
139
78
79
140
@@ -93,7 +94,8 @@
141
93
        RoleCount,
94
        RoleCount,
142
94
        RoleCountVisible,
95
        RoleCountVisible,
143
95
        RoleFocused,
96
        RoleFocused,
145
96
        RoleAlerting
97
        RoleAlerting,
146
98
        RoleSurfaceCount
147
97
    };
99
    };
148
98
100
149
99
    virtual ~LauncherModelInterface() {}
101
    virtual ~LauncherModelInterface() {}
150
100
102
151
=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp'
152
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2015-12-03 17:07:15 +0000
153
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2016-06-03 11:15:53 +0000
154
@@ -164,3 +164,8 @@
155
164
        Q_EMIT exemptFromLifecycleChanged(m_exemptFromLifecycle);
164
        Q_EMIT exemptFromLifecycleChanged(m_exemptFromLifecycle);
156
165
    }
165
    }
157
166
}
166
}
158
167
159
168
int MockApplicationInfo::surfaceCount() const
160
169
{
161
170
    return 1;
162
171
}
163
167
172
164
=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
165
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-05-17 12:55:00 +0000
166
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-06-03 11:15:53 +0000
167
@@ -62,8 +62,9 @@
168
62
    QSize initialSurfaceSize() const override { return QSize(); }
62
    QSize initialSurfaceSize() const override { return QSize(); }
169
63
    void setInitialSurfaceSize(const QSize &) override {}
63
    void setInitialSurfaceSize(const QSize &) override {}
170
64
64
173
65
    MirSurfaceListInterface* surfaceList() override { return nullptr; }
65
    MirSurfaceListInterface* surfaceList() const override { return nullptr; }
174
66
    MirSurfaceListInterface* promptSurfaceList() override { return nullptr; }
66
    MirSurfaceListInterface* promptSurfaceList() const override { return nullptr; }
175
67
    int surfaceCount() const override;
176
67
68
177
68
private:
69
private:
178
69
    QString m_appId;
70
    QString m_appId;
179
70
71
180
=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp'
181
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp	2015-06-18 17:03:45 +0000
182
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp	2016-06-03 11:15:53 +0000
183
@@ -35,6 +35,7 @@
184
35
    m_count(8),
35
    m_count(8),
185
36
    m_countVisible(false),
36
    m_countVisible(false),
186
37
    m_alerting(false),
37
    m_alerting(false),
187
38
    m_surfaceCount(1),
188
38
    m_quickListModel(new MockQuickListModel(this))
39
    m_quickListModel(new MockQuickListModel(this))
189
39
{
40
{
190
40
41
191
@@ -172,6 +173,11 @@
192
172
    }
173
    }
193
173
}
174
}
194
174
175
195
176
int MockLauncherItem::surfaceCount() const
196
177
{
197
178
    return m_surfaceCount;
198
179
}
199
180
200
175
QuickListModelInterface *MockLauncherItem::quickList() const
181
QuickListModelInterface *MockLauncherItem::quickList() const
201
176
{
182
{
202
177
    return m_quickListModel;
183
    return m_quickListModel;
203
178
184
204
=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h'
205
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h	2015-06-02 13:52:49 +0000
206
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h	2016-06-03 11:15:53 +0000
207
@@ -59,6 +59,8 @@
208
59
    bool alerting() const;
59
    bool alerting() const;
209
60
    void setAlerting(bool alerting);
60
    void setAlerting(bool alerting);
210
61
61
211
62
    int surfaceCount() const override;
212
63
213
62
    unity::shell::launcher::QuickListModelInterface *quickList() const;
64
    unity::shell::launcher::QuickListModelInterface *quickList() const;
214
63
65
215
64
private:
66
private:
216
@@ -74,6 +76,7 @@
217
74
    bool m_countVisible;
76
    bool m_countVisible;
218
75
    bool m_focused;
77
    bool m_focused;
219
76
    bool m_alerting;
78
    bool m_alerting;
220
79
    int m_surfaceCount;
221
77
    QuickListModelInterface *m_quickListModel;
80
    QuickListModelInterface *m_quickListModel;
222
78
};
81
};
223
79
82
224
80
83
225
=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp'
226
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp	2015-06-19 16:13:00 +0000
227
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp	2016-06-03 11:15:53 +0000
228
@@ -90,6 +90,8 @@
229
90
        return item->focused();
90
        return item->focused();
230
91
    case RoleAlerting:
91
    case RoleAlerting:
231
92
        return item->alerting();
92
        return item->alerting();
232
93
    case RoleSurfaceCount:
233
94
        return item->surfaceCount();
234
93
    }
95
    }
235
94
96
236
95
    return QVariant();
97
    return QVariant();
237
96
98
238
=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
239
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml	2015-06-19 16:13:00 +0000
240
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml	2016-06-03 11:15:53 +0000
241
@@ -88,6 +88,7 @@
242
88
                        { tag: "Model.roles[countVisible]", role: "countVisible", type: "boolean" },
88
                        { tag: "Model.roles[countVisible]", role: "countVisible", type: "boolean" },
243
89
                        { tag: "Model.roles[focused]", role: "focused", type: "boolean" },
89
                        { tag: "Model.roles[focused]", role: "focused", type: "boolean" },
244
90
                        { tag: "Model.roles[alerting]", role: "alerting", type: "boolean" },
90
                        { tag: "Model.roles[alerting]", role: "alerting", type: "boolean" },
245
91
                        { tag: "Model.roles[surfaceCount]", role: "surfaceCount", type: "number" },
246
91
                    ];
92
                    ];
247
92
        }
93
        }
248
93
94
249
@@ -146,6 +147,7 @@
250
146
                { tag: "Item.properties[countVisible]", property: "countVisible", type: "boolean" },
147
                { tag: "Item.properties[countVisible]", property: "countVisible", type: "boolean" },
251
147
                { tag: "Item.properties[focused]", property: "focused", type: "boolean" },
148
                { tag: "Item.properties[focused]", property: "focused", type: "boolean" },
252
148
                { tag: "Item.properties[alerting]", property: "alerting", type: "boolean" },
149
                { tag: "Item.properties[alerting]", property: "alerting", type: "boolean" },
253
150
                { tag: "Item.properties[surfaceCount]", property: "surfaceCount", type: "number" },
254
149
                { tag: "Item.properties[quickList]", constant: "quickList", type: "object" },
151
                { tag: "Item.properties[quickList]", constant: "quickList", type: "object" },
255
150
            ];
152
            ];
256
151
        }
153
        }
Status:	Merged
Approved by:	Albert Astals Cid on 2016-05-19
Approved revision:	237
Merged at revision:	236
Proposed branch:	lp:~mzanetti/unity-api/surfaceCount-property
Merge into:	lp:unity-api
Diff against target:	256 lines (+56/-8) 13 files modified debian/changelog (+6/-0) include/unity/shell/application/ApplicationInfoInterface.h (+14/-2) include/unity/shell/application/CMakeLists.txt (+1/-1) include/unity/shell/application/MirSurfaceListInterface.h (+1/-1) include/unity/shell/launcher/CMakeLists.txt (+1/-1) include/unity/shell/launcher/LauncherItemInterface.h (+9/-0) include/unity/shell/launcher/LauncherModelInterface.h (+3/-1) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp (+5/-0) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+3/-2) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp (+6/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h (+3/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp (+2/-0) test/qmltest/unity/shell/launcher/tst_Launcher.qml (+2/-0)
To merge this branch:	bzr merge lp:~mzanetti/unity-api/surfaceCount-property
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-04
Albert Astals Cid (community)			Approve on 2016-05-19
Daniel d'Andrada (community)			Disapprove on 2016-05-18
Lukáš Tinkl (community)		2016-05-10	Approve on 2016-05-11
Review via email: mp+294264@code.launchpad.net