X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=homescreen%2Fsrc%2Fapplicationlauncher.cpp;h=48560e601fa953f3faf9b2401718a2a4f29e12fb;hb=refs%2Fheads%2Fsandbox%2Fmvlad%2Fflatpak-integration;hp=7b825bb6fc4a41c66d87f0685dc034fd01663fab;hpb=0592a405aa68f3baf6773795efa5522e4ee16779;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/applicationlauncher.cpp b/homescreen/src/applicationlauncher.cpp
index 7b825bb..48560e6 100644
--- a/homescreen/src/applicationlauncher.cpp
+++ b/homescreen/src/applicationlauncher.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,38 +16,41 @@
  * limitations under the License.
  */
 
-#include "applicationlauncher.h"
+#include <QtCore/QTimer>
 
-#include <QtCore/QDebug>
+#include "applicationlauncher.h"
 
 ApplicationLauncher::ApplicationLauncher(QObject *parent)
-    : QObject(parent),
-    mp_dBusAppFrameworkProxy()
+    : QObject(parent)
+    , m_launching(false)
+    , m_timeout(new QTimer(this))
 {
-    qDebug("D-Bus: connect to org.agl.homescreenappframeworkbinder /AppFramework");
-    mp_dBusAppFrameworkProxy = new org::agl::appframework("org.agl.homescreenappframeworkbinder",
-                                              "/AppFramework",
-                                              QDBusConnection::sessionBus(),
-                                              0);
+    m_timeout->setInterval(3000);
+    m_timeout->setSingleShot(true);
+    connect(m_timeout, &QTimer::timeout, [&]() {
+        setLaunching(false);
+    });
+    connect(this, &ApplicationLauncher::launchingChanged, [&](bool launching) {
+        if (launching)
+            m_timeout->start();
+        else
+            m_timeout->stop();
+    });
+    connect(this, &ApplicationLauncher::currentChanged, [&]() {
+        setLaunching(false);
+    });
 }
 
-ApplicationLauncher::~ApplicationLauncher()
+bool ApplicationLauncher::isLaunching() const
 {
-    delete mp_dBusAppFrameworkProxy;
+    return m_launching;
 }
 
-int ApplicationLauncher::launch(const QString &application)
+void ApplicationLauncher::setLaunching(bool launching)
 {
-    int result = -1;
-    qDebug() << "launch" << application;
-
-    result = mp_dBusAppFrameworkProxy->launchApp(application);
-    qDebug() << "pid:" << result;
-
-    if (result > 1) {
-        setCurrent(application);
-    }
-    return result;
+    if (m_launching == launching) return;
+    m_launching = launching;
+    launchingChanged(launching);
 }
 
 QString ApplicationLauncher::current() const