git.iko.soy/unity8
on xenial help sign in
update according to latest unity-api changes
commit413fdc9f86ea2d6bde4296f36348d0813dde8136 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 11 Mar 2014, 12:14 (13 years ago) parent8ce00cf
2 files changed+8−5
compare with xenial
unifiedsplit
tests/mocks/Unity/Application/ApplicationManager.cpp+6−3 tests/mocks/Unity/Application/ApplicationManager.h+2−2
tests/mocks/Unity/Application/ApplicationManager.cpp+6−3
@@ -202,7 +202,7 @@ bool ApplicationManager::stopApplication(const QString &appId)
202202 return true;
203203}
204204
205−void ApplicationManager::updateScreenshot(const QString &appId)
205+bool ApplicationManager::updateScreenshot(const QString &appId)
206206{
207207 qDebug() << "updating screenshot for" << appId;
208208 int idx = -1;
@@ -216,13 +216,14 @@ void ApplicationManager::updateScreenshot(const QString &appId)
216216 }
217217
218218 if (idx == -1) {
219− return;
219+ return false;
220220 }
221221
222222 application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
223223 QModelIndex appIndex = index(idx);
224224 qDebug() << "emitting dataChanged for RoleScreenshot on" << appId;
225225 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
226+ return true;
226227}
227228
228229QString ApplicationManager::focusedApplicationId() const {
@@ -302,11 +303,13 @@ bool ApplicationManager::focusApplication(const QString &appId)
302303 return true;
303304}
304305
305−void ApplicationManager::activateApplication(const QString &appId)
306+bool ApplicationManager::requestFocusApplication(const QString &appId)
306307{
307308 if (appId != focusedApplicationId()) {
308309 QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));
310+ return true;
309311 }
312+ return false;
310313}
311314
312315void ApplicationManager::unfocusCurrentApplication()
tests/mocks/Unity/Application/ApplicationManager.h+2−2
@@ -91,13 +91,13 @@ class ApplicationManager : public ApplicationManagerInterface {
9191 Q_INVOKABLE void move(int from, int to);
9292
9393 // Application control methods
94+ Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
9495 Q_INVOKABLE bool focusApplication(const QString &appId) override;
95− Q_INVOKABLE void activateApplication(const QString &appId) override;
9696 Q_INVOKABLE void unfocusCurrentApplication() override;
9797 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
9898 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
9999 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;
101101
102102 QString focusedApplicationId() const override;
103103 bool suspended() const;