New layer management in WindowManager. Three layers are created. One for the HomeScre...

[staging/HomeScreen.git] / HomeScreen / src / applauncherwidget.cpp

diff --git a/HomeScreen/src/applauncherwidget.cpp b/HomeScreen/src/applauncherwidget.cpp
index 18c373b..3d47d93 100644 (file)
--- 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);
@@ -65,23 +65,24 @@ void AppLauncherWidget::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
-    mp_ui->widget_Background->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Background").toString());
-    mp_ui->widget_Home_Icon->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Home_Icon").toString());
+    mp_ui->widget_background->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Background").toString());
+    mp_ui->widget_homeIcon->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Home_Icon").toString());
+
+    setStyleSheet(settings_cs.value("AppLauncherWidget/common_css").toString());
 }
 
 void AppLauncherWidget::populateAppList()
 {
-    setStyleSheet("QTableWidget {background-color: transparent;}"
-                  "QTableCornerButton::section {background-color: transparent;}");
-
     if (0 == mp_appTable)
     {
         mp_appTable = new QTableWidget(this);
-        QObject::connect(mp_appTable, SIGNAL(cellClicked(int, int)), this, SLOT(on_tableView_clicked(int, int)));
+        QObject::connect(mp_appTable, SIGNAL(cellClicked(int,int)), this, SLOT(on_tableView_clicked(int,int)));
     }
     else
     {
@@ -100,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);
@@ -151,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);