aboutsummaryrefslogtreecommitdiffstats
path: root/homescreen/src/applicationlauncher.cpp
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2017-12-23 22:13:19 +0900
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-12-25 07:27:32 +0000
commitec28d0bf46efbb13662a9b01de5d18f87fe34145 (patch)
treefff3beee142281c5c28661c255cfa91f2e53ef39 /homescreen/src/applicationlauncher.cpp
parent54f8d056bc2ee04f343352faa7e7e985e5cc4808 (diff)
Block launching app when an app is launchingeel_5.0.1eel_5.0.0eel/5.0.1eel/5.0.05.0.15.0.0
Bug-AGL: SPEC-1214 Change-Id: I747d20ca7a6219535668fc3951a4ff9f55bcaaaf Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> (cherry picked from commit db9f41d75fb4460f668117c69be05c4d4d4c7c7c)
Diffstat (limited to 'homescreen/src/applicationlauncher.cpp')
-rw-r--r--homescreen/src/applicationlauncher.cpp30
1 files changed, 29 insertions, 1 deletions
diff --git a/homescreen/src/applicationlauncher.cpp b/homescreen/src/applicationlauncher.cpp
index 7e1cda1..5a1e2d6 100644
--- a/homescreen/src/applicationlauncher.cpp
+++ b/homescreen/src/applicationlauncher.cpp
@@ -26,7 +26,23 @@ extern org::AGL::afm::user *afm_user_daemon_proxy;
ApplicationLauncher::ApplicationLauncher(QObject *parent)
: QObject(parent)
+ , m_launching(false)
+ , m_timeout(new QTimer(this))
{
+ 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);
+ });
}
int ApplicationLauncher::launch(const QString &application)
@@ -38,12 +54,24 @@ int ApplicationLauncher::launch(const QString &application)
HMI_DEBUG("HomeScreen","ApplicationLauncher pid: %d.", result);
if (result > 1) {
- setCurrent(application);
+ setLaunching(true);
}
return result;
}
+bool ApplicationLauncher::isLaunching() const
+{
+ return m_launching;
+}
+
+void ApplicationLauncher::setLaunching(bool launching)
+{
+ if (m_launching == launching) return;
+ m_launching = launching;
+ launchingChanged(launching);
+}
+
QString ApplicationLauncher::current() const
{
return m_current;