From 00aac5f152259a61455f4f97fd04af72ef9a6f44 Mon Sep 17 00:00:00 2001 From: TriKriSta Date: Tue, 16 Apr 2019 18:46:28 +0300 Subject: [PATCH] style: edit styles add custom themes in AboutFriendForm edit style for QSpinBox disable edit palette color for dark theme and etc --- res.qrc | 2 - src/widget/about/aboutfriendform.cpp | 3 + src/widget/contentlayout.cpp | 2 +- themes/dark/palette.ini | 2 +- themes/dark/settings/mainContent.css | 267 ----------------------- themes/dark/window/general.css | 271 ++++++++++++++++++++++-- themes/default/settings/mainContent.css | 218 ------------------- themes/default/window/general.css | 227 +++++++++++++++++++- 8 files changed, 483 insertions(+), 509 deletions(-) delete mode 100644 themes/dark/settings/mainContent.css delete mode 100644 themes/default/settings/mainContent.css diff --git a/res.qrc b/res.qrc index a7ac641ed..dbde68ed3 100644 --- a/res.qrc +++ b/res.qrc @@ -81,7 +81,6 @@ themes/dark/emoticonWidget/emoticonWidget.css themes/dark/friendList/friendList.css themes/dark/msgEdit/msgEdit.css - themes/dark/settings/mainContent.css themes/dark/settings/mainHead.css themes/dark/settings/checkboxChecked.svg themes/dark/settings/checkboxCheckedDisabled.svg @@ -147,7 +146,6 @@ themes/default/emoticonWidget/emoticonWidget.css themes/default/friendList/friendList.css themes/default/msgEdit/msgEdit.css - themes/default/settings/mainContent.css themes/default/settings/mainHead.css themes/default/statusButton/statusButton.css themes/default/statusButton/menu_indicator.svg diff --git a/src/widget/about/aboutfriendform.cpp b/src/widget/about/aboutfriendform.cpp index e8e5ce6db..90dfff4aa 100644 --- a/src/widget/about/aboutfriendform.cpp +++ b/src/widget/about/aboutfriendform.cpp @@ -2,6 +2,7 @@ #include "src/widget/gui.h" #include "ui_aboutfriendform.h" #include "src/core/core.h" +#include "src/widget/style.h" #include #include @@ -46,6 +47,8 @@ AboutFriendForm::AboutFriendForm(std::unique_ptr _about, QWidget* ui->note->setPlainText(about->getNote()); ui->statusMessage->setText(about->getStatusMessage()); ui->avatar->setPixmap(about->getAvatar()); + + setStyleSheet(Style::getStylesheet("window/general.css")); } static QString getAutoAcceptDir(const QString& dir) diff --git a/src/widget/contentlayout.cpp b/src/widget/contentlayout.cpp index 29f932449..d05907d2a 100644 --- a/src/widget/contentlayout.cpp +++ b/src/widget/contentlayout.cpp @@ -70,7 +70,7 @@ void ContentLayout::reloadTheme() { #ifndef Q_OS_MAC mainHead->setStyleSheet(Style::getStylesheet("settings/mainHead.css")); - mainContent->setStyleSheet(Style::getStylesheet("settings/mainContent.css")); + mainContent->setStyleSheet(Style::getStylesheet("window/general.css")); #endif } diff --git a/themes/dark/palette.ini b/themes/dark/palette.ini index 07b36d2f2..719d17783 100644 --- a/themes/dark/palette.ini +++ b/themes/dark/palette.ini @@ -8,7 +8,7 @@ nameActive="#c3c3c3" statusActive="#d1d1d1" groundExtra="#d1d1d1" groundBase="#201f1f" -orange="#ff7700" +orange="#713400" themeDark="#1c1c1c" themeMediumDark="#2a2a2a" themeMedium="#100f0f" diff --git a/themes/dark/settings/mainContent.css b/themes/dark/settings/mainContent.css deleted file mode 100644 index 7796a5b66..000000000 --- a/themes/dark/settings/mainContent.css +++ /dev/null @@ -1,267 +0,0 @@ -QTextEdit -{ - border-color: @groundExtra; - border-style: solid; - border-width: 1px 0 1px 1px; - background: @groundBase; - border: 1px solid #c4c1bd; -} - -QListWidget -{ - background-color: @groundBase; -} - -QMessageBox -{ - background-color: @groundBase; -} - -QCheckBox -{ - color: @mainText; -} - -QCheckBox::indicator { - width: 12px; - height: 12px; - border: 2px solid #514f4f; - border-radius: 2px; -} - -QCheckBox::indicator:checked { - image: url("@getImagePath(settings/checkboxChecked.svg)"); -} - -QCheckBox::indicator:checked:pressed, -QCheckBox::indicator:unchecked:pressed { - background: #514f4f; -} - -QCheckBox:disabled -{ - color: grey; -} - -QCheckBox:indicator:disabled { - border: 2px solid #373535; - border-radius: 2px; -} - -QCheckBox:indicator:checked:disabled { - image: url("@getImagePath(settings/checkboxCheckedDisabled.svg)"); -} - -QSpinBox, QDoubleSpinBox -{ - background-color: @groundBase; -} - -QSpinBox:disabled, QDoubleSpinBox:disabled -{ - background-color: lightGrey; -} - -QGroupBox -{ - color: @mainText; - background-color: @groundBase; - font: @bigBold; -} - -QComboBox -{ - color: @mainText; - background-color: @groundBase; -} - -QComboBox QAbstractItemView { - background-color: @groundBase; -} - -QLineEdit -{ - background-color: @groundBase; -} - -QLineEdit:disabled -{ - background-color: #262424; - color: @groundBase; -} - -QTabWidget -{ - background-color: #100f0f; -} - -QTabBar::tab:selected -{ - background: #100f0f; - color: @mainText; -} - -QTabBar::tab:!selected -{ - background: #444242; - color: #8e8e8e; -} - -QScrollArea -{ - background-color: @groundBase; -} - -QScrollArea > QWidget > QWidget -{ - background: transparent; -} - -QScrollArea::corner -{ - background-color: @groundBase; - border: none; -} - -QScrollBar:vertical -{ - background: transparent; - width: 12px; - margin-top: 2px; - margin-bottom: 2px; -} - -/* using last is a bit of a hack, but QTabBar otherwise doesn't allow selecting single tabs */ -QTabBar::tab:last:!selected[update-available=true] -{ - background-color: #80c580; -} - -QPushButton#updateAvailableButton -{ - background-color: #21da21; -} - -QScrollBar::handle:vertical -{ - background-color: #343232; - min-height: 20px; - border-radius: 3px; - margin-left: 2px; -} - -QScrollBar::handle:vertical:hover -{ - background-color: #3e3c3c; -} - -QScrollBar::handle:vertical:pressed -{ - background-color: #474545; -} - -QScrollBar::add-line:vertical -{ - background-color: white; - height: 0px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:vertical -{ - background-color: white; - height: 0px; - subcontrol-position: top; - subcontrol-origin: margin; -} - -QScrollBar:QScrollBar::down-arrow:vertical -{ - width: 10; - height: 10px; - background-color: white; -} - -QScrollBar:QScrollBar::up-arrow:vertical -{ - width: 10px; - height: 10px; - background-color: white; -} - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical -{ - background: none; -} - -QScrollBar:horizontal -{ - background-color: white; - height: 10px; - margin: 0 2px 0 2px; -} - -QScrollBar::handle:horizontal -{ - background-color: #343232; - min-width: 20px; - border-radius: 2px; -} - -QScrollBar::handle:horizontal:hover -{ - background-color: #3e3c3c; -} - -QScrollBar::handle:horizontal:pressed -{ - background-color: #474545; -} - -QScrollBar::add-line:horizontal -{ - background-color: white; - width: 0px; - subcontrol-position: right; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:horizontal -{ - background-color: white; - width: 0px; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar:QScrollBar::down-arrow:horizontal -{ - width: 10; - height: 10px; - background-color: white; -} - -QScrollBar:QScrollBar::up-arrow:horizontal -{ - width: 10px; - height: 10px; - background-color: white; -} - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal -{ - background: none; -} - -QRadioButton -{ - background: @groundBase; - color: @mainText; -} - -QPushButton -{ - background: #323030; - color: @mainText; -} diff --git a/themes/dark/window/general.css b/themes/dark/window/general.css index 0f91019f9..78375d646 100644 --- a/themes/dark/window/general.css +++ b/themes/dark/window/general.css @@ -18,7 +18,7 @@ QWidget#contentWidget QTabWidget { - background-color: @groundBase; + background-color: #100f0f; } QTabBar::tab:selected @@ -38,22 +38,261 @@ QLabel color: @mainText; } -QLineEdit -{ - color: @mainText; -} - -QTextEdit -{ - color: @mainText; -} - -QSpinBox, QDoubleSpinBox -{ - color: @mainText; -} - QListView { color: @mainText; } + +QTextEdit, QPlainTextEdit +{ + border-color: #514f4f; + border-style: solid; + border-width: 1px 0 1px 1px; + background: @groundBase; + color: @mainText; +} + +QListWidget +{ + background-color: @groundBase; +} + +QMessageBox +{ + background-color: @groundBase; +} + +QCheckBox +{ + color: @mainText; +} + +QCheckBox::indicator { + width: 12px; + height: 12px; + border: 2px solid #514f4f; + border-radius: 2px; +} + +QCheckBox::indicator:checked { + image: url("@getImagePath(settings/checkboxChecked.svg)"); +} + +QCheckBox::indicator:checked:pressed, +QCheckBox::indicator:unchecked:pressed { + background: #514f4f; +} + +QCheckBox:disabled +{ + color: grey; +} + +QCheckBox:indicator:disabled { + border: 2px solid #373535; + border-radius: 2px; +} + +QCheckBox:indicator:checked:disabled { + image: url("@getImagePath(settings/checkboxCheckedDisabled.svg)"); +} + +QSpinBox, QDoubleSpinBox +{ + background: @groundBase; + color: @mainText; +} + +QSpinBox:disabled, QDoubleSpinBox:disabled +{ + background: #262424; + color: grey; +} + +QGroupBox +{ + color: @mainText; + background-color: @groundBase; + font: @bigBold; +} + +QComboBox +{ + color: @mainText; + background-color: @groundBase; +} + +QComboBox QAbstractItemView { + background-color: @groundBase; +} + +QLineEdit +{ + background: @groundBase; + color: @mainText; +} + +QLineEdit:disabled +{ + background-color: #262424; + color: grey; +} + +QScrollArea +{ + background-color: @groundBase; +} + +QScrollArea > QWidget > QWidget +{ + background: transparent; +} + +QScrollArea::corner +{ + background-color: @groundBase; + border: none; +} + +QScrollBar:vertical +{ + background: transparent; + width: 12px; + margin-top: 2px; + margin-bottom: 2px; +} + +/* using last is a bit of a hack, but QTabBar otherwise doesn't allow selecting single tabs */ +QTabBar::tab:last:!selected[update-available=true] +{ + background-color: #80c580; +} + +QPushButton#updateAvailableButton +{ + background-color: #21da21; +} + +QScrollBar::handle:vertical +{ + background-color: #343232; + min-height: 20px; + border-radius: 3px; + margin-left: 2px; +} + +QScrollBar::handle:vertical:hover +{ + background-color: #3e3c3c; +} + +QScrollBar::handle:vertical:pressed +{ + background-color: #474545; +} + +QScrollBar::add-line:vertical +{ + background-color: white; + height: 0px; + subcontrol-position: bottom; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:vertical +{ + background-color: white; + height: 0px; + subcontrol-position: top; + subcontrol-origin: margin; +} + +QScrollBar:QScrollBar::down-arrow:vertical +{ + width: 10; + height: 10px; + background-color: white; +} + +QScrollBar:QScrollBar::up-arrow:vertical +{ + width: 10px; + height: 10px; + background-color: white; +} + +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical +{ + background: none; +} + +QScrollBar:horizontal +{ + background: transparent; + height: 10px; + margin: 0 2px 0 2px; +} + +QScrollBar::handle:horizontal +{ + background-color: #343232; + min-width: 20px; + border-radius: 2px; +} + +QScrollBar::handle:horizontal:hover +{ + background-color: #3e3c3c; +} + +QScrollBar::handle:horizontal:pressed +{ + background-color: #474545; +} + +QScrollBar::add-line:horizontal +{ + background-color: white; + width: 0px; + subcontrol-position: right; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:horizontal +{ + background-color: white; + width: 0px; + subcontrol-position: left; + subcontrol-origin: margin; +} + +QScrollBar:QScrollBar::down-arrow:horizontal +{ + width: 10; + height: 10px; + background-color: white; +} + +QScrollBar:QScrollBar::up-arrow:horizontal +{ + width: 10px; + height: 10px; + background-color: white; +} + +QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal +{ + background: none; +} + +QRadioButton +{ + background: @groundBase; + color: @mainText; +} + +QPushButton +{ + background: #323030; + color: @mainText; +} diff --git a/themes/default/settings/mainContent.css b/themes/default/settings/mainContent.css deleted file mode 100644 index 4541da660..000000000 --- a/themes/default/settings/mainContent.css +++ /dev/null @@ -1,218 +0,0 @@ -QTextEdit -{ - border-color: @groundExtra; - border-style: solid; - border-width: 1px 0 1px 1px; - background: white; - border: 1px solid #c4c1bd; -} - -QListWidget -{ - background-color: white; -} - -QMessageBox -{ - background-color: white; -} - -QCheckBox -{ - color: black; -} - -QCheckBox:disabled -{ - color: grey; -} - -QSpinBox, QDoubleSpinBox -{ - background-color: white; -} - -QSpinBox:disabled, QDoubleSpinBox:disabled -{ - background-color: lightGrey; -} - -QGroupBox -{ - color: black; - background-color: white; - font: @bigBold; -} - -QComboBox -{ - color: black; - background-color: white; -} - -QComboBox QAbstractItemView { - background-color: white; -} - -QLineEdit -{ - background-color: white; -} - -QLineEdit:disabled -{ - background-color: lightGrey; -} - -QScrollArea -{ - background-color: white; -} - -QScrollArea > QWidget > QWidget -{ - background: transparent; -} - -QScrollArea::corner -{ - background-color: white; - border: none; -} - -QScrollBar:vertical -{ - background: transparent; - width: 12px; - margin-top: 2px; - margin-bottom: 2px; -} - -/* using last is a bit of a hack, but QTabBar otherwise doesn't allow selecting single tabs */ -QTabBar::tab:last:!selected[update-available=true] -{ - background-color: #80c580; -} - -QPushButton#updateAvailableButton -{ - background-color: #21da21; -} - -QScrollBar::handle:vertical -{ - background-color: #d1d1d1; - min-height: 20px; - border-radius: 3px; - margin-left: 2px; -} - -QScrollBar::handle:vertical:hover -{ - background-color: #e3e3e3; -} - -QScrollBar::handle:vertical:pressed -{ - background-color: #b1b1b1; -} - -QScrollBar::add-line:vertical -{ - background-color: white; - height: 0px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:vertical -{ - background-color: white; - height: 0px; - subcontrol-position: top; - subcontrol-origin: margin; -} - -QScrollBar:QScrollBar::down-arrow:vertical -{ - width: 10; - height: 10px; - background-color: white; -} - -QScrollBar:QScrollBar::up-arrow:vertical -{ - width: 10px; - height: 10px; - background-color: white; -} - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical -{ - background: none; -} - -QScrollBar:horizontal -{ - background-color: white; - height: 10px; - margin: 0 2px 0 2px; -} - -QScrollBar::handle:horizontal -{ - background-color: #d1d1d1; - min-width: 20px; - border-radius: 2px; -} - -QScrollBar::handle:horizontal:hover -{ - background-color: #e3e3e3; -} - -QScrollBar::handle:horizontal:pressed -{ - background-color: #b1b1b1; -} - -QScrollBar::add-line:horizontal -{ - background-color: white; - width: 0px; - subcontrol-position: right; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:horizontal -{ - background-color: white; - width: 0px; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar:QScrollBar::down-arrow:horizontal -{ - width: 10; - height: 10px; - background-color: white; -} - -QScrollBar:QScrollBar::up-arrow:horizontal -{ - width: 10px; - height: 10px; - background-color: white; -} - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal -{ - background: none; -} - -QRadioButton -{ - background: white; - color: black; -} diff --git a/themes/default/window/general.css b/themes/default/window/general.css index 58100f8b1..a59ab6ce4 100644 --- a/themes/default/window/general.css +++ b/themes/default/window/general.css @@ -6,6 +6,11 @@ QToolTip background: #ffffdc; } +QDialog +{ + background: white; +} + QTabWidget { background-color: white; @@ -28,22 +33,236 @@ QLabel color: @mainText; } -QLineEdit +QListView { color: @mainText; } -QTextEdit +QTextEdit, QPlainTextEdit { + border-color: @groundExtra; + border-style: solid; + border-width: 1px 0 1px 1px; + background: white; color: @mainText; } +QListWidget +{ + background-color: white; +} + +QMessageBox +{ + background-color: white; +} + +QCheckBox +{ + color: black; +} + +QCheckBox:disabled +{ + color: grey; +} + QSpinBox, QDoubleSpinBox { color: @mainText; -} + background-color: white; +} -QListView +QSpinBox:disabled, QDoubleSpinBox:disabled { color: @mainText; + background-color: lightGrey; +} + +QGroupBox +{ + color: black; + background-color: white; + font: @bigBold; +} + +QComboBox +{ + color: black; + background-color: white; +} + +QComboBox QAbstractItemView { + background-color: white; +} + +QLineEdit +{ + color: @mainText; + background-color: white; +} + +QLineEdit:disabled +{ + color: @mainText; + background-color: lightGrey; +} + +QScrollArea +{ + background-color: white; +} + +QScrollArea > QWidget > QWidget +{ + background: transparent; +} + +QScrollArea::corner +{ + background-color: white; + border: none; +} + +QScrollBar:vertical +{ + background: transparent; + width: 12px; + margin-top: 2px; + margin-bottom: 2px; +} + +/* using last is a bit of a hack, but QTabBar otherwise doesn't allow selecting single tabs */ +QTabBar::tab:last:!selected[update-available=true] +{ + background-color: #80c580; +} + +QPushButton#updateAvailableButton +{ + background-color: #21da21; +} + +QScrollBar::handle:vertical +{ + background-color: #d1d1d1; + min-height: 20px; + border-radius: 3px; + margin-left: 2px; +} + +QScrollBar::handle:vertical:hover +{ + background-color: #e3e3e3; +} + +QScrollBar::handle:vertical:pressed +{ + background-color: #b1b1b1; +} + +QScrollBar::add-line:vertical +{ + background-color: white; + height: 0px; + subcontrol-position: bottom; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:vertical +{ + background-color: white; + height: 0px; + subcontrol-position: top; + subcontrol-origin: margin; +} + +QScrollBar:QScrollBar::down-arrow:vertical +{ + width: 10; + height: 10px; + background-color: white; +} + +QScrollBar:QScrollBar::up-arrow:vertical +{ + width: 10px; + height: 10px; + background-color: white; +} + +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical +{ + background: none; +} + +QScrollBar:horizontal +{ + background-color: white; + height: 10px; + margin: 0 2px 0 2px; +} + +QScrollBar::handle:horizontal +{ + background-color: #d1d1d1; + min-width: 20px; + border-radius: 2px; +} + +QScrollBar::handle:horizontal:hover +{ + background-color: #e3e3e3; +} + +QScrollBar::handle:horizontal:pressed +{ + background-color: #b1b1b1; +} + +QScrollBar::add-line:horizontal +{ + background-color: white; + width: 0px; + subcontrol-position: right; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:horizontal +{ + background-color: white; + width: 0px; + subcontrol-position: left; + subcontrol-origin: margin; +} + +QScrollBar:QScrollBar::down-arrow:horizontal +{ + width: 10; + height: 10px; + background-color: white; +} + +QScrollBar:QScrollBar::up-arrow:horizontal +{ + width: 10px; + height: 10px; + background-color: white; +} + +QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal +{ + background: none; +} + +QRadioButton +{ + background: white; + color: black; +} + +QPushButton +{ + background: #ebebeb; + color: @mainText; }