summaryrefslogtreecommitdiffstats
path: root/HomeScreen/src
diff options
context:
space:
mode:
Diffstat (limited to 'HomeScreen/src')
-rw-r--r--HomeScreen/src/applauncherwidget.cpp13
-rw-r--r--HomeScreen/src/controlbarwidget.cpp29
-rw-r--r--HomeScreen/src/controlbarwidget.h6
-rw-r--r--HomeScreen/src/layouthandler.cpp4
-rw-r--r--HomeScreen/src/layouthandler.h2
-rw-r--r--HomeScreen/src/mainwindow.cpp42
-rw-r--r--HomeScreen/src/mainwindow.h6
-rw-r--r--HomeScreen/src/popupwidget.cpp18
-rw-r--r--HomeScreen/src/settingswidget.cpp38
-rw-r--r--HomeScreen/src/settingswidget.h4
-rw-r--r--HomeScreen/src/statusbarwidget.cpp24
11 files changed, 108 insertions, 78 deletions
diff --git a/HomeScreen/src/applauncherwidget.cpp b/HomeScreen/src/applauncherwidget.cpp
index 18c373b..69350db 100644
--- a/HomeScreen/src/applauncherwidget.cpp
+++ b/HomeScreen/src/applauncherwidget.cpp
@@ -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
{
diff --git a/HomeScreen/src/controlbarwidget.cpp b/HomeScreen/src/controlbarwidget.cpp
index cafbb7b..c061a4c 100644
--- a/HomeScreen/src/controlbarwidget.cpp
+++ b/HomeScreen/src/controlbarwidget.cpp
@@ -47,32 +47,37 @@ void ControlBarWidget::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);
QIcon icon;
- mp_ui->widget_Background->setStyleSheet(settings_cs.value(QString("ControlBarWidget/widget_Background")).toString());
+ mp_ui->widget_background->setStyleSheet(settings_cs.value(QString("ControlBarWidget/widget_background_css")).toString());
- icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Home")).toString(), QSize(), QIcon::Normal, QIcon::Off);
- mp_ui->pushButton_Home->setIcon(icon);
- icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Settings")).toString(), QSize(), QIcon::Normal, QIcon::Off);
- mp_ui->pushButton_Settings->setIcon(icon);
- icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Nav")).toString(), QSize(), QIcon::Normal, QIcon::Off);
- mp_ui->pushButton_Nav->setIcon(icon);
+ icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_homeIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+ mp_ui->pushButton_home->setIcon(icon);
+ mp_ui->pushButton_home->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_homeIcon_css")).toString());
+ icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_settingsIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+ mp_ui->pushButton_settings->setIcon(icon);
+ mp_ui->pushButton_settings->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_settingsIcon_css")).toString());
+ icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_navIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+ mp_ui->pushButton_nav->setIcon(icon);
+ mp_ui->pushButton_nav->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_navIcon_css")).toString());
}
-void ControlBarWidget::on_pushButton_Settings_clicked()
+void ControlBarWidget::on_pushButton_home_clicked()
{
- settingsButtonPressed();
+ homeButtonPressed();
}
-void ControlBarWidget::on_pushButton_Home_clicked()
+void ControlBarWidget::on_pushButton_settings_clicked()
{
- homeButtonPressed();
+ settingsButtonPressed();
}
-void ControlBarWidget::on_pushButton_Nav_clicked()
+void ControlBarWidget::on_pushButton_nav_clicked()
{
mp_dBusInputEventProxy->hardKeyPressed(InputEvent::HARDKEY_NAV);
}
diff --git a/HomeScreen/src/controlbarwidget.h b/HomeScreen/src/controlbarwidget.h
index 89e505c..a8bd91c 100644
--- a/HomeScreen/src/controlbarwidget.h
+++ b/HomeScreen/src/controlbarwidget.h
@@ -38,9 +38,9 @@ signals:
void homeButtonPressed();
private slots:
- void on_pushButton_Settings_clicked();
- void on_pushButton_Home_clicked();
- void on_pushButton_Nav_clicked();
+ void on_pushButton_home_clicked();
+ void on_pushButton_settings_clicked();
+ void on_pushButton_nav_clicked();
private:
Ui::ControlBarWidget *mp_ui;
diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp
index a4d0f91..647bc79 100644
--- a/HomeScreen/src/layouthandler.cpp
+++ b/HomeScreen/src/layouthandler.cpp
@@ -31,9 +31,9 @@ LayoutHandler::~LayoutHandler()
delete mp_dBusWindowManagerProxy;
}
-void LayoutHandler::setUpLayers()
+void LayoutHandler::setUpLayouts()
{
- qDebug("setUpLayers");
+ qDebug("setUpLayouts");
QList<SimpleRect> surfaceAreas;
SimpleRect surfaceArea;
diff --git a/HomeScreen/src/layouthandler.h b/HomeScreen/src/layouthandler.h
index 62e4fb5..cc5b59b 100644
--- a/HomeScreen/src/layouthandler.h
+++ b/HomeScreen/src/layouthandler.h
@@ -12,7 +12,7 @@ public:
explicit LayoutHandler(QObject *parent = 0);
~LayoutHandler();
- void setUpLayers();
+ void setUpLayouts();
signals:
diff --git a/HomeScreen/src/mainwindow.cpp b/HomeScreen/src/mainwindow.cpp
index 87558aa..31ba8d0 100644
--- a/HomeScreen/src/mainwindow.cpp
+++ b/HomeScreen/src/mainwindow.cpp
@@ -28,6 +28,7 @@ MainWindow::MainWindow(QWidget *parent) :
mp_popupWidget(0),
mp_layoutHandler(new LayoutHandler()),
mp_dBusDayNightModeProxy(0),
+ mp_proximityAdaptor(0),
mp_homeScreenControlInterface(0)
{
// this has to be adopted to the system setup
@@ -37,10 +38,11 @@ MainWindow::MainWindow(QWidget *parent) :
0);
QObject::connect(mp_dBusDayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
+ mp_proximityAdaptor = new ProximityAdaptor((QObject*)this);
+
// dbus setup
QDBusConnection dbus = QDBusConnection::sessionBus();
-
- dbus.registerObject("/MainWindow", this);
+ dbus.registerObject("/Proximity", this);
dbus.registerService("org.agl.homescreen");
// no window decoration
@@ -89,17 +91,12 @@ MainWindow::MainWindow(QWidget *parent) :
// 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_layoutHandler->setUpLayouts();
mp_homeScreenControlInterface = new HomeScreenControlInterface(this);
QObject::connect(mp_homeScreenControlInterface, SIGNAL(newRequestsToBeVisibleApp(int)), mp_layoutHandler, SLOT(makeMeVisible(int)));
@@ -120,6 +117,7 @@ MainWindow::~MainWindow()
delete mp_settingsWidget;
delete mp_controlBarWidget;
delete mp_statusBarWidget;
+ delete mp_proximityAdaptor;
delete mp_ui;
}
@@ -131,12 +129,17 @@ void MainWindow::dayNightModeSlot(int mode)
settings.sync();
updateColorScheme();
+}
- mp_statusBarWidget->updateColorScheme();
- mp_controlBarWidget->updateColorScheme();
- mp_settingsWidget->updateColorScheme();
- mp_applauncherwidget->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();
}
void MainWindow::updateColorScheme()
@@ -146,12 +149,21 @@ void MainWindow::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("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();
}
void MainWindow::changeEvent(QEvent* event)
diff --git a/HomeScreen/src/mainwindow.h b/HomeScreen/src/mainwindow.h
index d94546a..4b41761 100644
--- a/HomeScreen/src/mainwindow.h
+++ b/HomeScreen/src/mainwindow.h
@@ -19,6 +19,7 @@
#include <QMainWindow>
#include "daynightmode_proxy.h"
+#include "proximity_adapter.h"
#include "homescreencontrolinterface.h"
@@ -47,6 +48,9 @@ public:
public Q_SLOTS:
void dayNightModeSlot(int mode);
+// from proximity_adapter.h
+public Q_SLOTS:
+ void setObjectDetected(bool detected);
public slots:
void updateColorScheme();
@@ -71,6 +75,8 @@ private:
org::agl::daynightmode *mp_dBusDayNightModeProxy;
+ ProximityAdaptor *mp_proximityAdaptor;
+
HomeScreenControlInterface *mp_homeScreenControlInterface;
};
diff --git a/HomeScreen/src/popupwidget.cpp b/HomeScreen/src/popupwidget.cpp
index 919bea0..e7226dd 100644
--- a/HomeScreen/src/popupwidget.cpp
+++ b/HomeScreen/src/popupwidget.cpp
@@ -51,38 +51,40 @@ void PopupWidget::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_Popup->setStyleSheet(settings_cs.value(QString("PopupWidget/widget_Popup")).toString());
- mp_ui->label_Text->setStyleSheet(settings_cs.value(QString("PopupWidget/label_Text")).toString());
+ mp_ui->widget_popup->setStyleSheet(settings_cs.value(QString("PopupWidget/widget_popup_css")).toString());
+ mp_ui->label_text->setStyleSheet(settings_cs.value(QString("PopupWidget/label_text_css")).toString());
}
void PopupWidget::showPopup(int /*type*/, const QString &text)
{
m_sendComboBoxChoice = false;
- mp_ui->comboBox->hide();
+ mp_ui->comboBox_choice->hide();
this->show();
this->raise();
- mp_ui->label_Text->setText(text);
+ mp_ui->label_text->setText(text);
}
void PopupWidget::showPopupComboBox(const QString &text, const QStringList &choices)
{
m_sendComboBoxChoice = true;
- mp_ui->comboBox->addItems(choices);
- mp_ui->comboBox->show();
+ mp_ui->comboBox_choice->addItems(choices);
+ mp_ui->comboBox_choice->show();
this->show();
this->raise();
- mp_ui->label_Text->setText(text);
+ mp_ui->label_text->setText(text);
}
void PopupWidget::on_pushButton_OK_clicked()
{
if (m_sendComboBoxChoice)
{
- comboBoxResult(mp_ui->comboBox->currentText());
+ comboBoxResult(mp_ui->comboBox_choice->currentText());
m_sendComboBoxChoice = false;
}
this->close();
diff --git a/HomeScreen/src/settingswidget.cpp b/HomeScreen/src/settingswidget.cpp
index 9df4a1c..85e97cb 100644
--- a/HomeScreen/src/settingswidget.cpp
+++ b/HomeScreen/src/settingswidget.cpp
@@ -34,17 +34,17 @@ SettingsWidget::SettingsWidget(QWidget *parent) :
mp_ui->setupUi(this);
- mp_ui->comboBoxLanguage->addItem(QString("English"), QVariant("homescreen_en_US.qm")); // TODO: make this configurable
- mp_ui->comboBoxLanguage->addItem(QString("Deutsch"), QVariant("homescreen_de_DE.qm"));
- mp_ui->comboBoxLanguage->addItem(QString("日本語"), QVariant("homescreen_ja_JP.qm"));
+ mp_ui->comboBox_language->addItem(QString("English"), QVariant("homescreen_en_US.qm")); // TODO: make this configurable
+ mp_ui->comboBox_language->addItem(QString("Deutsch"), QVariant("homescreen_de_DE.qm"));
+ mp_ui->comboBox_language->addItem(QString("日本語"), QVariant("homescreen_ja_JP.qm"));
- mp_ui->comboBoxColorScheme->addItem(QString("Default"), QVariant("default")); // TODO: make this configurable
- mp_ui->comboBoxColorScheme->addItem(QString("Demo 1"), QVariant("demo1"));
- mp_ui->comboBoxColorScheme->addItem(QString("Demo 2"), QVariant("demo2"));
+ mp_ui->comboBox_colorScheme->addItem(QString("Default"), QVariant("default")); // TODO: make this configurable
+ mp_ui->comboBox_colorScheme->addItem(QString("Demo 1"), QVariant("demo1"));
+ mp_ui->comboBox_colorScheme->addItem(QString("Demo 2"), QVariant("demo2"));
QSettings settings;
- mp_ui->comboBoxLanguage->setCurrentIndex(settings.value("systemsettings/language", 0).toInt());
- mp_ui->comboBoxColorScheme->setCurrentIndex(settings.value("systemsettings/colorschemeindex", 0).toInt());
+ mp_ui->comboBox_language->setCurrentIndex(settings.value("systemsettings/language", 0).toInt());
+ mp_ui->comboBox_colorScheme->setCurrentIndex(settings.value("systemsettings/colorschemeindex", 0).toInt());
}
SettingsWidget::~SettingsWidget()
@@ -60,14 +60,16 @@ void SettingsWidget::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("SettingsWidget/widget_Background").toString());
- mp_ui->comboBoxLanguage->setStyleSheet(settings_cs.value("SettingsWidget/comboBoxLanguage").toString());
- mp_ui->comboBoxColorScheme->setStyleSheet(settings_cs.value("SettingsWidget/comboBoxColorScheme").toString());
- mp_ui->widget_Settings_Icon->setStyleSheet(settings_cs.value("SettingsWidget/widget_Settings_Icon").toString());
+ mp_ui->widget_background->setStyleSheet(settings_cs.value("SettingsWidget/widget_background_css").toString());
+ mp_ui->comboBox_language->setStyleSheet(settings_cs.value("SettingsWidget/comboBox_language_css").toString());
+ mp_ui->comboBox_colorScheme->setStyleSheet(settings_cs.value("SettingsWidget/comboBox_colorScheme_css").toString());
+ mp_ui->widget_settingsIcon->setStyleSheet(settings_cs.value("SettingsWidget/widget_settingsIcon_css").toString());
}
void SettingsWidget::changeEvent(QEvent* event)
@@ -80,20 +82,20 @@ void SettingsWidget::changeEvent(QEvent* event)
QWidget::changeEvent(event);
}
-void SettingsWidget::on_comboBoxLanguage_currentIndexChanged(const QString &)
+void SettingsWidget::on_comboBox_language_currentIndexChanged(const QString &)
{
if (0 != mp_translator)
- mp_translator->load(mp_ui->comboBoxLanguage->currentData().toString(), ":/translations");
+ mp_translator->load(mp_ui->comboBox_language->currentData().toString(), ":/translations");
QSettings settings;
- settings.setValue("systemsettings/language", mp_ui->comboBoxLanguage->currentIndex());
+ settings.setValue("systemsettings/language", mp_ui->comboBox_language->currentIndex());
}
-void SettingsWidget::on_comboBoxColorScheme_currentIndexChanged(const QString &)
+void SettingsWidget::on_comboBox_colorScheme_currentIndexChanged(const QString &)
{
QSettings settings;
- settings.setValue("systemsettings/colorscheme", mp_ui->comboBoxColorScheme->currentData().toString());
- settings.setValue("systemsettings/colorschemeindex", mp_ui->comboBoxColorScheme->currentIndex());
+ settings.setValue("systemsettings/colorscheme", mp_ui->comboBox_colorScheme->currentData().toString());
+ settings.setValue("systemsettings/colorschemeindex", mp_ui->comboBox_colorScheme->currentIndex());
// make sure that everything is written to the settings file before continuing
settings.sync();
diff --git a/HomeScreen/src/settingswidget.h b/HomeScreen/src/settingswidget.h
index e0b3fef..067d095 100644
--- a/HomeScreen/src/settingswidget.h
+++ b/HomeScreen/src/settingswidget.h
@@ -39,8 +39,8 @@ protected:
void changeEvent(QEvent* event);
private slots:
- void on_comboBoxLanguage_currentIndexChanged(const QString &);
- void on_comboBoxColorScheme_currentIndexChanged(const QString &);
+ void on_comboBox_language_currentIndexChanged(const QString &);
+ void on_comboBox_colorScheme_currentIndexChanged(const QString &);
signals:
void colorSchemeChanged(void);
diff --git a/HomeScreen/src/statusbarwidget.cpp b/HomeScreen/src/statusbarwidget.cpp
index 5628172..6097f8d 100644
--- a/HomeScreen/src/statusbarwidget.cpp
+++ b/HomeScreen/src/statusbarwidget.cpp
@@ -47,26 +47,28 @@ void StatusBarWidget::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->setStyleSheet(settings_cs.value(QString("StatusBarWidget/widget")).toString());
- mp_ui->label_1->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1")).toString());
- mp_ui->label_2->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2")).toString());
- mp_ui->label_3->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3")).toString());
- mp_ui->label_4->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4")).toString());
- mp_ui->label_5->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5")).toString());
+ mp_ui->widget_background->setStyleSheet(settings_cs.value(QString("StatusBarWidget/widget_background_css")).toString());
+ mp_ui->label_1->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1_css")).toString());
+ mp_ui->label_2->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2_css")).toString());
+ mp_ui->label_3->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3_css")).toString());
+ mp_ui->label_4->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4_css")).toString());
+ mp_ui->label_5->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5_css")).toString());
- mp_ui->label_1_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1_icon")).toString()
+ mp_ui->label_1_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1_icon_css")).toString()
+ QString(" border-image: url(") + mp_statusbarIconURIs->value(1) + QString(") 0 0 0 0 stretch stretch;"));
- mp_ui->label_2_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2_icon")).toString()
+ mp_ui->label_2_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2_icon_css")).toString()
+ QString(" border-image: url(") + mp_statusbarIconURIs->value(2) + QString(") 0 0 0 0 stretch stretch;"));
- mp_ui->label_3_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3_icon")).toString()
+ mp_ui->label_3_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3_icon_css")).toString()
+ QString(" border-image: url(") + mp_statusbarIconURIs->value(3) + QString(") 0 0 0 0 stretch stretch;"));
- mp_ui->label_4_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4_icon")).toString()
+ mp_ui->label_4_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4_icon_css")).toString()
+ QString(" border-image: url(") + mp_statusbarIconURIs->value(4) + QString(") 0 0 0 0 stretch stretch;"));
- mp_ui->label_5_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5_icon")).toString()
+ mp_ui->label_5_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5_icon_css")).toString()
+ QString(" border-image: url(") + mp_statusbarIconURIs->value(5) + QString(") 0 0 0 0 stretch stretch;"));
}