StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor: rename palette colors

Browse Source
This commit is contained in:
TriKriSta 2019-02-22 18:01:43 +02:00
parent e146c11f0f
commit c6142e4287
33 changed files with 118 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chatlog/chatlog.cpp
View File

@ -66,7 +66,7 @@ ChatLog::ChatLog(QWidget* parent)
setDragMode(QGraphicsView::NoDrag); setDragMode(QGraphicsView::NoDrag);
setViewportUpdateMode(MinimalViewportUpdate); setViewportUpdateMode(MinimalViewportUpdate);
setContextMenuPolicy(Qt::CustomContextMenu); setContextMenuPolicy(Qt::CustomContextMenu);
setBackgroundBrush(QBrush(Style::getColor(Style::White), Qt::SolidPattern)); setBackgroundBrush(QBrush(Style::getColor(Style::GroundBase), Qt::SolidPattern));
// The selection rect for multi-line selection // The selection rect for multi-line selection
selGraphItem = scene->addRect(0, 0, 0, 0, selectionRectColor.darker(120), selectionRectColor); selGraphItem = scene->addRect(0, 0, 0, 0, selectionRectColor.darker(120), selectionRectColor);
@ -662,7 +662,7 @@ void ChatLog::fontChanged(const QFont& font)
void ChatLog::reloadTheme() void ChatLog::reloadTheme()
{ {
setBackgroundBrush(QBrush(Style::getColor(Style::White), Qt::SolidPattern)); setBackgroundBrush(QBrush(Style::getColor(Style::GroundBase), Qt::SolidPattern));
for (ChatLine::Ptr l : lines) { for (ChatLine::Ptr l : lines) {
l->reloadTheme(); l->reloadTheme();

2
src/chatlog/chatmessage.cpp
View File

@ -87,7 +87,7 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString& sender, const QSt
if (isMe) if (isMe)
authorFont.setBold(true); authorFont.setBold(true);
QColor color = Style::getColor(Style::Black); QColor color = Style::getColor(Style::MainText);
if (colorizeName && Settings::getInstance().getEnableGroupChatsColor()) { if (colorizeName && Settings::getInstance().getEnableGroupChatsColor()) {
QByteArray hash = QCryptographicHash::hash((sender.toUtf8()), QCryptographicHash::Sha256); QByteArray hash = QCryptographicHash::hash((sender.toUtf8()), QCryptographicHash::Sha256);
quint8 *data = (quint8*)hash.data(); quint8 *data = (quint8*)hash.data();

8
src/chatlog/content/filetransferwidget.cpp
View File

@ -52,9 +52,9 @@ FileTransferWidget::FileTransferWidget(QWidget* parent, ToxFile file)
: QWidget(parent) : QWidget(parent)
, ui(new Ui::FileTransferWidget) , ui(new Ui::FileTransferWidget)
, fileInfo(file) , fileInfo(file)
, backgroundColor(Style::getColor(Style::LightGrey)) , backgroundColor(Style::getColor(Style::GroundExtra))
, buttonColor(Style::getColor(Style::Yellow)) , buttonColor(Style::getColor(Style::Yellow))
, buttonBackgroundColor(Style::getColor(Style::White)) , buttonBackgroundColor(Style::getColor(Style::GroundBase))
, active(true) , active(true)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -329,7 +329,7 @@ void FileTransferWidget::updateWidgetColor(ToxFile const& file)
case ToxFile::INITIALIZING: case ToxFile::INITIALIZING:
case ToxFile::PAUSED: case ToxFile::PAUSED:
case ToxFile::TRANSMITTING: case ToxFile::TRANSMITTING:
setBackgroundColor(Style::getColor(Style::LightGrey), false); setBackgroundColor(Style::getColor(Style::GroundExtra), false);
break; break;
case ToxFile::BROKEN: case ToxFile::BROKEN:
case ToxFile::CANCELED: case ToxFile::CANCELED:
@ -510,7 +510,7 @@ void FileTransferWidget::setupButtons(ToxFile const& file)
ui->rightButton->setObjectName("cancel"); ui->rightButton->setObjectName("cancel");
ui->rightButton->setToolTip(tr("Cancel transfer")); ui->rightButton->setToolTip(tr("Cancel transfer"));
setButtonColor(Style::getColor(Style::LightGrey)); setButtonColor(Style::getColor(Style::GroundExtra));
break; break;
case ToxFile::INITIALIZING: case ToxFile::INITIALIZING:

2
src/chatlog/content/text.cpp
View File

@ -471,7 +471,7 @@ void Text::selectText(QTextCursor& cursor, const std::pair<int, int>& point)
QColor Text::textColor() const QColor Text::textColor() const
{ {
QColor c = Style::getColor(Style::Black); QColor c = Style::getColor(Style::MainText);
if (textType == ACTION) { if (textType == ACTION) {
c = Style::getColor(Style::Action); c = Style::getColor(Style::Action);
} else if (textType == CUSTOM) { } else if (textType == CUSTOM) {

2
src/chatlog/content/text.h
View File

@ -40,7 +40,7 @@ public:
}; };
Text(const QString& txt = "", const QFont& font = QFont(), bool enableElide = false, Text(const QString& txt = "", const QFont& font = QFont(), bool enableElide = false,
const QString& rawText = QString(), const TextType& type = NORMAL, const QColor& custom = Style::getColor(Style::Black)); const QString& rawText = QString(), const TextType& type = NORMAL, const QColor& custom = Style::getColor(Style::MainText));
virtual ~Text(); virtual ~Text();
void setText(const QString& txt); void setText(const QString& txt);

10
src/widget/genericchatroomwidget.cpp
View File

@ -163,19 +163,19 @@ void GenericChatroomWidget::reloadTheme()
QPalette p; QPalette p;
p = statusMessageLabel->palette(); p = statusMessageLabel->palette();
p.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey)); // Base color p.setColor(QPalette::WindowText, Style::getColor(Style::GroundExtra)); // Base color
p.setColor(QPalette::HighlightedText, Style::getColor(Style::MediumGrey)); // Color when active p.setColor(QPalette::HighlightedText, Style::getColor(Style::StatusActive)); // Color when active
statusMessageLabel->setPalette(p); statusMessageLabel->setPalette(p);
p = nameLabel->palette(); p = nameLabel->palette();
p.setColor(QPalette::WindowText, Style::getColor(Style::White)); // Base color p.setColor(QPalette::WindowText, Style::getColor(Style::GroundBase)); // Base color
p.setColor(QPalette::HighlightedText, Style::getColor(Style::DarkGrey)); // Color when active p.setColor(QPalette::HighlightedText, Style::getColor(Style::NameActive)); // Color when active
nameLabel->setPalette(p); nameLabel->setPalette(p);
p = palette(); p = palette();
p.setColor(QPalette::Window, Style::getColor(Style::ThemeMedium)); // Base background color p.setColor(QPalette::Window, Style::getColor(Style::ThemeMedium)); // Base background color
p.setColor(QPalette::Highlight, Style::getColor(Style::ThemeLight)); // On mouse over p.setColor(QPalette::Highlight, Style::getColor(Style::ThemeLight)); // On mouse over
p.setColor(QPalette::Light, Style::getColor(Style::White)); // When active p.setColor(QPalette::Light, Style::getColor(Style::GroundBase)); // When active
setPalette(p); setPalette(p);
} }

22
src/widget/style.cpp
View File

@ -126,12 +126,11 @@ QList<QColor> Style::themeColorColors = {QColor(), QColor("#004aa4"), QColor("#9
QMap<Style::ColorPalette, QString> Style::aliasColors = {{Green, "green"}, QMap<Style::ColorPalette, QString> Style::aliasColors = {{Green, "green"},
{Yellow, "yellow"}, {Yellow, "yellow"},
{Red, "red"}, {Red, "red"},
{Black,"black"}, {MainText,"mainText"},
{DarkGrey, "darkGrey"}, {NameActive, "nameActive"},
{MediumGrey,"mediumGrey"}, {StatusActive,"statusActive"},
{MediumGreyLight, "mediumGreyLight"}, {GroundExtra, "groundExtra"},
{LightGrey, "lightGrey"}, {GroundBase, "groundBase"},
{White, "white"},
{Orange, "orange"}, {Orange, "orange"},
{ThemeDark, "themeDark"}, {ThemeDark, "themeDark"},
{ThemeMediumDark, "themeMediumDark"}, {ThemeMediumDark, "themeMediumDark"},
@ -392,12 +391,11 @@ void Style::initDictColor()
{"@green", Style::getColor(Style::Green).name()}, {"@green", Style::getColor(Style::Green).name()},
{"@yellow", Style::getColor(Style::Yellow).name()}, {"@yellow", Style::getColor(Style::Yellow).name()},
{"@red", Style::getColor(Style::Red).name()}, {"@red", Style::getColor(Style::Red).name()},
{"@black", Style::getColor(Style::Black).name()}, // NOTE: (Dark) rename to textColor {"@mainText", Style::getColor(Style::MainText).name()},
{"@darkGrey", Style::getColor(Style::DarkGrey).name()}, {"@nameActive", Style::getColor(Style::NameActive).name()},
{"@mediumGrey", Style::getColor(Style::MediumGrey).name()}, {"@statusActive", Style::getColor(Style::StatusActive).name()},
{"@mediumGreyLight", Style::getColor(Style::MediumGreyLight).name()}, {"@groundExtra", Style::getColor(Style::GroundExtra).name()},
{"@lightGrey", Style::getColor(Style::LightGrey).name()}, {"@groundBase", Style::getColor(Style::GroundBase).name()},
{"@white", Style::getColor(Style::White).name()},
{"@orange", Style::getColor(Style::Orange).name()}, {"@orange", Style::getColor(Style::Orange).name()},
{"@action", Style::getColor(Style::Action).name()}}; {"@action", Style::getColor(Style::Action).name()}};
} }

11
src/widget/style.h
View File

@ -34,12 +34,11 @@ public:
Green, Green,
Yellow, Yellow,
Red, Red,
Black, MainText,
DarkGrey, NameActive,
MediumGrey, StatusActive,
MediumGreyLight, GroundExtra,
LightGrey, GroundBase,
White,
Orange, Orange,
ThemeDark, ThemeDark,
ThemeMediumDark, ThemeMediumDark,

10
themes/dark/centralWidget/centralWidget.css
View File

@ -1,24 +1,24 @@
QLabel QLabel
{ {
color: #c3c3c3; color: @mainText;
} }
QLineEdit QLineEdit
{ {
color: #c3c3c3; color: @mainText;
} }
QTextEdit QTextEdit
{ {
color: #c3c3c3; color: @mainText;
} }
QSpinBox QSpinBox
{ {
color: #c3c3c3; color: @mainText;
} }
QListView QListView
{ {
color: #c3c3c3; color: @mainText;
} }

2
themes/dark/chatArea/chatArea.css
View File

@ -11,5 +11,5 @@ QGraphicsView
QWidget QWidget
{ {
background: #201f1f; background: @groundBase;
} }

8
themes/dark/chatArea/chatHead.css
View File

@ -1,27 +1,27 @@
QLineEdit QLineEdit
{ {
color: @black; color: @mainText;
background: white; background: white;
border: 0px; border: 0px;
} }
#nameLabel #nameLabel
{ {
color: #c3c3c3; color: @mainText;
font: @mediumBold; font: @mediumBold;
font-size:12px; font-size:12px;
} }
#statusLabel #statusLabel
{ {
color: @mediumGrey; color: @statusActive;
font: @medium; font: @medium;
font-size:12px; font-size:12px;
} }
#peersLabel #peersLabel
{ {
color: @mediumGrey; color: @statusActive;
font: @medium; font: @medium;
font-size:12px; font-size:12px;
} }

2
themes/dark/chatArea/innerStyle.css
View File

@ -13,7 +13,7 @@ p {
} }
.typing { .typing {
color: @mediumGreyLight; color: #131212;
} }
.quote { .quote {

2
themes/dark/emoticonWidget/emoticonWidget.css
View File

@ -35,6 +35,6 @@ QRadioButton::indicator:checked
QMenu QMenu
{ {
background-color: @mediumGrey; /* sets background of the menu */ background-color: @statusActive; /* sets background of the menu */
border: 0px solid; border: 0px solid;
} }

16
themes/dark/fileTransferInstance/filetransferWidget.css
View File

@ -1,27 +1,27 @@
[fontColor="white"] QLabel { [fontColor="white"] QLabel {
color:white; color: white;
font:@big; font: @big;
} }
[fontColor="black"] QLabel { [fontColor="black"] QLabel {
color:@mediumGrey; color: @statusActive;
font:@big; font: @big;
} }
QPushButton { QPushButton {
margin:0; margin: 0;
border: none; border: none;
} }
QProgressBar { QProgressBar {
border: 2px solid @mediumGrey; border: 2px solid @statusActive;
border-radius: 0px; border-radius: 0px;
background-color: @mediumGrey; background-color: @statusActive;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: @lightGrey; background-color: @groundExtra;
width: 1px; width: 1px;
} }

2
themes/dark/friendList/friendList.css
View File

@ -70,7 +70,7 @@ QWidget#circleWidgetContainer QLineEdit
QWidget#circleWidgetContainer > QLabel#status QWidget#circleWidgetContainer > QLabel#status
{ {
font: @small; font: @small;
color: #c3c3c3; color: @mainText;
} }
QWidget#circleWidgetContainer > QLabel#name QWidget#circleWidgetContainer > QLabel#name

2
themes/dark/genericChatForm/genericChatForm.css
View File

@ -1,4 +1,4 @@
QWidget QWidget
{ {
background: #201f1f; background: @groundBase;
} }

6
themes/dark/loginScreen/loginScreen.css
View File

@ -59,7 +59,7 @@ QStackedWidget QPushButton
QLabel QLabel
{ {
color: #c3c3c3; color: @mainText;
background: #100f0f; background: #100f0f;
} }
@ -70,8 +70,8 @@ QLabel#label_7
QCheckBox, QProgressBar, QComboBox, QLineEdit, QListView QCheckBox, QProgressBar, QComboBox, QLineEdit, QListView
{ {
color: #c3c3c3; color: @mainText;
background: #201f1f; background: @groundBase;
} }
QCheckBox:disabled QCheckBox:disabled

4
themes/dark/msgEdit/msgEdit.css
View File

@ -1,9 +1,9 @@
QTextEdit QTextEdit
{ {
border-color: @lightGrey; border-color: @groundExtra;
border-style: solid; border-style: solid;
border-width: 1px 0 1px 1px; border-width: 1px 0 1px 1px;
background: #201f1f; background: @groundBase;
} }
QTextEdit:hover QTextEdit:hover

11
themes/dark/palette.ini
View File

@ -2,12 +2,11 @@
green="#6bc260" green="#6bc260"
yellow="#cebf44" yellow="#cebf44"
red="#c84e4e" red="#c84e4e"
black="#c3c3c3" mainText="#c3c3c3"
darkGrey="#c3c3c3" nameActive="#c3c3c3"
mediumGrey="#d1d1d1" statusActive="#d1d1d1"
mediumGreyLight="#131212" groundExtra="#d1d1d1"
lightGrey="#d1d1d1" groundBase="#201f1f"
white="#201f1f"
orange="#ff7700" orange="#ff7700"
themeDark="#1c1c1c" themeDark="#1c1c1c"
themeMediumDark="#2a2a2a" themeMediumDark="#2a2a2a"

38
themes/dark/settings/mainContent.css
View File

@ -1,25 +1,25 @@
QTextEdit QTextEdit
{ {
border-color: @lightGrey; border-color: @groundExtra;
border-style: solid; border-style: solid;
border-width: 1px 0 1px 1px; border-width: 1px 0 1px 1px;
background: #201f1f; background: @groundBase;
border: 1px solid #c4c1bd; border: 1px solid #c4c1bd;
} }
QListWidget QListWidget
{ {
background-color: #201f1f; background-color: @groundBase;
} }
QMessageBox QMessageBox
{ {
background-color: #201f1f; background-color: @groundBase;
} }
QCheckBox QCheckBox
{ {
color: #c3c3c3; color: @mainText;
} }
QCheckBox:disabled QCheckBox:disabled
@ -29,7 +29,7 @@ QCheckBox:disabled
QSpinBox QSpinBox
{ {
background-color: #201f1f; background-color: @groundBase;
} }
QSpinBox:disabled QSpinBox:disabled
@ -39,30 +39,30 @@ QSpinBox:disabled
QGroupBox QGroupBox
{ {
color: #c3c3c3; color: @mainText;
background-color: #201f1f; background-color: @groundBase;
font: @bigBold; font: @bigBold;
} }
QComboBox QComboBox
{ {
color: #c3c3c3; color: @mainText;
background-color: #201f1f; background-color: @groundBase;
} }
QComboBox QAbstractItemView { QComboBox QAbstractItemView {
background-color: #201f1f; background-color: @groundBase;
} }
QLineEdit QLineEdit
{ {
background-color: #201f1f; background-color: @groundBase;
} }
QLineEdit:disabled QLineEdit:disabled
{ {
background-color: #262424 background-color: #262424
color: #201f1f; color: @groundBase;
} }
QTabWidget QTabWidget
@ -73,7 +73,7 @@ QTabWidget
QTabBar::tab:selected QTabBar::tab:selected
{ {
background: #100f0f; background: #100f0f;
color: #c3c3c3; color: @mainText;
} }
QTabBar::tab:!selected QTabBar::tab:!selected
@ -84,7 +84,7 @@ QTabBar::tab:!selected
QScrollArea QScrollArea
{ {
background-color: #201f1f; background-color: @groundBase;
} }
QScrollArea > QWidget > QWidget QScrollArea > QWidget > QWidget
@ -94,7 +94,7 @@ QScrollArea > QWidget > QWidget
QScrollArea::corner QScrollArea::corner
{ {
background-color: #201f1f; background-color: @groundBase;
border: none; border: none;
} }
@ -231,12 +231,12 @@ QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal
QRadioButton QRadioButton
{ {
background: #201f1f; background: @groundBase;
color: #c3c3c3; color: @mainText;
} }
QPushButton QPushButton
{ {
background: #323030; background: #323030;
color: #c3c3c3; color: @mainText;
} }

4
themes/dark/settings/mainHead.css
View File

@ -1,5 +1,5 @@
QWidget .QLabel, QWidget .QLineEdit QWidget .QLabel, QWidget .QLineEdit
{ {
color: #c3c3c3; color: @mainText;
background: #201f1f; background: @groundBase;
} }

2
themes/dark/window/general.css
View File

@ -8,6 +8,6 @@ QToolTip
QWidget#contentWidget QWidget#contentWidget
{ {
background: #201f1f; background: @groundBase;
} }

4
themes/dark/window/statusPanel.css
View File

@ -79,14 +79,14 @@ QListView
{ {
background-color: @themeDark; background-color: @themeDark;
font: @extraBig; font: @extraBig;
color: @white; color: @groundBase;
} }
#statusPanel > #statusHead > #statusLabel #statusPanel > #statusHead > #statusLabel
{ {
background-color: @themeDark; background-color: @themeDark;
font: @medium; font: @medium;
color: @lightGrey; color: @groundExtra;
} }
#statusPanel > #statusHead > #statusButton #statusPanel > #statusHead > #statusButton

10
themes/default/centralWidget/centralWidget.css
View File

@ -1,24 +1,24 @@
QLabel QLabel
{ {
color: black; color: @mainText;
} }
QLineEdit QLineEdit
{ {
color: black; color: @mainText;
} }
QTextEdit QTextEdit
{ {
color: black; color: @mainText;
} }
QSpinBox QSpinBox
{ {
color: black; color: @mainText;
} }
QListView QListView
{ {
color: black; color: @mainText;
} }

8
themes/default/chatArea/chatHead.css
View File

@ -1,27 +1,27 @@
QLineEdit QLineEdit
{ {
color: @black; color: @mainText;
background: white; background: white;
border: 0px; border: 0px;
} }
#nameLabel #nameLabel
{ {
color: @black; color: @mainText;
font: @mediumBold; font: @mediumBold;
font-size:12px; font-size:12px;
} }
#statusLabel #statusLabel
{ {
color: @mediumGrey; color: @statusActive;
font: @medium; font: @medium;
font-size:12px; font-size:12px;
} }
#peersLabel #peersLabel
{ {
color: @mediumGrey; color: @statusActive;
font: @medium; font: @medium;
font-size:12px; font-size:12px;
} }

2
themes/default/chatArea/innerStyle.css
View File

@ -12,7 +12,7 @@ p {
} }
.typing { .typing {
color: @mediumGreyLight; color: #4e4e4e;
} }
.quote { .quote {

2
themes/default/emoticonWidget/emoticonWidget.css
View File

@ -35,6 +35,6 @@ QRadioButton::indicator:checked
QMenu QMenu
{ {
background-color: @mediumGrey; /* sets background of the menu */ background-color: @statusActive; /* sets background of the menu */
border: 0px solid; border: 0px solid;
} }

14
themes/default/fileTransferInstance/filetransferWidget.css
View File

@ -1,11 +1,11 @@
[fontColor="white"] QLabel { [fontColor="white"] QLabel {
color:white; color: white;
font:@big; font: @big;
} }
[fontColor="black"] QLabel { [fontColor="black"] QLabel {
color:@mediumGrey; color: @statusActive;
font:@big; font: @big;
} }
QPushButton { QPushButton {
@ -16,12 +16,12 @@ QPushButton {
QProgressBar { QProgressBar {
border: 2px solid @mediumGrey; border: 2px solid @statusActive;
border-radius: 0px; border-radius: 0px;
background-color: @mediumGrey; background-color: @statusActive;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: @lightGrey; background-color: @groundExtra;
width: 1px; width: 1px;
} }

4
themes/default/friendList/friendList.css
View File

@ -70,13 +70,13 @@ QWidget#circleWidgetContainer QLineEdit
QWidget#circleWidgetContainer > QLabel#status QWidget#circleWidgetContainer > QLabel#status
{ {
font: @small; font: @small;
color: @lightGrey; color: @groundExtra;
} }
QWidget#circleWidgetContainer > QLabel#name QWidget#circleWidgetContainer > QLabel#name
{ {
font: @big; font: @big;
color: @white; color: @groundBase;
} }
QLabel { QLabel {

2
themes/default/msgEdit/msgEdit.css
View File

@ -1,6 +1,6 @@
QTextEdit QTextEdit
{ {
border-color: @lightGrey; border-color: @groundExtra;
border-style: solid; border-style: solid;
border-width: 1px 0 1px 1px; border-width: 1px 0 1px 1px;
background: white; background: white;

11
themes/default/palette.ini
View File

@ -2,12 +2,11 @@
green="#6bc260" green="#6bc260"
yellow="#cebf44" yellow="#cebf44"
red="#c84e4e" red="#c84e4e"
black="#000000" mainText="#000000"
darkGrey="#1c1c1c" nameActive="#1c1c1c"
mediumGrey="#414141" statusActive="#414141"
mediumGreyLight="#4e4e4e" groundExtra="#d1d1d1"
lightGrey="#d1d1d1" groundBase="#ffffff"
white="#ffffff"
orange="#ff7700" orange="#ff7700"
themeDark="#1c1c1c" themeDark="#1c1c1c"
themeMediumDark="#2a2a2a" themeMediumDark="#2a2a2a"

2
themes/default/settings/mainContent.css
View File

@ -1,6 +1,6 @@
QTextEdit QTextEdit
{ {
border-color: @lightGrey; border-color: @groundExtra;
border-style: solid; border-style: solid;
border-width: 1px 0 1px 1px; border-width: 1px 0 1px 1px;
background: white; background: white;

4
themes/default/window/statusPanel.css
View File

@ -79,14 +79,14 @@ QListView
{ {
background-color: @themeDark; background-color: @themeDark;
font: @extraBig; font: @extraBig;
color: @white; color: @groundBase;
} }
#statusPanel > #statusHead > #statusLabel #statusPanel > #statusHead > #statusLabel
{ {
background-color: @themeDark; background-color: @themeDark;
font: @medium; font: @medium;
color: @lightGrey; color: @groundExtra;
} }
#statusPanel > #statusHead > #statusButton #statusPanel > #statusHead > #statusButton