git.iko.soy/unity8
on xenial help sign in
update according to latest unity-api changes
413fdc9Michael Zanetti
tests/mocks/Unity/Application/ApplicationManager.cpp+6−3
compare with xenial
unifiedsplit
@@ -202,7 +202,7 @@ bool ApplicationManager::stopApplication(const QString &appId)
202 return true;
202 return true;
203}
203}
204
204
205−void ApplicationManager::updateScreenshot(const QString &appId)
205+bool ApplicationManager::updateScreenshot(const QString &appId)
206{
206{
207 qDebug() << "updating screenshot for" << appId;
207 qDebug() << "updating screenshot for" << appId;
208 int idx = -1;
208 int idx = -1;
@@ -216,13 +216,14 @@ void ApplicationManager::updateScreenshot(const QString &appId)
216 }
216 }
217
217
218 if (idx == -1) {
218 if (idx == -1) {
219− return;
219+ return false;
220 }
220 }
221
221
222 application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
222 application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
223 QModelIndex appIndex = index(idx);
223 QModelIndex appIndex = index(idx);
224 qDebug() << "emitting dataChanged for RoleScreenshot on" << appId;
224 qDebug() << "emitting dataChanged for RoleScreenshot on" << appId;
225 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
225 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
226+ return true;
226}
227}
227
228
228QString ApplicationManager::focusedApplicationId() const {
229QString ApplicationManager::focusedApplicationId() const {
@@ -302,11 +303,13 @@ bool ApplicationManager::focusApplication(const QString &appId)
302 return true;
303 return true;
303}
304}
304
305
305−void ApplicationManager::activateApplication(const QString &appId)
306+bool ApplicationManager::requestFocusApplication(const QString &appId)
306{
307{
307 if (appId != focusedApplicationId()) {
308 if (appId != focusedApplicationId()) {
308 QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));
309 QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));
310+ return true;
309 }
311 }
312+ return false;
310}
313}
311
314
312void ApplicationManager::unfocusCurrentApplication()
315void ApplicationManager::unfocusCurrentApplication()
tests/mocks/Unity/Application/ApplicationManager.h+2−2
@@ -91,13 +91,13 @@ class ApplicationManager : public ApplicationManagerInterface {
91 Q_INVOKABLE void move(int from, int to);
91 Q_INVOKABLE void move(int from, int to);
92
92
93 // Application control methods
93 // Application control methods
94+ Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
94 Q_INVOKABLE bool focusApplication(const QString &appId) override;
95 Q_INVOKABLE bool focusApplication(const QString &appId) override;
95− Q_INVOKABLE void activateApplication(const QString &appId) override;
96 Q_INVOKABLE void unfocusCurrentApplication() override;
96 Q_INVOKABLE void unfocusCurrentApplication() override;
97 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
97 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
98 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
98 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
99 Q_INVOKABLE bool stopApplication(const QString &appId) override;
99 Q_INVOKABLE bool stopApplication(const QString &appId) override;
100− Q_INVOKABLE void updateScreenshot(const QString &appId) override;
100+ Q_INVOKABLE bool updateScreenshot(const QString &appId) override;
101
101
102 QString focusedApplicationId() const override;
102 QString focusedApplicationId() const override;
103 bool suspended() const;
103 bool suspended() const;