pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

style: edit styles 

add custom themes in AboutFriendForm
edit style for QSpinBox disable
edit palette color for dark theme and etc
reviewable/pr5627/r2
TriKriSta 7 years ago
parent
ec500b6673
commit
00aac5f152
8 changed files with 472 additions and 498 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      res.qrc
  2. 3
      src/widget/about/aboutfriendform.cpp
  3. 2
      src/widget/contentlayout.cpp
  4. 2
      themes/dark/palette.ini
  5. 267
      themes/dark/settings/mainContent.css
  6. 249
      themes/dark/window/general.css
  7. 218
      themes/default/settings/mainContent.css
  8. 227
      themes/default/window/general.css

2
res.qrc
Unescape View File

@ -81,7 +81,6 @@ @@ -81,7 +81,6 @@
<file>themes/dark/emoticonWidget/emoticonWidget.css</file>
<file>themes/dark/friendList/friendList.css</file>
<file>themes/dark/msgEdit/msgEdit.css</file>
<file>themes/dark/settings/mainContent.css</file>
<file>themes/dark/settings/mainHead.css</file>
<file>themes/dark/settings/checkboxChecked.svg</file>
<file>themes/dark/settings/checkboxCheckedDisabled.svg</file>
@ -147,7 +146,6 @@ @@ -147,7 +146,6 @@
<file>themes/default/emoticonWidget/emoticonWidget.css</file>
<file>themes/default/friendList/friendList.css</file>
<file>themes/default/msgEdit/msgEdit.css</file>
<file>themes/default/settings/mainContent.css</file>
<file>themes/default/settings/mainHead.css</file>
<file>themes/default/statusButton/statusButton.css</file>
<file>themes/default/statusButton/menu_indicator.svg</file>

3
src/widget/about/aboutfriendform.cpp
Unescape View File

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
#include "src/widget/gui.h"
#include "ui_aboutfriendform.h"
#include "src/core/core.h"
#include "src/widget/style.h"
#include <QFileDialog>
#include <QMessageBox>
@ -46,6 +47,8 @@ AboutFriendForm::AboutFriendForm(std::unique_ptr<IAboutFriend> _about, QWidget* @@ -46,6 +47,8 @@ AboutFriendForm::AboutFriendForm(std::unique_ptr<IAboutFriend> _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)

2
src/widget/contentlayout.cpp
Unescape View File

@ -70,7 +70,7 @@ void ContentLayout::reloadTheme() @@ -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
}

2
themes/dark/palette.ini
Unescape View File

@ -8,7 +8,7 @@ nameActive="#c3c3c3" @@ -8,7 +8,7 @@ nameActive="#c3c3c3"
statusActive="#d1d1d1"
groundExtra="#d1d1d1"
groundBase="#201f1f"
orange="#ff7700"
orange="#713400"
themeDark="#1c1c1c"
themeMediumDark="#2a2a2a"
themeMedium="#100f0f"

267
themes/dark/settings/mainContent.css
Unescape View File

@ -1,267 +0,0 @@ @@ -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;
}

249
themes/dark/window/general.css
Unescape View File

@ -18,7 +18,7 @@ QWidget#contentWidget @@ -18,7 +18,7 @@ QWidget#contentWidget
QTabWidget
{
background-color: @groundBase;
background-color: #100f0f;
}
QTabBar::tab:selected
@ -38,22 +38,261 @@ QLabel @@ -38,22 +38,261 @@ QLabel
color: @mainText;
}
QLineEdit
QListView
{
color: @mainText;
}
QTextEdit
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;
}
}
QListView
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;
}

218
themes/default/settings/mainContent.css
Unescape View File

@ -1,218 +0,0 @@ @@ -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;
}

227
themes/default/window/general.css
Unescape View File

@ -6,6 +6,11 @@ QToolTip @@ -6,6 +6,11 @@ QToolTip
background: #ffffdc;
}
QDialog
{
background: white;
}
QTabWidget
{
background-color: white;
@ -28,22 +33,236 @@ QLabel @@ -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;
}

Write Preview
Loading…
Cancel
Save