diff --git a/res.qrc b/res.qrc
index b626a0840..a7ac641ed 100644
--- a/res.qrc
+++ b/res.qrc
@@ -46,7 +46,6 @@
img/transfer.svg
themes/dark/palette.ini
themes/dark/fileTransferWidget/fileDone.svg
- themes/dark/centralWidget/centralWidget.css
themes/dark/chatArea/chatArea.css
themes/dark/chatArea/chatHead.css
themes/dark/chatArea/innerStyle.css
@@ -113,7 +112,6 @@
themes/dark/tooliconsZone/tooliconsZone.css
themes/default/palette.ini
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
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index ee32b0757..19bae9d52 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -299,7 +299,6 @@ void GenericChatForm::reloadTheme()
{
const Settings& s = Settings::getInstance();
setStyleSheet(Style::getStylesheet("genericChatForm/genericChatForm.css"));
-
msgEdit->setStyleSheet(Style::getStylesheet("msgEdit/msgEdit.css")
+ fontToCss(s.getChatMessageFont(), "QTextEdit"));
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index d1caba302..2279078d6 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1634,6 +1634,7 @@ ContentLayout* Widget::createContentDialog(DialogType type) const
Translator::registerHandler(std::bind(&Dialog::retranslateUi, this), this);
retranslateUi();
setWindowIcon(QIcon(":/img/icons/qtox.svg"));
+ setStyleSheet(Style::getStylesheet("window/general.css"));
connect(Core::getInstance(), &Core::usernameSet, this, &Dialog::retranslateUi);
}
@@ -2185,7 +2186,6 @@ void Widget::reloadTheme()
{
this->setStyleSheet(Style::getStylesheet("window/general.css"));
QString statusPanelStyle = Style::getStylesheet("window/statusPanel.css");
- ui->centralwidget->setStyleSheet(Style::getStylesheet(QStringLiteral("centralWidget/centralWidget.css")));
ui->tooliconsZone->setStyleSheet(Style::getStylesheet("tooliconsZone/tooliconsZone.css"));
ui->statusPanel->setStyleSheet(statusPanelStyle);
ui->statusHead->setStyleSheet(statusPanelStyle);
diff --git a/themes/dark/centralWidget/centralWidget.css b/themes/dark/centralWidget/centralWidget.css
deleted file mode 100644
index 6aefd33b3..000000000
--- a/themes/dark/centralWidget/centralWidget.css
+++ /dev/null
@@ -1,24 +0,0 @@
-QLabel
-{
- color: @mainText;
-}
-
-QLineEdit
-{
- color: @mainText;
-}
-
-QTextEdit
-{
- color: @mainText;
-}
-
-QSpinBox, QDoubleSpinBox
-{
- color: @mainText;
-}
-
-QListView
-{
- color: @mainText;
-}
diff --git a/themes/dark/contentDialog/contentDialog.css b/themes/dark/contentDialog/contentDialog.css
index dd15f6a25..7429d756d 100644
--- a/themes/dark/contentDialog/contentDialog.css
+++ b/themes/dark/contentDialog/contentDialog.css
@@ -18,4 +18,5 @@ QSplitter:handle
QWidget
{
background: @groundBase;
+ color: @mainText;
}
diff --git a/themes/dark/window/general.css b/themes/dark/window/general.css
index 42a214eb0..0f91019f9 100644
--- a/themes/dark/window/general.css
+++ b/themes/dark/window/general.css
@@ -6,6 +6,11 @@ QToolTip
background: #ffffdc;
}
+QDialog
+{
+ background: @groundBase;
+}
+
QWidget#contentWidget
{
background: @groundBase;
@@ -27,3 +32,28 @@ QTabBar::tab:!selected
background: #444242;
color: #8e8e8e;
}
+
+QLabel
+{
+ color: @mainText;
+}
+
+QLineEdit
+{
+ color: @mainText;
+}
+
+QTextEdit
+{
+ color: @mainText;
+}
+
+QSpinBox, QDoubleSpinBox
+{
+ color: @mainText;
+}
+
+QListView
+{
+ color: @mainText;
+}
diff --git a/themes/default/centralWidget/centralWidget.css b/themes/default/centralWidget/centralWidget.css
deleted file mode 100644
index 6aefd33b3..000000000
--- a/themes/default/centralWidget/centralWidget.css
+++ /dev/null
@@ -1,24 +0,0 @@
-QLabel
-{
- color: @mainText;
-}
-
-QLineEdit
-{
- color: @mainText;
-}
-
-QTextEdit
-{
- color: @mainText;
-}
-
-QSpinBox, QDoubleSpinBox
-{
- color: @mainText;
-}
-
-QListView
-{
- color: @mainText;
-}
diff --git a/themes/default/contentDialog/contentDialog.css b/themes/default/contentDialog/contentDialog.css
index ebfe7c1da..eea4adecf 100644
--- a/themes/default/contentDialog/contentDialog.css
+++ b/themes/default/contentDialog/contentDialog.css
@@ -14,3 +14,9 @@ QSplitter:handle
color: white;
background-color: white;
}
+
+QWidget
+{
+ background: @groundBase;
+ color: @mainText;
+}
diff --git a/themes/default/window/general.css b/themes/default/window/general.css
index aafc76c58..58100f8b1 100644
--- a/themes/default/window/general.css
+++ b/themes/default/window/general.css
@@ -22,3 +22,28 @@ QTabBar::tab:!selected
background: #d0d1d1;
color: #5e5e5e;
}
+
+QLabel
+{
+ color: @mainText;
+}
+
+QLineEdit
+{
+ color: @mainText;
+}
+
+QTextEdit
+{
+ color: @mainText;
+}
+
+QSpinBox, QDoubleSpinBox
+{
+ color: @mainText;
+}
+
+QListView
+{
+ color: @mainText;
+}