Merge lp:~dandrader/unity-api/app-state-handling into lp:unity-api
- app-state-handling
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Gerry Boland |
Approved revision: | no longer in the source branch. |
Merged at revision: | 179 |
Proposed branch: | lp:~dandrader/unity-api/app-state-handling |
Merge into: | lp:unity-api |
Diff against target: |
311 lines (+48/-71) 9 files modified
debian/changelog (+10/-2) include/unity/shell/application/ApplicationInfoInterface.h (+21/-4) include/unity/shell/application/ApplicationManagerInterface.h (+0/-29) include/unity/shell/application/CMakeLists.txt (+1/-1) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp (+9/-0) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+3/-4) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp (+1/-21) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h (+1/-7) test/qmltest/unity/shell/application/tst_Application.qml (+2/-3) |
To merge this branch: | bzr merge lp:~dandrader/unity-api/app-state-handling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gerry Boland (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+258643@code.launchpad.net |
Commit message
Let users of the API suspend & resume individual apps at will
API Changes:
- Removed ApplicationMana
- Removed ApplicationMana
- Added ApplicationInfo
Description of the change
Needed for having unity8 handling the application lifecycle (suspending&
PS Jenkins bot (ps-jenkins) wrote : | # |
Gerry Boland (gerboland) wrote : | # |
+ Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
FYI: on Thursday at UOS, we had a session on desktop app lifecycle stuff. There we decided that there will be more states than running/suspended. For the desktop we will want a "throttled" state, i.e. application has throttled CPU usage.
It will be up to unity8 to have that policy, so qtmir needs to export that capability.
In that case, we would prefer a property supporting an enum: Running/
Could you change this property to have Running/Suspended states, with a view to supporting more in future?
Daniel d'Andrada (dandrader) wrote : | # |
> + Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
> FYI: on Thursday at UOS, we had a session on desktop app lifecycle stuff.
> There we decided that there will be more states than running/suspended. For
> the desktop we will want a "throttled" state, i.e. application has throttled
> CPU usage.
>
> It will be up to unity8 to have that policy, so qtmir needs to export that
> capability.
>
> In that case, we would prefer a property supporting an enum:
> Running/
>
> Could you change this property to have Running/Suspended states, with a view
> to supporting more in future?
Done.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:180
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Gerry Boland (gerboland) wrote : | # |
+ * @brief The aplication's requested state
typo. Also "state" is vague in this context, would elaborate slightly to "application's requested running state"
+ virtual void setRequestedSta
+ void requestedStateC
"const RequestedState" would do no harm, and would help compiler slightly
Looks good otherwise. Thanks for the API change
Daniel d'Andrada (dandrader) wrote : | # |
On 11/05/15 08:07, Gerry Boland wrote:
> Review: Needs Fixing
>
> + * @brief The aplication's requested state
> typo. Also "state" is vague in this context, would elaborate slightly to "application's requested running state"
Done.
>
> + virtual void setRequestedSta
> + void requestedStateC
> "const RequestedState" would do no harm, and would help compiler slightly
I does do some harm by making the signature longer, and the benefit of
having a "const int" parameter (as merely a hint to the reader) is
arguable in my opinion. Would like a third vote on this.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:181
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michael Zanetti (mzanetti) wrote : | # |
> > + virtual void setRequestedSta
> > + void requestedStateC
> > "const RequestedState" would do no harm, and would help compiler slightly
>
> I does do some harm by making the signature longer, and the benefit of
> having a "const int" parameter (as merely a hint to the reader) is
> arguable in my opinion. Would like a third vote on this.
As Gerry said earlier, we are in Bikeshed land here, but as you asked for a third opinion, I'm -1 for const int and agree with Daniel here.
- 173. By Daniel d'Andrada
-
Add supportedOrient
ations and rotatesWindowCo ntents to ApplicationInfo
Approved by: PS Jenkins bot, Gerry Boland - 174. By CI Train Bot Account
-
Releasing 7.97+15.
10.20150611- 0ubuntu1 - 175. By Daniel d'Andrada
-
Changes to application lifecycle APIs
* Removed ApplicationMana
gerInterface. forceDashActive
* Removed ApplicationManagerInterface. suspended
* Added ApplicationInfoInterface. requestedState
- 176. By Daniel d'Andrada
-
Merge trunk
[ Mirco Müller (MacSlow) ]
* added alerting/setAlerting API to LauncherModel and LauncherItem interfaces
[ Michi Henning ]
* Remove dependency on gcc 4.9. (LP: #1452342)
Preview Diff
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2015-07-24 09:53:02 +0000 | |||
3 | +++ debian/changelog 2015-08-03 14:07:35 +0000 | |||
4 | @@ -1,3 +1,11 @@ | |||
5 | 1 | unity-api (7.99) UNRELEASED; urgency=medium | ||
6 | 2 | |||
7 | 3 | * Remove ApplicationManagerInterface.forceDashActive | ||
8 | 4 | * Remove ApplicationManagerInterface.suspended | ||
9 | 5 | * Add ApplicationInfoInterface.requestedState | ||
10 | 6 | |||
11 | 7 | -- Daniel d'Andrada <daniel.dandrada@canonical.com> Mon, 15 Jun 2015 13:53:07 -0300 | ||
12 | 8 | |||
13 | 1 | unity-api (7.98+15.10.20150724-0ubuntu1) wily; urgency=medium | 9 | unity-api (7.98+15.10.20150724-0ubuntu1) wily; urgency=medium |
14 | 2 | 10 | ||
15 | 3 | [ Mirco Müller (MacSlow) ] | 11 | [ Mirco Müller (MacSlow) ] |
16 | @@ -123,7 +131,7 @@ | |||
17 | 123 | 131 | ||
18 | 124 | [ Michal Hruby ] | 132 | [ Michal Hruby ] |
19 | 125 | * Added header links CategoriesInterface and performQuery() to | 133 | * Added header links CategoriesInterface and performQuery() to |
21 | 126 | ScopeInterface | 134 | ScopeInterface |
22 | 127 | 135 | ||
23 | 128 | [ Michi Henning ] | 136 | [ Michi Henning ] |
24 | 129 | * A few minor fixes to the doc comments for comparison operators. | 137 | * A few minor fixes to the doc comments for comparison operators. |
25 | @@ -488,7 +496,7 @@ | |||
26 | 488 | 496 | ||
27 | 489 | unity-api (7.80.1) saucy; urgency=low | 497 | unity-api (7.80.1) saucy; urgency=low |
28 | 490 | 498 | ||
30 | 491 | * This project forked from lp:unity/phablet. Updating the versioning to | 499 | * This project forked from lp:unity/phablet. Updating the versioning to |
31 | 492 | reflect that. | 500 | reflect that. |
32 | 493 | 501 | ||
33 | 494 | -- Sergio Schvezov <sergio.schvezov@canonical.com> Tue, 04 Jun 2013 16:06:54 -0300 | 502 | -- Sergio Schvezov <sergio.schvezov@canonical.com> Tue, 04 Jun 2013 16:06:54 -0300 |
34 | 495 | 503 | ||
35 | === modified file 'include/unity/shell/application/ApplicationInfoInterface.h' | |||
36 | --- include/unity/shell/application/ApplicationInfoInterface.h 2015-04-16 16:13:09 +0000 | |||
37 | +++ include/unity/shell/application/ApplicationInfoInterface.h 2015-08-03 14:07:35 +0000 | |||
38 | @@ -12,10 +12,6 @@ | |||
39 | 12 | * | 12 | * |
40 | 13 | * You should have received a copy of the GNU Lesser General Public License | 13 | * You should have received a copy of the GNU Lesser General Public License |
41 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
42 | 15 | * | ||
43 | 16 | * Authors: | ||
44 | 17 | * Michael Zanetti <michael.zanetti@canonical.com> | ||
45 | 18 | * Daniel d'Andrada <daniel.dandrada@canonical.com> | ||
46 | 19 | */ | 15 | */ |
47 | 20 | 16 | ||
48 | 21 | #ifndef UNITY_SHELL_APPLICATION_APPLICATIONINFOINTERFACE_H | 17 | #ifndef UNITY_SHELL_APPLICATION_APPLICATIONINFOINTERFACE_H |
49 | @@ -47,6 +43,7 @@ | |||
50 | 47 | 43 | ||
51 | 48 | Q_ENUMS(Stage) | 44 | Q_ENUMS(Stage) |
52 | 49 | Q_ENUMS(State) | 45 | Q_ENUMS(State) |
53 | 46 | Q_ENUMS(RequestedState) | ||
54 | 50 | 47 | ||
55 | 51 | /** | 48 | /** |
56 | 52 | * @brief The appId of the application. | 49 | * @brief The appId of the application. |
57 | @@ -93,6 +90,11 @@ | |||
58 | 93 | Q_PROPERTY(State state READ state NOTIFY stateChanged) | 90 | Q_PROPERTY(State state READ state NOTIFY stateChanged) |
59 | 94 | 91 | ||
60 | 95 | /** | 92 | /** |
61 | 93 | * @brief The application's requested running state | ||
62 | 94 | */ | ||
63 | 95 | Q_PROPERTY(RequestedState requestedState READ requestedState WRITE setRequestedState NOTIFY requestedStateChanged) | ||
64 | 96 | |||
65 | 97 | /** | ||
66 | 96 | * @brief The application's focus state. | 98 | * @brief The application's focus state. |
67 | 97 | * | 99 | * |
68 | 98 | * Holds the current application focus state. True if focused, false otherwise. | 100 | * Holds the current application focus state. True if focused, false otherwise. |
69 | @@ -235,6 +237,18 @@ | |||
70 | 235 | Stopped | 237 | Stopped |
71 | 236 | }; | 238 | }; |
72 | 237 | 239 | ||
73 | 240 | /** | ||
74 | 241 | * @brief The desired state of an application | ||
75 | 242 | * | ||
76 | 243 | * RequestedRunning: If state is Suspended or Stopped, the application will be resumed | ||
77 | 244 | * or restarted, respectively. | ||
78 | 245 | * RequestedSuspended: If state is Running, the application will be suspended. | ||
79 | 246 | */ | ||
80 | 247 | enum RequestedState { | ||
81 | 248 | RequestedRunning = Running, | ||
82 | 249 | RequestedSuspended = Suspended | ||
83 | 250 | }; | ||
84 | 251 | |||
85 | 238 | /// @cond | 252 | /// @cond |
86 | 239 | virtual ~ApplicationInfoInterface() {} | 253 | virtual ~ApplicationInfoInterface() {} |
87 | 240 | 254 | ||
88 | @@ -244,6 +258,8 @@ | |||
89 | 244 | virtual QUrl icon() const = 0; | 258 | virtual QUrl icon() const = 0; |
90 | 245 | virtual Stage stage() const = 0; | 259 | virtual Stage stage() const = 0; |
91 | 246 | virtual State state() const = 0; | 260 | virtual State state() const = 0; |
92 | 261 | virtual RequestedState requestedState() const = 0; | ||
93 | 262 | virtual void setRequestedState(RequestedState) = 0; | ||
94 | 247 | virtual bool focused() const = 0; | 263 | virtual bool focused() const = 0; |
95 | 248 | virtual QString splashTitle() const = 0; | 264 | virtual QString splashTitle() const = 0; |
96 | 249 | virtual QUrl splashImage() const = 0; | 265 | virtual QUrl splashImage() const = 0; |
97 | @@ -262,6 +278,7 @@ | |||
98 | 262 | void iconChanged(const QUrl &icon); | 278 | void iconChanged(const QUrl &icon); |
99 | 263 | void stageChanged(Stage stage); | 279 | void stageChanged(Stage stage); |
100 | 264 | void stateChanged(State state); | 280 | void stateChanged(State state); |
101 | 281 | void requestedStateChanged(RequestedState value); | ||
102 | 265 | void focusedChanged(bool focused); | 282 | void focusedChanged(bool focused); |
103 | 266 | /// @endcond | 283 | /// @endcond |
104 | 267 | }; | 284 | }; |
105 | 268 | 285 | ||
106 | === modified file 'include/unity/shell/application/ApplicationManagerInterface.h' | |||
107 | --- include/unity/shell/application/ApplicationManagerInterface.h 2014-09-29 13:39:01 +0000 | |||
108 | +++ include/unity/shell/application/ApplicationManagerInterface.h 2015-08-03 14:07:35 +0000 | |||
109 | @@ -59,20 +59,6 @@ | |||
110 | 59 | */ | 59 | */ |
111 | 60 | Q_PROPERTY(QString focusedApplicationId READ focusedApplicationId NOTIFY focusedApplicationIdChanged) | 60 | Q_PROPERTY(QString focusedApplicationId READ focusedApplicationId NOTIFY focusedApplicationIdChanged) |
112 | 61 | 61 | ||
113 | 62 | /** | ||
114 | 63 | * @brief The suspended state of the ApplicationManager. | ||
115 | 64 | * | ||
116 | 65 | * If this is set to true, all apps (regardless if focused or not) will be suspended. | ||
117 | 66 | */ | ||
118 | 67 | Q_PROPERTY(bool suspended READ suspended WRITE setSuspended NOTIFY suspendedChanged) | ||
119 | 68 | |||
120 | 69 | /** | ||
121 | 70 | * @brief Activate the dash, regardless of its focused state. | ||
122 | 71 | * | ||
123 | 72 | * If this is set to true, the dash will not be put to suspend or will be woken up from suspend. | ||
124 | 73 | */ | ||
125 | 74 | Q_PROPERTY(bool forceDashActive READ forceDashActive WRITE setForceDashActive NOTIFY forceDashActiveChanged) | ||
126 | 75 | |||
127 | 76 | protected: | 62 | protected: |
128 | 77 | /// @cond | 63 | /// @cond |
129 | 78 | ApplicationManagerInterface(QObject* parent = 0): QAbstractListModel(parent) | 64 | ApplicationManagerInterface(QObject* parent = 0): QAbstractListModel(parent) |
130 | @@ -122,11 +108,6 @@ | |||
131 | 122 | 108 | ||
132 | 123 | virtual QString focusedApplicationId() const = 0; | 109 | virtual QString focusedApplicationId() const = 0; |
133 | 124 | 110 | ||
134 | 125 | virtual bool suspended() const = 0; | ||
135 | 126 | virtual void setSuspended(bool suspended) = 0; | ||
136 | 127 | |||
137 | 128 | virtual bool forceDashActive() const = 0; | ||
138 | 129 | virtual void setForceDashActive(bool forceDashActive) = 0; | ||
139 | 130 | /// @endcond | 111 | /// @endcond |
140 | 131 | 112 | ||
141 | 132 | /** | 113 | /** |
142 | @@ -212,16 +193,6 @@ | |||
143 | 212 | void focusedApplicationIdChanged(); | 193 | void focusedApplicationIdChanged(); |
144 | 213 | 194 | ||
145 | 214 | /** | 195 | /** |
146 | 215 | * @brief Will be emitted when the suspended state of the ApplicationManager changes. | ||
147 | 216 | */ | ||
148 | 217 | void suspendedChanged(); | ||
149 | 218 | |||
150 | 219 | /** | ||
151 | 220 | * @brief Will be emitted when the forceDashActive property changes. | ||
152 | 221 | */ | ||
153 | 222 | void forceDashActiveChanged(); | ||
154 | 223 | |||
155 | 224 | /** | ||
156 | 225 | * @brief Will be emitted when an application was added to the model. | 196 | * @brief Will be emitted when an application was added to the model. |
157 | 226 | * | 197 | * |
158 | 227 | * @param appId The appId of the application that was added. | 198 | * @param appId The appId of the application that was added. |
159 | 228 | 199 | ||
160 | === modified file 'include/unity/shell/application/CMakeLists.txt' | |||
161 | --- include/unity/shell/application/CMakeLists.txt 2014-11-05 12:55:55 +0000 | |||
162 | +++ include/unity/shell/application/CMakeLists.txt 2015-08-03 14:07:35 +0000 | |||
163 | @@ -7,7 +7,7 @@ | |||
164 | 7 | 7 | ||
165 | 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) |
166 | 9 | 9 | ||
168 | 10 | set(VERSION 6) | 10 | set(VERSION 7) |
169 | 11 | set(PKGCONFIG_NAME "unity-shell-application") | 11 | set(PKGCONFIG_NAME "unity-shell-application") |
170 | 12 | set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs") | 12 | set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs") |
171 | 13 | set(PKGCONFIG_REQUIRES "Qt5Core") | 13 | set(PKGCONFIG_REQUIRES "Qt5Core") |
172 | 14 | 14 | ||
173 | === modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp' | |||
174 | --- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp 2014-11-05 12:55:55 +0000 | |||
175 | +++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp 2015-08-03 14:07:35 +0000 | |||
176 | @@ -126,6 +126,15 @@ | |||
177 | 126 | return QColor(0,0,0,0); | 126 | return QColor(0,0,0,0); |
178 | 127 | } | 127 | } |
179 | 128 | 128 | ||
180 | 129 | ApplicationInfoInterface::RequestedState MockApplicationInfo::requestedState() const | ||
181 | 130 | { | ||
182 | 131 | return RequestedRunning; | ||
183 | 132 | } | ||
184 | 133 | |||
185 | 134 | void MockApplicationInfo::setRequestedState(RequestedState) | ||
186 | 135 | { | ||
187 | 136 | } | ||
188 | 137 | |||
189 | 129 | Qt::ScreenOrientations MockApplicationInfo::supportedOrientations() const | 138 | Qt::ScreenOrientations MockApplicationInfo::supportedOrientations() const |
190 | 130 | { | 139 | { |
191 | 131 | return Qt::PortraitOrientation | Qt::LandscapeOrientation; | 140 | return Qt::PortraitOrientation | Qt::LandscapeOrientation; |
192 | 132 | 141 | ||
193 | === modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h' | |||
194 | --- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2014-11-05 12:55:55 +0000 | |||
195 | +++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2015-08-03 14:07:35 +0000 | |||
196 | @@ -1,5 +1,5 @@ | |||
197 | 1 | /* | 1 | /* |
199 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013,2015 Canonical Ltd. |
200 | 3 | * | 3 | * |
201 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
202 | 5 | * it under the terms of the GNU Lesser General Public License as published by | 5 | * it under the terms of the GNU Lesser General Public License as published by |
203 | @@ -12,9 +12,6 @@ | |||
204 | 12 | * | 12 | * |
205 | 13 | * You should have received a copy of the GNU Lesser General Public License | 13 | * You should have received a copy of the GNU Lesser General Public License |
206 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
207 | 15 | * | ||
208 | 16 | * Authors: | ||
209 | 17 | * Michael Zanetti <michael.zanetti@canonical.com> | ||
210 | 18 | */ | 15 | */ |
211 | 19 | 16 | ||
212 | 20 | #ifndef MOCKAPPLICATIONINFO_H | 17 | #ifndef MOCKAPPLICATIONINFO_H |
213 | @@ -52,6 +49,8 @@ | |||
214 | 52 | QColor splashColor() const override; | 49 | QColor splashColor() const override; |
215 | 53 | QColor splashColorHeader() const override; | 50 | QColor splashColorHeader() const override; |
216 | 54 | QColor splashColorFooter() const override; | 51 | QColor splashColorFooter() const override; |
217 | 52 | RequestedState requestedState() const override; | ||
218 | 53 | void setRequestedState(RequestedState) override; | ||
219 | 55 | 54 | ||
220 | 56 | Qt::ScreenOrientations supportedOrientations() const override; | 55 | Qt::ScreenOrientations supportedOrientations() const override; |
221 | 57 | bool rotatesWindowContents() const override; | 56 | bool rotatesWindowContents() const override; |
222 | 58 | 57 | ||
223 | === modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp' | |||
224 | --- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp 2014-09-29 10:58:06 +0000 | |||
225 | +++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp 2015-08-03 14:07:35 +0000 | |||
226 | @@ -1,5 +1,5 @@ | |||
227 | 1 | /* | 1 | /* |
229 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013,2015 Canonical Ltd. |
230 | 3 | * | 3 | * |
231 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
232 | 5 | * it under the terms of the GNU Lesser General Public License as published by | 5 | * it under the terms of the GNU Lesser General Public License as published by |
233 | @@ -98,26 +98,6 @@ | |||
234 | 98 | return (first) ? first->appId() : QString(); | 98 | return (first) ? first->appId() : QString(); |
235 | 99 | } | 99 | } |
236 | 100 | 100 | ||
237 | 101 | bool MockApplicationManager::suspended() const | ||
238 | 102 | { | ||
239 | 103 | return false; | ||
240 | 104 | } | ||
241 | 105 | |||
242 | 106 | void MockApplicationManager::setSuspended(bool suspended) | ||
243 | 107 | { | ||
244 | 108 | Q_UNUSED(suspended) | ||
245 | 109 | } | ||
246 | 110 | |||
247 | 111 | bool MockApplicationManager::forceDashActive() const | ||
248 | 112 | { | ||
249 | 113 | return false; | ||
250 | 114 | } | ||
251 | 115 | |||
252 | 116 | void MockApplicationManager::setForceDashActive(bool forceDashActive) | ||
253 | 117 | { | ||
254 | 118 | Q_UNUSED(forceDashActive) | ||
255 | 119 | } | ||
256 | 120 | |||
257 | 121 | bool MockApplicationManager::requestFocusApplication(const QString &appId) | 101 | bool MockApplicationManager::requestFocusApplication(const QString &appId) |
258 | 122 | { | 102 | { |
259 | 123 | Q_UNUSED(appId) | 103 | Q_UNUSED(appId) |
260 | 124 | 104 | ||
261 | === modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h' | |||
262 | --- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h 2014-09-29 10:58:06 +0000 | |||
263 | +++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h 2015-08-03 14:07:35 +0000 | |||
264 | @@ -1,5 +1,5 @@ | |||
265 | 1 | /* | 1 | /* |
267 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013,2015 Canonical Ltd. |
268 | 3 | * | 3 | * |
269 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
270 | 5 | * it under the terms of the GNU Lesser General Public License as published by | 5 | * it under the terms of the GNU Lesser General Public License as published by |
271 | @@ -40,12 +40,6 @@ | |||
272 | 40 | 40 | ||
273 | 41 | QString focusedApplicationId() const; | 41 | QString focusedApplicationId() const; |
274 | 42 | 42 | ||
275 | 43 | bool suspended() const; | ||
276 | 44 | void setSuspended(bool suspended); | ||
277 | 45 | |||
278 | 46 | bool forceDashActive() const override; | ||
279 | 47 | void setForceDashActive(bool forceDashActive) override; | ||
280 | 48 | |||
281 | 49 | Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const; | 43 | Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const; |
282 | 50 | 44 | ||
283 | 51 | Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const; | 45 | Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const; |
284 | 52 | 46 | ||
285 | === modified file 'test/qmltest/unity/shell/application/tst_Application.qml' | |||
286 | --- test/qmltest/unity/shell/application/tst_Application.qml 2014-11-05 12:55:55 +0000 | |||
287 | +++ test/qmltest/unity/shell/application/tst_Application.qml 2015-08-03 14:07:35 +0000 | |||
288 | @@ -1,5 +1,5 @@ | |||
289 | 1 | /* | 1 | /* |
291 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013,2015 Canonical Ltd. |
292 | 3 | * | 3 | * |
293 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
294 | 5 | * it under the terms of the GNU Lesser General Public License as published by | 5 | * it under the terms of the GNU Lesser General Public License as published by |
295 | @@ -124,8 +124,6 @@ | |||
296 | 124 | return [ | 124 | return [ |
297 | 125 | { tag: "ApplicationManager.count", property: "count", type: "number" }, | 125 | { tag: "ApplicationManager.count", property: "count", type: "number" }, |
298 | 126 | { tag: "ApplicationManager.focusedApplicationId", property: "focusedApplicationId", type: "string" }, | 126 | { tag: "ApplicationManager.focusedApplicationId", property: "focusedApplicationId", type: "string" }, |
299 | 127 | { tag: "ApplicationManager.suspended", property: "suspended", type: "boolean" }, | ||
300 | 128 | { tag: "ApplicationManager.forceDashActive", property: "forceDashActive", type: "boolean" }, | ||
301 | 129 | ]; | 127 | ]; |
302 | 130 | } | 128 | } |
303 | 131 | 129 | ||
304 | @@ -143,6 +141,7 @@ | |||
305 | 143 | { tag: "ApplicationInfo.properties[icon]", property: "icon", type: "object" }, | 141 | { tag: "ApplicationInfo.properties[icon]", property: "icon", type: "object" }, |
306 | 144 | { tag: "ApplicationInfo.properties[stage]", property: "stage", type: "number" }, | 142 | { tag: "ApplicationInfo.properties[stage]", property: "stage", type: "number" }, |
307 | 145 | { tag: "ApplicationInfo.properties[state]", property: "state", type: "number" }, | 143 | { tag: "ApplicationInfo.properties[state]", property: "state", type: "number" }, |
308 | 144 | { tag: "ApplicationInfo.properties[requestedState]", property: "requestedState", type: "number" }, | ||
309 | 146 | { tag: "ApplicationInfo.properties[focused]", property: "focused", type: "boolean" }, | 145 | { tag: "ApplicationInfo.properties[focused]", property: "focused", type: "boolean" }, |
310 | 147 | { tag: "ApplicationInfo.properties[splashTitle]", constant: "splashTitle", type: "string" }, | 146 | { tag: "ApplicationInfo.properties[splashTitle]", constant: "splashTitle", type: "string" }, |
311 | 148 | { tag: "ApplicationInfo.properties[splashImage]", constant: "splashImage", type: "url" }, | 147 | { tag: "ApplicationInfo.properties[splashImage]", constant: "splashImage", type: "url" }, |
PASSED: Continuous integration, rev:179 jenkins. qa.ubuntu. com/job/ unity-api- ci/297/ jenkins. qa.ubuntu. com/job/ unity-api- vivid-amd64- ci/17 jenkins. qa.ubuntu. com/job/ unity-api- vivid-armhf- ci/17 jenkins. qa.ubuntu. com/job/ unity-api- vivid-armhf- ci/17/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-api- vivid-i386- ci/17
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- api-ci/ 297/rebuild
http://