X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fmainwindow.cpp;h=87558aac275b56e2949c463cd73200618fa48f25;hb=cf8cd699e91df40c3f9070019f7c561432b4b4dd;hp=bf7735c96195976054f7887a8f1a1dc5cbff6d82;hpb=3478f65b39560b333ba189e7d86e2c2cebfc9c7a;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/src/mainwindow.cpp b/HomeScreen/src/mainwindow.cpp
index bf7735c..87558aa 100644
--- a/HomeScreen/src/mainwindow.cpp
+++ b/HomeScreen/src/mainwindow.cpp
@@ -16,7 +16,7 @@
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "../interfaces/daynightmode.h"
+#include <include/daynightmode.hpp>
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -24,15 +24,18 @@ MainWindow::MainWindow(QWidget *parent) :
     mp_statusBarWidget(0),
     mp_controlBarWidget(0),
     mp_settingsWidget(0),
+    mp_applauncherwidget(0),
     mp_popupWidget(0),
-    mp_dayNightModeProxy(0)
+    mp_layoutHandler(new LayoutHandler()),
+    mp_dBusDayNightModeProxy(0),
+    mp_homeScreenControlInterface(0)
 {
     // this has to be adopted to the system setup
-    mp_dayNightModeProxy = new org::agl::daynightmode("org.agl.homescreen.simulator", //"org.agl.systeminfoprovider"
+    mp_dBusDayNightModeProxy = new org::agl::daynightmode("org.agl.homescreen.simulator", //"org.agl.systeminfoprovider"
                                                       "/",
                                                       QDBusConnection::sessionBus(),
                                                       0);
-    QObject::connect(mp_dayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
+    QObject::connect(mp_dBusDayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
 
     // dbus setup
     QDBusConnection dbus = QDBusConnection::sessionBus();
@@ -42,6 +45,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     // no window decoration
     setWindowFlags(Qt::FramelessWindowHint);
+
     mp_ui->setupUi(this);
 
     mp_statusBarWidget = new StatusBarWidget(this);
@@ -58,36 +62,61 @@ MainWindow::MainWindow(QWidget *parent) :
     mp_settingsWidget->raise();
     // apply layout
     mp_settingsWidget->move(0, 60);
-    mp_settingsWidget->hide();
+    //mp_settingsWidget->hide();
+
+    mp_applauncherwidget = new AppLauncherWidget(this);
+    mp_applauncherwidget->raise();
+    // apply layout
+    mp_applauncherwidget->move(0, 60);
+
 
-    mp_popupWidget = new PopupWidget(this);
+    mp_popupWidget = new PopupWidget();
     mp_controlBarWidget->raise();
     // apply layout
     mp_popupWidget->move(0, 0);
 
+
     QObject::connect(mp_settingsWidget, SIGNAL(colorSchemeChanged()), this, SLOT(updateColorScheme()));
     QObject::connect(mp_settingsWidget, SIGNAL(colorSchemeChanged()), mp_statusBarWidget, SLOT(updateColorScheme()));
     QObject::connect(mp_settingsWidget, SIGNAL(colorSchemeChanged()), mp_controlBarWidget, SLOT(updateColorScheme()));
     QObject::connect(mp_settingsWidget, SIGNAL(colorSchemeChanged()), mp_settingsWidget, SLOT(updateColorScheme()));
     QObject::connect(mp_settingsWidget, SIGNAL(colorSchemeChanged()), mp_popupWidget, SLOT(updateColorScheme()));
 
-    QObject::connect(mp_controlBarWidget, SIGNAL(settingsButtonPressed()), mp_settingsWidget, SLOT(show()));
-    QObject::connect(mp_controlBarWidget, SIGNAL(homeButtonPressed()), mp_settingsWidget, SLOT(hide()));
+    QObject::connect(mp_controlBarWidget, SIGNAL(settingsButtonPressed()), mp_settingsWidget, SLOT(raise()));
+    QObject::connect(mp_controlBarWidget, SIGNAL(homeButtonPressed()), mp_applauncherwidget, SLOT(raise()));
+
+    QObject::connect(mp_applauncherwidget, SIGNAL(newRequestsToBeVisibleApp(int)), mp_layoutHandler, SLOT(makeMeVisible(int)));
 
     // apply color scheme
     updateColorScheme();
     mp_statusBarWidget->updateColorScheme();
     mp_controlBarWidget->updateColorScheme();
     mp_settingsWidget->updateColorScheme();
+    mp_applauncherwidget->updateColorScheme();
     mp_popupWidget->updateColorScheme();
 
+    // this is only useful during development and will be removed later
     setWindowIcon(QIcon(":/icons/home_day.png"));
+
+    mp_applauncherwidget->populateAppList();
+    mp_layoutHandler->setUpLayers();
+
+    mp_homeScreenControlInterface = new HomeScreenControlInterface(this);
+    QObject::connect(mp_homeScreenControlInterface, SIGNAL(newRequestsToBeVisibleApp(int)), mp_layoutHandler, SLOT(makeMeVisible(int)));
+
+    QObject::connect(mp_popupWidget, SIGNAL(comboBoxResult(QString)), mp_layoutHandler, SLOT(setLayoutByName(QString)));
 }
 
 MainWindow::~MainWindow()
 {
-    delete mp_dayNightModeProxy;
+    delete mp_homeScreenControlInterface;
+
+    delete mp_dBusDayNightModeProxy;
+
+    delete mp_layoutHandler;
+
     delete mp_popupWidget;
+    delete mp_applauncherwidget;
     delete mp_settingsWidget;
     delete mp_controlBarWidget;
     delete mp_statusBarWidget;
@@ -106,6 +135,7 @@ void MainWindow::dayNightModeSlot(int mode)
     mp_statusBarWidget->updateColorScheme();
     mp_controlBarWidget->updateColorScheme();
     mp_settingsWidget->updateColorScheme();
+    mp_applauncherwidget->updateColorScheme();
     mp_popupWidget->updateColorScheme();
 }
 
@@ -133,3 +163,4 @@ void MainWindow::changeEvent(QEvent* event)
 
     QMainWindow::changeEvent(event);
 }
+