- mp_dayNightModeProxy(0)
+ mp_layoutHandler(new LayoutHandler()),
+ mp_dBusDayNightModeProxy(0),
+ mp_proximityAdaptor(0),
+ mp_homeScreenControlInterface(0)
- QObject::connect(mp_dayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
+ QObject::connect(mp_dBusDayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
+
+ mp_proximityAdaptor = new ProximityAdaptor((QObject*)this);
mp_settingsWidget->raise();
// apply layout
mp_settingsWidget->move(0, 60);
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_controlBarWidget->raise();
// apply layout
mp_popupWidget->move(0, 0);
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_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)));
+
+ mp_applauncherwidget->populateAppList();
+ mp_layoutHandler->setUpLayouts();
+
+ 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)));
delete mp_settingsWidget;
delete mp_controlBarWidget;
delete mp_statusBarWidget;
delete mp_settingsWidget;
delete mp_controlBarWidget;
delete mp_statusBarWidget;
- mp_statusBarWidget->updateColorScheme();
- mp_controlBarWidget->updateColorScheme();
- mp_settingsWidget->updateColorScheme();
- mp_popupWidget->updateColorScheme();
+void MainWindow::setObjectDetected(bool detected)
+{
+ qDebug("setObjectDetected %s", detected ? "true" : "false");
+ QSettings settings;
+ settings.setValue("systemsettings/proximityobjectdetected", detected);
+ // make sure that everything is written to the settings file before continuing
+ settings.sync();
+
+ updateColorScheme();
- mp_ui->widget_Background->setStyleSheet(settings_cs.value("MainWindow/widget_Background").toString());
- mp_ui->widget_Home_Icon->setStyleSheet(settings_cs.value("MainWindow/widget_Home_Icon").toString());
+ mp_ui->widget_background->setStyleSheet(settings_cs.value("MainWindow/widget_background_css").toString());
+ mp_ui->widget_homeIcon->setStyleSheet(settings_cs.value("MainWindow/widget_homeIcon_css").toString());
+
+ // update children
+ mp_statusBarWidget->updateColorScheme();
+ mp_controlBarWidget->updateColorScheme();
+ mp_settingsWidget->updateColorScheme();
+ mp_applauncherwidget->updateColorScheme();
+ mp_popupWidget->updateColorScheme();