From 147cec3312088d6d8c6407c8e5d0c40ab681f4e4 Mon Sep 17 00:00:00 2001 From: TriKriSta Date: Sat, 15 Dec 2018 13:33:51 +0200 Subject: [PATCH] refactor: rename a css file. --- res.qrc | 2 +- src/main.cpp | 3 --- src/widget/widget.cpp | 1 + .../{global.css => centralWidget/centralWidget.css} | 0 themes/default/loginScreen/loginScreen.css | 10 ---------- 5 files changed, 2 insertions(+), 14 deletions(-) rename themes/default/{global.css => centralWidget/centralWidget.css} (100%) diff --git a/res.qrc b/res.qrc index e2e92fec4..d51b036bf 100644 --- a/res.qrc +++ b/res.qrc @@ -45,6 +45,7 @@ img/taskbar/light/taskbar_event.svg img/transfer.svg themes/default/fileTransferWidget/fileDone.svg + themes/default/centralWidget/centralWidget.css themes/default/chatArea/chatArea.css themes/default/chatArea/chatHead.css themes/default/chatArea/innerStyle.css @@ -102,7 +103,6 @@ themes/default/fileTransferInstance/filetransferWidget.css themes/default/acceptCall/acceptCall.svg themes/default/rejectCall/rejectCall.svg - themes/default/global.css img/login_logo.svg themes/default/notificationEdge/notificationEdge.css themes/default/loginScreen/loginScreen.css diff --git a/src/main.cpp b/src/main.cpp index 770a93abb..69e592a6b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,6 @@ #include "src/persistence/toxsave.h" #include "src/video/camerasource.h" #include "src/widget/loginscreen.h" -#include "src/widget/style.h" #include "src/widget/translator.h" #include "widget/widget.h" #include @@ -372,8 +371,6 @@ int main(int argc, char* argv[]) QObject::connect(a.get(), &QApplication::aboutToQuit, cleanup); - a->setStyleSheet(Style::getStylesheet(QStringLiteral("global.css"))); - // Run int errorcode = a->exec(); diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 459403759..d31546644 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -146,6 +146,7 @@ void Widget::init() connect(actionQuit, &QAction::triggered, qApp, &QApplication::quit); layout()->setContentsMargins(0, 0, 0, 0); + ui->centralwidget->setStyleSheet(Style::getStylesheet(QStringLiteral("centralWidget/centralWidget.css"))); ui->friendList->setStyleSheet(Style::getStylesheet("friendList/friendList.css")); profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.svg"); diff --git a/themes/default/global.css b/themes/default/centralWidget/centralWidget.css similarity index 100% rename from themes/default/global.css rename to themes/default/centralWidget/centralWidget.css diff --git a/themes/default/loginScreen/loginScreen.css b/themes/default/loginScreen/loginScreen.css index ff183abfc..074070f05 100644 --- a/themes/default/loginScreen/loginScreen.css +++ b/themes/default/loginScreen/loginScreen.css @@ -62,16 +62,6 @@ QLabel, QCheckBox, QProgressBar color: black; } -QLineEdit -{ - color: #f1f1f1; -} - -QListView -{ - color: #f1f1f1; -} - QCheckBox:disabled { color: gray;