diff options
author | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-10-21 15:43:09 +0200 |
---|---|---|
committer | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-10-21 15:43:09 +0200 |
commit | ef00508748d82b3703951cc8eb46b289af8111b0 (patch) | |
tree | f5c1bcb790ef35eec2e8bde9dcb4c19b9178a54a /HomeScreen | |
parent | c9b7a544f14212f72ea19e1af399f1ccab89f5cf (diff) |
D-Bus name of AppFrameworkBinder is more common now.
Change way of launching apps in development environment.
Fix handling of launching more than three apps.
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'HomeScreen')
-rw-r--r-- | HomeScreen/src/applauncherwidget.cpp | 17 | ||||
-rw-r--r-- | HomeScreen/src/layouthandler.cpp | 3 |
2 files changed, 5 insertions, 15 deletions
diff --git a/HomeScreen/src/applauncherwidget.cpp b/HomeScreen/src/applauncherwidget.cpp index 69350db..3d47d93 100644 --- a/HomeScreen/src/applauncherwidget.cpp +++ b/HomeScreen/src/applauncherwidget.cpp @@ -40,8 +40,8 @@ AppLauncherWidget::AppLauncherWidget(QWidget *parent) : mp_appList->append(ai); } - qDebug("D-Bus: connect to org.agl.homescreenappframeworkbindertizen /AppFramework"); - mp_dBusAppFrameworkProxy = new org::agl::appframework("org.agl.homescreenappframeworkbindertizen", + qDebug("D-Bus: connect to org.agl.homescreenappframeworkbinder /AppFramework"); + mp_dBusAppFrameworkProxy = new org::agl::appframework("org.agl.homescreenappframeworkbinder", "/AppFramework", QDBusConnection::sessionBus(), 0); @@ -101,13 +101,7 @@ void AppLauncherWidget::populateAppList() int i; -#ifdef __arm__ QStringList apps = mp_dBusAppFrameworkProxy->getAvailableAppNames(); -#endif -#ifdef __i386__ - QStringList apps; - apps.append(QString("/usr/bin/gnome-terminal")); -#endif mp_appList->clear(); mp_appTable->setRowCount((apps.size() + (APP_LIST_COLUMN_COUNT - 1)) / APP_LIST_COLUMN_COUNT); @@ -152,14 +146,7 @@ void AppLauncherWidget::on_tableView_clicked(int row, int col) { if (mp_appList->size() > row * APP_LIST_COLUMN_COUNT + col) { -#ifdef __arm__ int pid = mp_dBusAppFrameworkProxy->launchApp(mp_appList->at(row * APP_LIST_COLUMN_COUNT + col).getName()); -#endif -#ifdef __i386__ - QProcess *myProcess = new QProcess(); - myProcess->start(mp_appList->at(row * APP_LIST_COLUMN_COUNT + col).getName(), NULL); - int pid = myProcess->pid(); -#endif qDebug("%d, %d: start app %s", row, col, mp_appList->at(row * APP_LIST_COLUMN_COUNT + col).getName().toStdString().c_str()); qDebug("pid: %d", pid); diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp index 65e0194..cb21018 100644 --- a/HomeScreen/src/layouthandler.cpp +++ b/HomeScreen/src/layouthandler.cpp @@ -131,6 +131,9 @@ void LayoutHandler::makeMeVisible(int pid) m_invisibleApps.append(m_visibleApps.last()); m_visibleApps.removeLast(); + m_visibleApps.append(m_requestsToBeVisibleApps); + m_requestsToBeVisibleApps.clear(); + for (int i = 0; i < m_visibleApps.size(); ++i) { mp_dBusWindowManagerProxy->setPidToLayoutArea(i, i); |