rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update system theme

Browse Source
This commit is contained in:
Konstantinos Sideris 2017-11-25 15:14:37 +02:00
parent f4036f6f56
commit f36e498503
6 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/RegisterPage.h
View File

@ -21,7 +21,6 @@
#include <QLayout> #include <QLayout>
#include <QSharedPointer> #include <QSharedPointer>
class Avatar;
class FlatButton; class FlatButton;
class MatrixClient; class MatrixClient;
class RaisedButton; class RaisedButton;
@ -55,7 +54,7 @@ private:
QHBoxLayout *logo_layout_; QHBoxLayout *logo_layout_;
QHBoxLayout *button_layout_; QHBoxLayout *button_layout_;
Avatar *logo_; QLabel *logo_;
QLabel *error_label_; QLabel *error_label_;
FlatButton *back_button_; FlatButton *back_button_;

1
include/ui/TextField.h
View File

@ -18,6 +18,7 @@ class TextField : public QLineEdit
Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor) Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor)
Q_PROPERTY(QColor inkColor WRITE setInkColor READ inkColor) Q_PROPERTY(QColor inkColor WRITE setInkColor READ inkColor)
Q_PROPERTY(QColor underlineColor WRITE setUnderlineColor READ underlineColor) Q_PROPERTY(QColor underlineColor WRITE setUnderlineColor READ underlineColor)
Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor)
public: public:
explicit TextField(QWidget *parent = 0); explicit TextField(QWidget *parent = 0);

43
resources/styles/system.qss
View File

@ -5,41 +5,70 @@ OverlayWidget > * {
#mainContent, #mainContent,
#mainContent > * { #mainContent > * {
background-color: palette(base); background-color: palette(window);
} }
TimelineView, TimelineView,
TimelineView > *, TimelineView > *,
TimelineItem, TimelineItem,
TimelineItem > * { TimelineItem > * {
background-color: palette(base); background-color: palette(window);
} }
FlatButton { FlatButton {
qproperty-foregroundColor: palette(text); qproperty-foregroundColor: palette(text);
} }
RaisedButton {
qproperty-foregroundColor: palette(light);
}
TextField {
qproperty-backgroundColor: palette(window);
}
WelcomePage,
LoginPage,
RegisterPage {
background-color: palette(window);
}
RoomInfoListItem { RoomInfoListItem {
qproperty-highlightedBackgroundColor: palette(highlight); qproperty-highlightedBackgroundColor: palette(highlight);
qproperty-hoverBackgroundColor: palette(dark); qproperty-hoverBackgroundColor: palette(mid);
qproperty-backgroundColor: palette(window); qproperty-backgroundColor: palette(window);
qproperty-titleColor: palette(text); qproperty-titleColor: palette(text);
qproperty-subtitleColor: palette(text); qproperty-subtitleColor: palette(text);
qproperty-highlightedTitleColor: palette(text); qproperty-highlightedTitleColor: palette(light);
qproperty-highlightedSubtitleColor: palette(text); qproperty-highlightedSubtitleColor: palette(light);
} }
LoadingIndicator { LoadingIndicator {
qproperty-color: palette(text); qproperty-color: palette(highlight);
} }
#ChatPageLoadSpinner { #ChatPageLoadSpinner {
qproperty-color: #acc7dc; qproperty-color: palette(light);
} }
UserInfoWidget, UserInfoWidget,
UserInfoWidget > * { UserInfoWidget > * {
background-color: palette(window); background-color: palette(window);
} }
EmojiCategory,
EmojiCategory > * {
background-color: palette(window);
}
EmojiPanel,
EmojiPanel > * {
background-color: palette(window);
}
QTextEdit,
QLineEdit {
background-color: palette(window);
}

6
src/RegisterPage.cc
View File

@ -17,7 +17,6 @@
#include <QStyleOption> #include <QStyleOption>
#include "Avatar.h"
#include "Config.h" #include "Config.h"
#include "FlatButton.h" #include "FlatButton.h"
#include "InputValidator.h" #include "InputValidator.h"
@ -51,9 +50,8 @@ RegisterPage::RegisterPage(QSharedPointer<MatrixClient> client, QWidget *parent)
QIcon logo; QIcon logo;
logo.addFile(":/logos/register.png"); logo.addFile(":/logos/register.png");
logo_ = new Avatar(this); logo_ = new QLabel(this);
logo_->setIcon(logo); logo_->setPixmap(logo.pixmap(128));
logo_->setSize(128);
logo_layout_ = new QHBoxLayout(); logo_layout_ = new QHBoxLayout();
logo_layout_->setMargin(0); logo_layout_->setMargin(0);

4
src/WelcomePage.cc
View File

@ -31,8 +31,8 @@ WelcomePage::WelcomePage(QWidget *parent)
auto topLayout_ = new QVBoxLayout(this); auto topLayout_ = new QVBoxLayout(this);
topLayout_->setSpacing(20); topLayout_->setSpacing(20);
QFont headingFont("Open Sans", 22); QFont headingFont("Open Sans", 20);
QFont subTitleFont("Open Sans", 21); QFont subTitleFont("Open Sans", 19);
QIcon icon; QIcon icon;
icon.addFile(":/logos/splash.png"); icon.addFile(":/logos/splash.png");

8
src/ui/TextField.cc
View File

@ -15,7 +15,7 @@ TextField::TextField(QWidget *parent)
state_machine_ = new TextFieldStateMachine(this); state_machine_ = new TextFieldStateMachine(this);
label_ = 0; label_ = 0;
label_font_size_ = 13; label_font_size_ = 15;
show_label_ = false; show_label_ = false;
background_color_ = QColor("white"); background_color_ = QColor("white");
@ -25,7 +25,7 @@ TextField::TextField(QWidget *parent)
setTextMargins(0, 4, 0, 6); setTextMargins(0, 4, 0, 6);
QFont font("Open Sans"); QFont font("Open Sans");
font.setPixelSize(12); font.setPixelSize(14);
setFont(font); setFont(font);
state_machine_->start(); state_machine_->start();
@ -341,8 +341,8 @@ TextFieldLabel::TextFieldLabel(TextField *parent)
scale_ = 1; scale_ = 1;
color_ = parent->labelColor(); color_ = parent->labelColor();
QFontDatabase db; QFont font("Open Sans SemiBold");
QFont font(db.font("Open Sans", "Medium", parent->labelFontSize())); font.setPixelSize(parent->labelFontSize());
font.setLetterSpacing(QFont::PercentageSpacing, 102); font.setLetterSpacing(QFont::PercentageSpacing, 102);
setFont(font); setFont(font);
} }