summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-11-05 10:39:16 +0100
committerSimon Rettberg2018-11-05 10:39:16 +0100
commit57518f13467100384848e293a68dcf19e9524abe (patch)
treee6cbbf361eb2819cb4384380af63cbe8aa29600d
parentMove more styling (font-size) to QSS (diff)
downloadbwlp-screensaver-23.tar.gz
bwlp-screensaver-23.tar.xz
bwlp-screensaver-23.zip
Remove default stylesheet, only load from filev23
-rw-r--r--src/saverwidget.cpp8
-rw-r--r--src/ui/saver.ui18
2 files changed, 4 insertions, 22 deletions
diff --git a/src/saverwidget.cpp b/src/saverwidget.cpp
index d7f3a74..88cf5a3 100644
--- a/src/saverwidget.cpp
+++ b/src/saverwidget.cpp
@@ -9,6 +9,7 @@
#include <QDateTime>
#include <QSettings>
#include <QFile>
+#include <QDebug>
#include <X11/Xlib.h>
static const QChar C_ZERO('0');
@@ -36,11 +37,10 @@ SaverWidget::SaverWidget(WId parentWinId, QWidget *parent) :
_standbyDisabled(false),
_isLocked(false)
{
- ui->setupUi(this);
QString qss = Config::getMainQss();
- if (!qss.isEmpty()) {
- this->setStyleSheet(qss);
- }
+ qDebug() << "Applying QSS: " << qss;
+ this->setStyleSheet(qss);
+ ui->setupUi(this);
QTimer *t = new QTimer(this);
t->setInterval(1000);
connect(t, &QTimer::timeout, [=]() {
diff --git a/src/ui/saver.ui b/src/ui/saver.ui
index 6bf7067..aabd4e6 100644
--- a/src/ui/saver.ui
+++ b/src/ui/saver.ui
@@ -18,24 +18,6 @@
<property name="windowTitle">
<string>Form</string>
</property>
- <property name="styleSheet">
- <string notr="true">#Saver {
- background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #443, stop:1 #000)
-}
-
-QLabel {
- color: #f64;
-}
-
-#lblClock {
- color: #999;
- font-size: 20pt;
-}
-
-#lblHeader {
- font-size: 20pt;
-}</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="lblHeader">