@@ -1,5 +1,5 @@
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2014 Canonical, Ltd.
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
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,9 @@
17#include "ApplicationManager.h"
17#include "ApplicationManager.h"
18+#include "ApplicationDBusAdaptor.h"
18#include "ApplicationInfo.h"
19#include "ApplicationInfo.h"
20+#include "MirSurfaceItem.h"
20#include <paths.h>
22#include <paths.h>
@@ -26,17 +28,34 @@
26#include <QQmlComponent>
28#include <QQmlComponent>
27#include <QTimer>
29#include <QTimer>
28#include <QDateTime>
30#include <QDateTime>
31+#include <QtDBus/QtDBus>
33+ApplicationManager *ApplicationManager::the_application_manager = nullptr;
35+ApplicationManager *ApplicationManager::singleton()
37+ if (!the_application_manager) {
38+ the_application_manager = new ApplicationManager();
39+ new ApplicationDBusAdaptor(the_application_manager);
41+ QDBusConnection connection = QDBusConnection::sessionBus();
42+ connection.registerService("com.canonical.Unity8");
43+ connection.registerObject("/com/canonical/Unity8/Mocks", the_application_manager);
45+ return the_application_manager;
30ApplicationManager::ApplicationManager(QObject *parent)
48ApplicationManager::ApplicationManager(QObject *parent)
31 : ApplicationManagerInterface(parent)
49 : ApplicationManagerInterface(parent)
32 , m_suspended(false)
50 , m_suspended(false)
33− , m_mainStageComponent(0)
35− , m_sideStageComponent(0)
52+ m_roleNames.insert(RoleSurface, "surface");
53+ m_roleNames.insert(RoleFullscreen, "fullscreen");
39 buildListOfAvailableApplications();
55 buildListOfAvailableApplications();
57+ startApplication("unity8-dash");
58+ focusApplication("unity8-dash");
42ApplicationManager::~ApplicationManager()
61ApplicationManager::~ApplicationManager()
@@ -69,6 +88,10 @@ QVariant ApplicationManager::data(const QModelIndex& index, int role) const {
69 return app->focused();
88 return app->focused();
70 case RoleScreenshot:
89 case RoleScreenshot:
71 return app->screenshot();
90 return app->screenshot();
92+ return QVariant::fromValue(app->surface());
94+ return app->fullscreen();
73 return QVariant();
96 return QVariant();
@@ -89,6 +112,17 @@ ApplicationInfo *ApplicationManager::findApplication(const QString &appId) const
89 return nullptr;
112 return nullptr;
115+QModelIndex ApplicationManager::findIndex(ApplicationInfo* application)
117+ for (int i = 0; i < m_runningApplications.size(); ++i) {
118+ if (m_runningApplications.at(i) == application) {
123+ return QModelIndex();
92void ApplicationManager::add(ApplicationInfo *application) {
126void ApplicationManager::add(ApplicationInfo *application) {
93 if (!application) {
127 if (!application) {
@@ -99,7 +133,13 @@ void ApplicationManager::add(ApplicationInfo *application) {
99 endInsertRows();
133 endInsertRows();
100 Q_EMIT applicationAdded(application->appId());
134 Q_EMIT applicationAdded(application->appId());
101 Q_EMIT countChanged();
135 Q_EMIT countChanged();
102− Q_EMIT focusRequested(application->appId());
136+ if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore
138+ connect(application, &ApplicationInfo::surfaceChanged, this, [application, this]() {
139+ QModelIndex appIndex = findIndex(application);
140+ if (!appIndex.isValid()) return;
141+ Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleSurface);
105void ApplicationManager::remove(ApplicationInfo *application) {
145void ApplicationManager::remove(ApplicationInfo *application) {
@@ -110,7 +150,9 @@ void ApplicationManager::remove(ApplicationInfo *application) {
110 endRemoveRows();
150 endRemoveRows();
111 Q_EMIT applicationRemoved(application->appId());
151 Q_EMIT applicationRemoved(application->appId());
112 Q_EMIT countChanged();
152 Q_EMIT countChanged();
153+ if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
155+ disconnect(application, &ApplicationInfo::surfaceChanged, this, 0);
116void ApplicationManager::move(int from, int to) {
158void ApplicationManager::move(int from, int to) {
@@ -127,16 +169,6 @@ void ApplicationManager::move(int from, int to) {
130−int ApplicationManager::keyboardHeight() const
135−bool ApplicationManager::keyboardVisible() const
140int ApplicationManager::sideStageWidth() const
172int ApplicationManager::sideStageWidth() const
142 return 0;
174 return 0;
@@ -180,14 +212,17 @@ ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
180 application->setStage(ApplicationInfo::MainStage);
212 application->setStage(ApplicationInfo::MainStage);
182 add(application);
214 add(application);
183−
215+ application->setState(ApplicationInfo::Running);
184− QMetaObject::invokeMethod(this, "focusApplication", Qt::QueuedConnection, Q_ARG(QString, appId));
186 return application;
217 return application;
189bool ApplicationManager::stopApplication(const QString &appId)
220bool ApplicationManager::stopApplication(const QString &appId)
222+ if (appId == "unity8-dash") {
191 ApplicationInfo *application = findApplication(appId);
226 ApplicationInfo *application = findApplication(appId);
192 if (application == nullptr)
227 if (application == nullptr)
193 return false;
228 return false;
@@ -195,6 +230,7 @@ bool ApplicationManager::stopApplication(const QString &appId)
195 if (application->appId() == focusedApplicationId()) {
230 if (application->appId() == focusedApplicationId()) {
196 unfocusCurrentApplication();
231 unfocusCurrentApplication();
233+ application->setState(ApplicationInfo::Stopped);
198 remove(application);
234 remove(application);
199 return true;
235 return true;
@@ -215,7 +251,6 @@ bool ApplicationManager::updateScreenshot(const QString &appId)
215 return false;
251 return false;
218− application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
219 QModelIndex appIndex = index(idx);
254 QModelIndex appIndex = index(idx);
220 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
255 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
221 return true;
256 return true;
@@ -260,35 +295,25 @@ bool ApplicationManager::focusApplication(const QString &appId)
260 for (ApplicationInfo *app : m_runningApplications) {
295 for (ApplicationInfo *app : m_runningApplications) {
261 if (app->focused() && app->stage() == ApplicationInfo::MainStage) {
296 if (app->focused() && app->stage() == ApplicationInfo::MainStage) {
262 app->setFocused(false);
297 app->setFocused(false);
263− app->hideWindow();
298+ app->setState(ApplicationInfo::Suspended);
267 // focus this app
302 // focus this app
268 application->setFocused(true);
303 application->setFocused(true);
269− if (!m_mainStage)
304+ application->setState(ApplicationInfo::Running);
271− application->showWindow(m_mainStage);
272− m_mainStage->setZ(-1000);
274− m_sideStage->setZ(-2000);
275 } else if (application->stage() == ApplicationInfo::SideStage) {
305 } else if (application->stage() == ApplicationInfo::SideStage) {
276 // unfocus currently focused sidestage app
306 // unfocus currently focused sidestage app
277 for (ApplicationInfo *app : m_runningApplications) {
307 for (ApplicationInfo *app : m_runningApplications) {
278 if (app->focused() && app->stage() == ApplicationInfo::SideStage) {
308 if (app->focused() && app->stage() == ApplicationInfo::SideStage) {
279 app->setFocused(false);
309 app->setFocused(false);
280− app->hideWindow();
310+ app->setState(ApplicationInfo::Suspended);
284 // focus this app
314 // focus this app
285 application->setFocused(true);
315 application->setFocused(true);
286− if (!m_sideStage)
316+ application->setState(ApplicationInfo::Running);
288− application->showWindow(m_sideStage);
289− m_sideStage->setZ(-1000);
291− m_mainStage->setZ(-2000);
294 // move app to top of stack
319 // move app to top of stack
@@ -299,18 +324,14 @@ bool ApplicationManager::focusApplication(const QString &appId)
300bool ApplicationManager::requestFocusApplication(const QString &appId)
325bool ApplicationManager::requestFocusApplication(const QString &appId)
302− if (appId != focusedApplicationId()) {
303− QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));
327+ QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));
304− return true;
328+ return true;
309void ApplicationManager::unfocusCurrentApplication()
331void ApplicationManager::unfocusCurrentApplication()
311 for (ApplicationInfo *app : m_runningApplications) {
333 for (ApplicationInfo *app : m_runningApplications) {
312 if (app->focused()) {
334 if (app->focused()) {
314 app->setFocused(false);
335 app->setFocused(false);
@@ -319,53 +340,27 @@ void ApplicationManager::unfocusCurrentApplication()
320void ApplicationManager::generateQmlStrings(ApplicationInfo *application)
341void ApplicationManager::generateQmlStrings(ApplicationInfo *application)
322− // TODO: Is there a better way of solving this fullscreen vs. regular
323− // application height?
325− if (application->fullscreen()) {
326− topMargin.append("0");
328− // Taken from Panel.panelHeight
329− topMargin.append("units.gu(3) + units.dp(2)");
332− QString windowQml = QString(
333− "import QtQuick 2.0\n"
335− " anchors.fill: parent\n"
336− " anchors.topMargin: %1\n"
337− " anchors.rightMargin: %2\n"
338− " source: \"file://%3/Dash/graphics/phone/screenshots/%4.png\"\n"
340− " fillMode: Image.PreserveAspectCrop\n"
343− .arg(qmlDirectory())
344− .arg(application->icon().toString());
345− application->setWindowQml(windowQml);
347− QString imageQml = QString(
348− "import QtQuick 2.0\n"
350− " anchors.fill: parent\n"
351− " source: \"file://%1/Dash/graphics/phone/screenshots/%2.png\"\n"
343+ application->setScreenshot(QString("file://%1/Dash/graphics/phone/screenshots/%2@12.png").arg(qmlDirectory())
353− " fillMode: Image.PreserveAspectCrop\n"
354− "}").arg(qmlDirectory())
355− .arg(application->icon().toString());
344+ .arg(application->icon().toString()));
356− application->setImageQml(imageQml);
359void ApplicationManager::buildListOfAvailableApplications()
347void ApplicationManager::buildListOfAvailableApplications()
361 ApplicationInfo *application;
349 ApplicationInfo *application;
351+ application = new ApplicationInfo(this);
352+ application->setAppId("unity8-dash");
353+ application->setName("Unity 8 Mock Dash");
354+ application->setIcon(QUrl("unity8-dash"));
355+ application->setStage(ApplicationInfo::MainStage);
356+ generateQmlStrings(application);
357+ m_availableApplications.append(application);
363 application = new ApplicationInfo(this);
359 application = new ApplicationInfo(this);
364 application->setAppId("dialer-app");
360 application->setAppId("dialer-app");
365 application->setName("Dialer");
361 application->setName("Dialer");
366 application->setIcon(QUrl("dialer"));
362 application->setIcon(QUrl("dialer"));
367 application->setStage(ApplicationInfo::SideStage);
363 application->setStage(ApplicationInfo::SideStage);
368− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
369 generateQmlStrings(application);
364 generateQmlStrings(application);
370 m_availableApplications.append(application);
365 m_availableApplications.append(application);
@@ -374,7 +369,6 @@ void ApplicationManager::buildListOfAvailableApplications()
374 application->setName("Camera");
369 application->setName("Camera");
375 application->setIcon(QUrl("camera"));
370 application->setIcon(QUrl("camera"));
376 application->setFullscreen(true);
371 application->setFullscreen(true);
377− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
378 generateQmlStrings(application);
372 generateQmlStrings(application);
379 m_availableApplications.append(application);
373 m_availableApplications.append(application);
@@ -382,7 +376,6 @@ void ApplicationManager::buildListOfAvailableApplications()
382 application->setAppId("gallery-app");
376 application->setAppId("gallery-app");
383 application->setName("Gallery");
377 application->setName("Gallery");
384 application->setIcon(QUrl("gallery"));
378 application->setIcon(QUrl("gallery"));
385− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
386 generateQmlStrings(application);
379 generateQmlStrings(application);
387 m_availableApplications.append(application);
380 m_availableApplications.append(application);
@@ -391,7 +384,6 @@ void ApplicationManager::buildListOfAvailableApplications()
391 application->setName("Facebook");
384 application->setName("Facebook");
392 application->setIcon(QUrl("facebook"));
385 application->setIcon(QUrl("facebook"));
393 application->setStage(ApplicationInfo::SideStage);
386 application->setStage(ApplicationInfo::SideStage);
394− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
395 generateQmlStrings(application);
387 generateQmlStrings(application);
396 m_availableApplications.append(application);
388 m_availableApplications.append(application);
@@ -400,7 +392,6 @@ void ApplicationManager::buildListOfAvailableApplications()
400 application->setFullscreen(true);
392 application->setFullscreen(true);
401 application->setName("Browser");
393 application->setName("Browser");
402 application->setIcon(QUrl("browser"));
394 application->setIcon(QUrl("browser"));
403− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
404 generateQmlStrings(application);
395 generateQmlStrings(application);
405 m_availableApplications.append(application);
396 m_availableApplications.append(application);
@@ -409,7 +400,6 @@ void ApplicationManager::buildListOfAvailableApplications()
409 application->setName("Twitter");
400 application->setName("Twitter");
410 application->setIcon(QUrl("twitter"));
401 application->setIcon(QUrl("twitter"));
411 application->setStage(ApplicationInfo::SideStage);
402 application->setStage(ApplicationInfo::SideStage);
412− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
413 generateQmlStrings(application);
403 generateQmlStrings(application);
414 m_availableApplications.append(application);
404 m_availableApplications.append(application);
@@ -417,7 +407,6 @@ void ApplicationManager::buildListOfAvailableApplications()
417 application->setAppId("gmail-webapp");
407 application->setAppId("gmail-webapp");
418 application->setName("GMail");
408 application->setName("GMail");
419 application->setIcon(QUrl("gmail"));
409 application->setIcon(QUrl("gmail"));
420− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
421 m_availableApplications.append(application);
410 m_availableApplications.append(application);
423 application = new ApplicationInfo(this);
412 application = new ApplicationInfo(this);
@@ -425,7 +414,6 @@ void ApplicationManager::buildListOfAvailableApplications()
425 application->setName("Weather");
414 application->setName("Weather");
426 application->setIcon(QUrl("weather"));
415 application->setIcon(QUrl("weather"));
427 application->setStage(ApplicationInfo::SideStage);
416 application->setStage(ApplicationInfo::SideStage);
428− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
429 generateQmlStrings(application);
417 generateQmlStrings(application);
430 m_availableApplications.append(application);
418 m_availableApplications.append(application);
@@ -434,7 +422,6 @@ void ApplicationManager::buildListOfAvailableApplications()
434 application->setName("Notepad");
422 application->setName("Notepad");
435 application->setIcon(QUrl("notepad"));
423 application->setIcon(QUrl("notepad"));
436 application->setStage(ApplicationInfo::SideStage);
424 application->setStage(ApplicationInfo::SideStage);
437− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
438 m_availableApplications.append(application);
425 m_availableApplications.append(application);
440 application = new ApplicationInfo(this);
427 application = new ApplicationInfo(this);
@@ -442,7 +429,6 @@ void ApplicationManager::buildListOfAvailableApplications()
442 application->setName("Calendar");
429 application->setName("Calendar");
443 application->setIcon(QUrl("calendar"));
430 application->setIcon(QUrl("calendar"));
444 application->setStage(ApplicationInfo::SideStage);
431 application->setStage(ApplicationInfo::SideStage);
445− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
446 m_availableApplications.append(application);
432 m_availableApplications.append(application);
448 application = new ApplicationInfo(this);
434 application = new ApplicationInfo(this);
@@ -450,21 +436,18 @@ void ApplicationManager::buildListOfAvailableApplications()
450 application->setName("Media Player");
436 application->setName("Media Player");
451 application->setIcon(QUrl("mediaplayer-app"));
437 application->setIcon(QUrl("mediaplayer-app"));
452 application->setFullscreen(true);
438 application->setFullscreen(true);
453− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
454 m_availableApplications.append(application);
439 m_availableApplications.append(application);
456 application = new ApplicationInfo(this);
441 application = new ApplicationInfo(this);
457 application->setAppId("evernote");
442 application->setAppId("evernote");
458 application->setName("Evernote");
443 application->setName("Evernote");
459 application->setIcon(QUrl("evernote"));
444 application->setIcon(QUrl("evernote"));
460− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
461 m_availableApplications.append(application);
445 m_availableApplications.append(application);
463 application = new ApplicationInfo(this);
447 application = new ApplicationInfo(this);
464 application->setAppId("map");
448 application->setAppId("map");
465 application->setName("Map");
449 application->setName("Map");
466 application->setIcon(QUrl("map"));
450 application->setIcon(QUrl("map"));
467− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
468 generateQmlStrings(application);
451 generateQmlStrings(application);
469 m_availableApplications.append(application);
452 m_availableApplications.append(application);
@@ -472,103 +455,27 @@ void ApplicationManager::buildListOfAvailableApplications()
472 application->setAppId("pinterest");
455 application->setAppId("pinterest");
473 application->setName("Pinterest");
456 application->setName("Pinterest");
474 application->setIcon(QUrl("pinterest"));
457 application->setIcon(QUrl("pinterest"));
475− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
476 m_availableApplications.append(application);
458 m_availableApplications.append(application);
478 application = new ApplicationInfo(this);
460 application = new ApplicationInfo(this);
479 application->setAppId("soundcloud");
461 application->setAppId("soundcloud");
480 application->setName("SoundCloud");
462 application->setName("SoundCloud");
481 application->setIcon(QUrl("soundcloud"));
463 application->setIcon(QUrl("soundcloud"));
482− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
483 m_availableApplications.append(application);
464 m_availableApplications.append(application);
485 application = new ApplicationInfo(this);
466 application = new ApplicationInfo(this);
486 application->setAppId("wikipedia");
467 application->setAppId("wikipedia");
487 application->setName("Wikipedia");
468 application->setName("Wikipedia");
488 application->setIcon(QUrl("wikipedia"));
469 application->setIcon(QUrl("wikipedia"));
489− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
490 m_availableApplications.append(application);
470 m_availableApplications.append(application);
492 application = new ApplicationInfo(this);
472 application = new ApplicationInfo(this);
493 application->setAppId("youtube");
473 application->setAppId("youtube");
494 application->setName("YouTube");
474 application->setName("YouTube");
495 application->setIcon(QUrl("youtube"));
475 application->setIcon(QUrl("youtube"));
496− application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
497 m_availableApplications.append(application);
476 m_availableApplications.append(application);
500−void ApplicationManager::createMainStageComponent()
502− // The assumptions I make here really should hold.
503− QQuickView *quickView =
504− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
506− QQmlEngine *engine = quickView->engine();
508− m_mainStageComponent = new QQmlComponent(engine, this);
509− QString mainStageQml =
510− "import QtQuick 2.0\n"
512− " anchors.fill: parent\n"
516− m_mainStageComponent->setData(mainStageQml.toLatin1(), QUrl());
519−void ApplicationManager::createMainStage()
521− if (!m_mainStageComponent)
522− createMainStageComponent();
524− // The assumptions I make here really should hold.
525− QQuickView *quickView =
526− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
528− QQuickItem *shell = quickView->rootObject();
530− m_mainStage = qobject_cast<QQuickItem *>(m_mainStageComponent->create());
531− m_mainStage->setParentItem(shell);
534−void ApplicationManager::createSideStageComponent()
536− // The assumptions I make here really should hold.
537− QQuickView *quickView =
538− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
540− QQmlEngine *engine = quickView->engine();
542− m_sideStageComponent = new QQmlComponent(engine, this);
543− QString sideStageQml =
544− "import QtQuick 2.0\n"
545− "import Ubuntu.Components 0.1\n"
547− " width: units.gu(40)\n" // from SideStage in Shell.qml
548− " anchors.top: parent.top\n"
549− " anchors.bottom: parent.bottom\n"
550− " anchors.right: parent.right\n"
553− m_sideStageComponent->setData(sideStageQml.toLatin1(), QUrl());
556−void ApplicationManager::createSideStage()
558− if (!m_sideStageComponent)
559− createSideStageComponent();
561− // The assumptions I make here really should hold.
562− QQuickView *quickView =
563− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
565− QQuickItem *shell = quickView->rootObject();
567− m_sideStage = qobject_cast<QQuickItem *>(m_sideStageComponent->create());
568− m_sideStage->setParentItem(shell);
569− m_sideStage->setFlag(QQuickItem::ItemHasContents, false);
572QStringList ApplicationManager::availableApplications()
479QStringList ApplicationManager::availableApplications()
574 QStringList appIds;
481 QStringList appIds;
@@ -578,15 +485,7 @@ QStringList ApplicationManager::availableApplications()
578 return appIds;
485 return appIds;
581−int ApplicationManager::rightMargin() const
488+bool ApplicationManager::isEmpty() const
583− return m_rightMargin;
490+ return m_runningApplications.isEmpty();
586−void ApplicationManager::setRightMargin(int rightMargin)
588− m_rightMargin = rightMargin;
589− Q_FOREACH(ApplicationInfo *app, m_availableApplications) {
590− generateQmlStrings(app);