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

Prepare for theme colors support

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-15 18:29:41 +01:00
parent bf4ed63eac
commit b0e6f1168c
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
7 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mainwindow.ui
View File

@ -1053,16 +1053,7 @@ QSplitter:handle{
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QPushButton{ <string notr="true"/>
background-color:#1c1c1c;
border:none;
}
QPushButton:hover{
background-color:#292929;
border:none;
}
</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing"> <property name="spacing">

10
src/misc/style.cpp
View File

@ -71,6 +71,12 @@ QColor Style::getColor(Style::ColorPalette entry)
QColor("#d1d1d1"), QColor("#d1d1d1"),
QColor("#ffffff"), QColor("#ffffff"),
QColor("#ff7700"), QColor("#ff7700"),
// Theme colors
QColor("#1c1c1c"),
QColor("#2a2a2a"),
QColor("#414141"),
QColor("#4e4e4e"),
}; };
return palette[entry]; return palette[entry];
@ -110,6 +116,10 @@ QString Style::resolve(QString qss)
{"@lightGrey", getColor(LightGrey).name()}, {"@lightGrey", getColor(LightGrey).name()},
{"@white", getColor(White).name()}, {"@white", getColor(White).name()},
{"@orange", getColor(Orange).name()}, {"@orange", getColor(Orange).name()},
{"@themeDark", getColor(ThemeDark).name()},
{"@themeMediumDark", getColor(ThemeMediumDark).name()},
{"@themeMedium", getColor(ThemeMedium).name()},
{"@themeLight", getColor(ThemeLight).name()},
// fonts // fonts
{"@extraBig", qssifyFont(getFont(ExtraBig))}, {"@extraBig", qssifyFont(getFont(ExtraBig))},

4
src/misc/style.h
View File

@ -38,6 +38,10 @@ public:
LightGrey, LightGrey,
White, White,
Orange, Orange,
ThemeDark,
ThemeMediumDark,
ThemeMedium,
ThemeLight,
}; };
enum Font enum Font

3
src/widget/widget.cpp
View File

@ -118,7 +118,7 @@ void Widget::init()
ui->mainSplitter->restoreState(Settings::getInstance().getSplitterState()); ui->mainSplitter->restoreState(Settings::getInstance().getSplitterState());
layout()->setContentsMargins(0, 0, 0, 0); layout()->setContentsMargins(0, 0, 0, 0);
ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css")); ui->friendList->setStyleSheet(Style::resolve(Style::getStylesheet(":ui/friendList/friendList.css")));
profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png"); profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png");
profilePicture->setPixmap(QPixmap(":/img/contact_dark.png")); profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
@ -131,6 +131,7 @@ void Widget::init()
ui->mainHead->layout()->setMargin(0); ui->mainHead->layout()->setMargin(0);
ui->mainHead->layout()->setSpacing(0); ui->mainHead->layout()->setSpacing(0);
ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}"));
if(QStyleFactory::keys().contains(Settings::getInstance().getStyle()) if(QStyleFactory::keys().contains(Settings::getInstance().getStyle())
&& Settings::getInstance().getStyle() != "None") && Settings::getInstance().getStyle() != "None")

4
ui/chatroomWidgets/genericChatroomWidget.css
View File

@ -1,6 +1,6 @@
GenericChatroomWidget GenericChatroomWidget
{ {
background-color: @mediumGrey; background-color: @themeMedium;
} }
GenericChatroomWidget[active="true"] GenericChatroomWidget[active="true"]
@ -10,7 +10,7 @@ GenericChatroomWidget[active="true"]
GenericChatroomWidget[active="false"]:hover GenericChatroomWidget[active="false"]:hover
{ {
background-color: @mediumGreyLight; background-color: @themeLight;
} }
GenericChatroomWidget[active="true"] > QLabel#status GenericChatroomWidget[active="true"] > QLabel#status

12
ui/friendList/friendList.css
View File

@ -1,26 +1,22 @@
QScrollArea {
background: #414141;
}
QScrollBar:vertical { QScrollBar:vertical {
background: rgb(65,65,65); background: @themeMedium;
width: 16px; width: 16px;
padding: 0px 3px 0px 3px; padding: 0px 3px 0px 3px;
} }
QScrollBar:handle:vertical { QScrollBar:handle:vertical {
background: rgba(18, 18, 18, 204); background: @themeDark;
min-height: 20px; min-height: 20px;
border-radius: 5px; border-radius: 5px;
margin: 3px 0px 3px 0px; margin: 3px 0px 3px 0px;
} }
QScrollBar:handle:vertical:hover { QScrollBar:handle:vertical:hover {
background: rgba(35, 35, 35, 204); background: @themeMediumDark;
} }
QScrollBar:handle:vertical:pressed { QScrollBar:handle:vertical:pressed {
background: rgba(13, 13, 13, 204); background: @themeDark;
} }
QScrollBar:add-line:vertical {height: 0px;subcontrol-position: bottom;subcontrol-origin: margin;} QScrollBar:add-line:vertical {height: 0px;subcontrol-position: bottom;subcontrol-origin: margin;}

2
ui/window/statusPanel.css
View File

@ -9,7 +9,7 @@ QLineEdit
#statusPanel #statusPanel
{ {
background-color: @darkGrey; background-color: @themeDark;
} }
#statusPanel > #statusHead > #nameLabel { #statusPanel > #statusHead > #nameLabel {