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>

3 files changed, 8 insertions, 17 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);
diff --git a/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.cpp b/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.cpp
index 9e8dbba..625daec 100644
--- a/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.cpp
+++ b/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.cpp
@@ -21,7 +21,7 @@ HomeScreenAppFrameworkBinderTizen::HomeScreenAppFrameworkBinderTizen(QObject *pa
     QObject(parent),
     mp_appframeworkAdaptor(0)
 {
-    qDebug("D-Bus: register as org.agl.homescreenappframeworkbindertizen");
+    qDebug("D-Bus: register as org.agl.homescreenappframeworkbinder");
 
     m_apps.clear();
 
@@ -29,7 +29,7 @@ HomeScreenAppFrameworkBinderTizen::HomeScreenAppFrameworkBinderTizen(QObject *pa
     mp_appframeworkAdaptor = new AppframeworkAdaptor((QObject*)this);
     QDBusConnection dbus = QDBusConnection::sessionBus();
     dbus.registerObject("/AppFramework", this);
-    dbus.registerService("org.agl.homescreenappframeworkbindertizen");
+    dbus.registerService("org.agl.homescreenappframeworkbinder");
 
 #ifdef __arm__
     pkgmgrinfo_pkginfo_get_list(HomeScreenAppFrameworkBinderTizen::pkg_list_cb_static, this);
@@ -74,6 +74,7 @@ int HomeScreenAppFrameworkBinderTizen::launchApp(const QString &name)
 #endif
 #ifdef __i386__
     qDebug("launchApp name: %s", name.toStdString().c_str());
+    pid = qrand();
 #endif
 
     return pid;