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

Use light theme

This commit is contained in:
Konstantinos Sideris 2017-04-14 15:13:09 +03:00
parent bb03a402d7
commit 8358720d8e
13 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forms/ChatPage.ui
View File

@ -20,7 +20,7 @@
<string>Form</string> <string>Form</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: #171919; <string notr="true">background-color: #f8fbfe;
</string> </string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -90,7 +90,7 @@
<item> <item>
<widget class="QWidget" name="sideBarTopWidget" native="true"> <widget class="QWidget" name="sideBarTopWidget" native="true">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: #2D3F3D; <string notr="true">background-color: #d6dde3;
color: #ebebeb;</string> color: #ebebeb;</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">

2
forms/MainWindow.ui
View File

@ -29,7 +29,7 @@
</font> </font>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string notr="true">nheko - Matrix Desktop Client </string> <string notr="true"> Nheko </string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: #f9f9f9</string> <string notr="true">background-color: #f9f9f9</string>

10
forms/RoomList.ui
View File

@ -27,20 +27,20 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QWidget { <string notr="true">QWidget {
background-color: #171919; background-color: #f8fbfe;
color: #ebebeb; color: #ebebeb;
} }
QScrollBar:vertical { QScrollBar:vertical {
background-color: #171919; background-color: #f8fbfe;
width: 10px; width: 8px;
border-radius: 20px; border-radius: 20px;
margin: 0px 2px 0 2px; margin: 0px 2px 0 2px;
} }
QScrollBar::handle:vertical { QScrollBar::handle:vertical {
border-radius: 50px; border-radius: 50px;
background-color: #1c3133; background-color: #d6dde3;
} }
QScrollBar::add-line:vertical { QScrollBar::add-line:vertical {

4
src/HistoryViewItem.cc
View File

@ -65,7 +65,7 @@ void HistoryViewItem::generateBody(const QString &body)
"<html>" "<html>"
"<head/>" "<head/>"
"<body>" "<body>"
" <span style=\"font-size: 10pt; color: #B1AEA5;\">" " <span style=\"font-size: 10pt; color: #171919;\">"
" %1" " %1"
" </span>" " </span>"
"</body>" "</body>"
@ -89,7 +89,7 @@ void HistoryViewItem::generateBody(const QString &userid, const QString &color,
" <span style=\"font-size: 10pt; font-weight: 600; color: %1\">" " <span style=\"font-size: 10pt; font-weight: 600; color: %1\">"
" %2" " %2"
" </span>" " </span>"
" <span style=\"font-size: 10pt; color: #B1AEA5;\">" " <span style=\"font-size: 10pt; color: #171919;\">"
" %3" " %3"
" </span>" " </span>"
"</body>" "</body>"

6
src/HistoryViewManager.cc
View File

@ -30,9 +30,9 @@ HistoryViewManager::HistoryViewManager(QSharedPointer<MatrixClient> client, QWid
, client_(client) , client_(client)
{ {
setStyleSheet( setStyleSheet(
"QWidget {background: #171919; color: #ebebeb;}" "QWidget {background: #f8fbfe; color: #e8e8e8; border: none;}"
"QScrollBar:vertical { background-color: #171919; width: 10px; border-radius: 20px; margin: 0px 2px 0 2px; }" "QScrollBar:vertical { background-color: #f8fbfe; width: 8px; border-radius: 20px; margin: 0px 2px 0 2px; }"
"QScrollBar::handle:vertical { border-radius : 50px; background-color : #1c3133; }" "QScrollBar::handle:vertical { border-radius : 50px; background-color : #d6dde3; }"
"QScrollBar::add-line:vertical { border: none; background: none; }" "QScrollBar::add-line:vertical { border: none; background: none; }"
"QScrollBar::sub-line:vertical { border: none; background: none; }"); "QScrollBar::sub-line:vertical { border: none; background: none; }");

8
src/LoginPage.cc
View File

@ -66,13 +66,13 @@ LoginPage::LoginPage(QSharedPointer<MatrixClient> client, QWidget *parent)
matrixid_input_ = new TextField(); matrixid_input_ = new TextField();
matrixid_input_->setLabel("Matrix ID"); matrixid_input_->setLabel("Matrix ID");
matrixid_input_->setInkColor("#577275"); matrixid_input_->setInkColor("#555459");
matrixid_input_->setBackgroundColor("#f9f9f9"); matrixid_input_->setBackgroundColor("#f9f9f9");
matrixid_input_->setPlaceholderText("e.g @joe:matrix.org"); matrixid_input_->setPlaceholderText("e.g @joe:matrix.org");
password_input_ = new TextField(); password_input_ = new TextField();
password_input_->setLabel("Password"); password_input_->setLabel("Password");
password_input_->setInkColor("#577275"); password_input_->setInkColor("#555459");
password_input_->setBackgroundColor("#f9f9f9"); password_input_->setBackgroundColor("#f9f9f9");
password_input_->setEchoMode(QLineEdit::Password); password_input_->setEchoMode(QLineEdit::Password);
@ -84,8 +84,8 @@ LoginPage::LoginPage(QSharedPointer<MatrixClient> client, QWidget *parent)
button_layout_->setContentsMargins(0, 0, 0, 50); button_layout_->setContentsMargins(0, 0, 0, 50);
login_button_ = new RaisedButton("LOGIN", this); login_button_ = new RaisedButton("LOGIN", this);
login_button_->setBackgroundColor(QColor("#171919")); login_button_->setBackgroundColor(QColor("#acc7dc"));
login_button_->setForegroundColor(QColor("#ebebeb")); login_button_->setForegroundColor(QColor("black"));
login_button_->setMinimumSize(350, 65); login_button_->setMinimumSize(350, 65);
login_button_->setCursor(QCursor(Qt::PointingHandCursor)); login_button_->setCursor(QCursor(Qt::PointingHandCursor));
login_button_->setFontSize(17); login_button_->setFontSize(17);

12
src/RegisterPage.cc
View File

@ -66,24 +66,24 @@ RegisterPage::RegisterPage(QSharedPointer<MatrixClient> client, QWidget *parent)
username_input_ = new TextField(); username_input_ = new TextField();
username_input_->setLabel("Username"); username_input_->setLabel("Username");
username_input_->setInkColor("#577275"); username_input_->setInkColor("#555459");
username_input_->setBackgroundColor("#f9f9f9"); username_input_->setBackgroundColor("#f9f9f9");
password_input_ = new TextField(); password_input_ = new TextField();
password_input_->setLabel("Password"); password_input_->setLabel("Password");
password_input_->setInkColor("#577275"); password_input_->setInkColor("#555459");
password_input_->setBackgroundColor("#f9f9f9"); password_input_->setBackgroundColor("#f9f9f9");
password_input_->setEchoMode(QLineEdit::Password); password_input_->setEchoMode(QLineEdit::Password);
password_confirmation_ = new TextField(); password_confirmation_ = new TextField();
password_confirmation_->setLabel("Password confirmation"); password_confirmation_->setLabel("Password confirmation");
password_confirmation_->setInkColor("#577275"); password_confirmation_->setInkColor("#555459");
password_confirmation_->setBackgroundColor("#f9f9f9"); password_confirmation_->setBackgroundColor("#f9f9f9");
password_confirmation_->setEchoMode(QLineEdit::Password); password_confirmation_->setEchoMode(QLineEdit::Password);
server_input_ = new TextField(); server_input_ = new TextField();
server_input_->setLabel("Home Server"); server_input_->setLabel("Home Server");
server_input_->setInkColor("#577275"); server_input_->setInkColor("#555459");
server_input_->setBackgroundColor("#f9f9f9"); server_input_->setBackgroundColor("#f9f9f9");
form_layout_->addWidget(username_input_, Qt::AlignHCenter, 0); form_layout_->addWidget(username_input_, Qt::AlignHCenter, 0);
@ -99,8 +99,8 @@ RegisterPage::RegisterPage(QSharedPointer<MatrixClient> client, QWidget *parent)
error_label_->setStyleSheet("margin-bottom: 20px; color: #E22826; font-size: 11pt;"); error_label_->setStyleSheet("margin-bottom: 20px; color: #E22826; font-size: 11pt;");
register_button_ = new RaisedButton("REGISTER", this); register_button_ = new RaisedButton("REGISTER", this);
register_button_->setBackgroundColor(QColor("#171919")); register_button_->setBackgroundColor(QColor("#acc7dc"));
register_button_->setForegroundColor(QColor("#ebebeb")); register_button_->setForegroundColor(QColor("black"));
register_button_->setMinimumSize(350, 65); register_button_->setMinimumSize(350, 65);
register_button_->setCursor(QCursor(Qt::PointingHandCursor)); register_button_->setCursor(QCursor(Qt::PointingHandCursor));
register_button_->setFontSize(17); register_button_->setFontSize(17);

11
src/RoomInfoListItem.cc
View File

@ -29,12 +29,11 @@ RoomInfoListItem::RoomInfoListItem(RoomInfo info, QWidget *parent)
, max_height_(60) , max_height_(60)
{ {
normal_style_ = normal_style_ =
"QWidget { color: #ebebeb; background-color: #232626; border-bottom: 1px solid #171919;}" "QWidget { color: black; background-color: #f8fbfe}"
"QLabel { border: none; }"; "QLabel { border: none; }";
pressed_style_ = pressed_style_ =
"QWidget { background-color: #577275; color: #ebebeb;" "QWidget { background-color: #acc7dc; color: black;}"
"border-bottom: 1px solid #171919;}"
"QLabel { border: none; }"; "QLabel { border: none; }";
setStyleSheet(normal_style_); setStyleSheet(normal_style_);
@ -62,6 +61,8 @@ RoomInfoListItem::RoomInfoListItem(RoomInfo info, QWidget *parent)
roomAvatar_ = new Avatar(avatarWidget_); roomAvatar_ = new Avatar(avatarWidget_);
roomAvatar_->setLetter(QChar(info_.name()[0])); roomAvatar_->setLetter(QChar(info_.name()[0]));
roomAvatar_->setSize(max_height_ - 20); roomAvatar_->setSize(max_height_ - 20);
roomAvatar_->setTextColor("#555459");
roomAvatar_->setBackgroundColor("#d6dde3");
avatarLayout_->addWidget(roomAvatar_); avatarLayout_->addWidget(roomAvatar_);
roomName_ = new QLabel(info_.name(), textWidget_); roomName_ = new QLabel(info_.name(), textWidget_);
@ -71,7 +72,7 @@ RoomInfoListItem::RoomInfoListItem(RoomInfo info, QWidget *parent)
roomTopic_ = new QLabel(info_.topic(), textWidget_); roomTopic_ = new QLabel(info_.topic(), textWidget_);
roomTopic_->setMaximumSize(parent->width() - 10, 20); roomTopic_->setMaximumSize(parent->width() - 10, 20);
roomTopic_->setStyleSheet("color: #c9c9c9; font-size: 12px"); roomTopic_->setStyleSheet("color: #171919; font-size: 12px");
roomTopic_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); roomTopic_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
textLayout_->addWidget(roomName_); textLayout_->addWidget(roomName_);
@ -117,7 +118,7 @@ void RoomInfoListItem::mousePressEvent(QMouseEvent *event)
Ripple *ripple = new Ripple(pos); Ripple *ripple = new Ripple(pos);
ripple->setRadiusEndValue(radiusEndValue); ripple->setRadiusEndValue(radiusEndValue);
ripple->setOpacityStartValue(0.35); ripple->setOpacityStartValue(0.15);
ripple->setColor(QColor("#171919")); ripple->setColor(QColor("#171919"));
ripple->radiusAnimation()->setDuration(300); ripple->radiusAnimation()->setDuration(300);
ripple->opacityAnimation()->setDuration(500); ripple->opacityAnimation()->setDuration(500);

2
src/RoomList.cc
View File

@ -34,6 +34,8 @@ RoomList::RoomList(QSharedPointer<MatrixClient> client, QWidget *parent)
ui->setupUi(this); ui->setupUi(this);
ui->scrollVerticalLayout->addStretch(1); ui->scrollVerticalLayout->addStretch(1);
setStyleSheet("border-top: none");
connect(client_.data(), connect(client_.data(),
SIGNAL(roomAvatarRetrieved(const QString &, const QPixmap &)), SIGNAL(roomAvatarRetrieved(const QString &, const QPixmap &)),
this, this,

8
src/TextInputWidget.cc
View File

@ -26,7 +26,7 @@ TextInputWidget::TextInputWidget(QWidget *parent)
{ {
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);
setStyleSheet("background-color: #171919; height: 45px;"); setStyleSheet("background-color: #f8fbfe; height: 45px;");
top_layout_ = new QHBoxLayout(); top_layout_ = new QHBoxLayout();
top_layout_->setSpacing(6); top_layout_->setSpacing(6);
@ -37,17 +37,17 @@ TextInputWidget::TextInputWidget(QWidget *parent)
QIcon send_file_icon; QIcon send_file_icon;
send_file_icon.addFile(":/icons/icons/clip-dark.png", QSize(), QIcon::Normal, QIcon::Off); send_file_icon.addFile(":/icons/icons/clip-dark.png", QSize(), QIcon::Normal, QIcon::Off);
send_file_button_->setForegroundColor(QColor("#577275")); send_file_button_->setForegroundColor(QColor("#acc7dc"));
send_file_button_->setIcon(send_file_icon); send_file_button_->setIcon(send_file_icon);
send_file_button_->setIconSize(QSize(24, 24)); send_file_button_->setIconSize(QSize(24, 24));
input_ = new QLineEdit(this); input_ = new QLineEdit(this);
input_->setPlaceholderText("Write a message..."); input_->setPlaceholderText("Write a message...");
input_->setStyleSheet("color: #ebebeb; font-size: 10pt; border-radius: 0; padding: 2px; margin-bottom: 4px;"); input_->setStyleSheet("color: black; font-size: 10pt; border-radius: 0; padding: 2px; margin-bottom: 4px;");
send_message_button_ = new FlatButton(this); send_message_button_ = new FlatButton(this);
send_message_button_->setCursor(Qt::PointingHandCursor); send_message_button_->setCursor(Qt::PointingHandCursor);
send_message_button_->setForegroundColor(QColor("#577275")); send_message_button_->setForegroundColor(QColor("#acc7dc"));
QIcon send_message_icon; QIcon send_message_icon;
send_message_icon.addFile(":/icons/icons/share-dark.png", QSize(), QIcon::Normal, QIcon::Off); send_message_icon.addFile(":/icons/icons/share-dark.png", QSize(), QIcon::Normal, QIcon::Off);

9
src/TopRoomBar.cc
View File

@ -24,7 +24,7 @@ TopRoomBar::TopRoomBar(QWidget *parent)
{ {
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
setMinimumSize(QSize(0, 65)); setMinimumSize(QSize(0, 65));
setStyleSheet("background-color: #232626; color: #ebebeb;"); setStyleSheet("background-color: #f8fbfe; color: #171919;");
top_layout_ = new QHBoxLayout(); top_layout_ = new QHBoxLayout();
top_layout_->setSpacing(10); top_layout_->setSpacing(10);
@ -32,7 +32,8 @@ TopRoomBar::TopRoomBar(QWidget *parent)
avatar_ = new Avatar(this); avatar_ = new Avatar(this);
avatar_->setLetter(QChar('?')); avatar_->setLetter(QChar('?'));
avatar_->setBackgroundColor(QColor("#ebebeb")); avatar_->setBackgroundColor(QColor("#d6dde3"));
avatar_->setTextColor(QColor("#555459"));
avatar_->setSize(35); avatar_->setSize(35);
text_layout_ = new QVBoxLayout(); text_layout_ = new QVBoxLayout();
@ -49,7 +50,7 @@ TopRoomBar::TopRoomBar(QWidget *parent)
text_layout_->addWidget(topic_label_); text_layout_->addWidget(topic_label_);
settings_button_ = new FlatButton(this); settings_button_ = new FlatButton(this);
settings_button_->setForegroundColor(QColor("#ebebeb")); settings_button_->setForegroundColor(QColor("#acc7dc"));
settings_button_->setCursor(QCursor(Qt::PointingHandCursor)); settings_button_->setCursor(QCursor(Qt::PointingHandCursor));
settings_button_->setStyleSheet("width: 30px; height: 30px;"); settings_button_->setStyleSheet("width: 30px; height: 30px;");
@ -59,7 +60,7 @@ TopRoomBar::TopRoomBar(QWidget *parent)
settings_button_->setIconSize(QSize(16, 16)); settings_button_->setIconSize(QSize(16, 16));
search_button_ = new FlatButton(this); search_button_ = new FlatButton(this);
search_button_->setForegroundColor(QColor("#ebebeb")); search_button_->setForegroundColor(QColor("#acc7dc"));
search_button_->setCursor(QCursor(Qt::PointingHandCursor)); search_button_->setCursor(QCursor(Qt::PointingHandCursor));
search_button_->setStyleSheet("width: 30px; height: 30px;"); search_button_->setStyleSheet("width: 30px; height: 30px;");

6
src/UserInfoWidget.cc
View File

@ -42,7 +42,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
displayNameLabel_ = new QLabel(this); displayNameLabel_ = new QLabel(this);
displayNameLabel_->setStyleSheet( displayNameLabel_->setStyleSheet(
"padding: 0 9px;" "padding: 0 9px;"
"color: #ebebeb;" "color: #171919;"
"font-size: 14px;" "font-size: 14px;"
"font-weight: 500;" "font-weight: 500;"
"margin-bottom: -10px;"); "margin-bottom: -10px;");
@ -51,7 +51,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
userIdLabel_ = new QLabel(this); userIdLabel_ = new QLabel(this);
userIdLabel_->setStyleSheet( userIdLabel_->setStyleSheet(
"padding: 0 8px 8px 8px;" "padding: 0 8px 8px 8px;"
"color: #d4d2d1;" "color: #555459;"
"font-size: 13px"); "font-size: 13px");
userIdLabel_->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter); userIdLabel_->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
@ -66,7 +66,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
buttonLayout_ = new QHBoxLayout(); buttonLayout_ = new QHBoxLayout();
logoutButton_ = new FlatButton(this); logoutButton_ = new FlatButton(this);
logoutButton_->setForegroundColor(QColor("#ebebeb")); logoutButton_->setForegroundColor(QColor("#555459"));
logoutButton_->setCursor(QCursor(Qt::PointingHandCursor)); logoutButton_->setCursor(QCursor(Qt::PointingHandCursor));
logoutButton_->setStyleSheet("width: 30px; height: 30px;"); logoutButton_->setStyleSheet("width: 30px; height: 30px;");

10
src/WelcomePage.cc
View File

@ -30,7 +30,7 @@ WelcomePage::WelcomePage(QWidget *parent)
top_layout_->setMargin(0); top_layout_->setMargin(0);
intro_banner_ = new QLabel(this); intro_banner_ = new QLabel(this);
intro_banner_->setStyleSheet("background-color: #1c3133;"); intro_banner_->setStyleSheet("background-color: #d6dde3;");
intro_banner_->setAlignment(Qt::AlignCenter); intro_banner_->setAlignment(Qt::AlignCenter);
intro_text_ = new QLabel(this); intro_text_ = new QLabel(this);
@ -59,16 +59,16 @@ WelcomePage::WelcomePage(QWidget *parent)
button_layout_->setContentsMargins(0, 20, 0, 80); button_layout_->setContentsMargins(0, 20, 0, 80);
register_button_ = new RaisedButton("REGISTER", this); register_button_ = new RaisedButton("REGISTER", this);
register_button_->setBackgroundColor(QColor("#171919")); register_button_->setBackgroundColor(QColor("#acc7dc"));
register_button_->setForegroundColor(QColor("#ebebeb")); register_button_->setForegroundColor(QColor("#171919"));
register_button_->setMinimumSize(240, 60); register_button_->setMinimumSize(240, 60);
register_button_->setCursor(QCursor(Qt::PointingHandCursor)); register_button_->setCursor(QCursor(Qt::PointingHandCursor));
register_button_->setFontSize(14); register_button_->setFontSize(14);
register_button_->setCornerRadius(3); register_button_->setCornerRadius(3);
login_button_ = new RaisedButton("LOGIN", this); login_button_ = new RaisedButton("LOGIN", this);
login_button_->setBackgroundColor(QColor("#171919")); login_button_->setBackgroundColor(QColor("#acc7dc"));
login_button_->setForegroundColor(QColor("#ebebeb")); login_button_->setForegroundColor(QColor("#171919"));
login_button_->setMinimumSize(240, 60); login_button_->setMinimumSize(240, 60);
login_button_->setCursor(QCursor(Qt::PointingHandCursor)); login_button_->setCursor(QCursor(Qt::PointingHandCursor));
login_button_->setFontSize(14); login_button_->setFontSize(14);