diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-11-25 15:14:37 +0200 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-11-25 15:14:37 +0200 |
| commit | f36e498503860a5c3051ef202c60b61876150c61 (patch) | |
| tree | 79477587e672fd657ba9ebd1bb322edda72618e7 /src | |
| parent | f4036f6f56e8a0d13f3f1630002281331260d45a (diff) | |
Update system theme
Diffstat (limited to 'src')
| -rw-r--r-- | src/RegisterPage.cc | 6 | ||||
| -rw-r--r-- | src/WelcomePage.cc | 4 | ||||
| -rw-r--r-- | src/ui/TextField.cc | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc index c03fae4c..28d0a8a4 100644 --- a/src/RegisterPage.cc +++ b/src/RegisterPage.cc @@ -17,7 +17,6 @@ #include <QStyleOption> -#include "Avatar.h" #include "Config.h" #include "FlatButton.h" #include "InputValidator.h" @@ -51,9 +50,8 @@ RegisterPage::RegisterPage(QSharedPointer<MatrixClient> client, QWidget *parent) QIcon logo; logo.addFile(":/logos/register.png"); - logo_ = new Avatar(this); - logo_->setIcon(logo); - logo_->setSize(128); + logo_ = new QLabel(this); + logo_->setPixmap(logo.pixmap(128)); logo_layout_ = new QHBoxLayout(); logo_layout_->setMargin(0); diff --git a/src/WelcomePage.cc b/src/WelcomePage.cc index 30d8f692..b21da92a 100644 --- a/src/WelcomePage.cc +++ b/src/WelcomePage.cc @@ -31,8 +31,8 @@ WelcomePage::WelcomePage(QWidget *parent) auto topLayout_ = new QVBoxLayout(this); topLayout_->setSpacing(20); - QFont headingFont("Open Sans", 22); - QFont subTitleFont("Open Sans", 21); + QFont headingFont("Open Sans", 20); + QFont subTitleFont("Open Sans", 19); QIcon icon; icon.addFile(":/logos/splash.png"); diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc index d80d6466..ff662a11 100644 --- a/src/ui/TextField.cc +++ b/src/ui/TextField.cc @@ -15,7 +15,7 @@ TextField::TextField(QWidget *parent) state_machine_ = new TextFieldStateMachine(this); label_ = 0; - label_font_size_ = 13; + label_font_size_ = 15; show_label_ = false; background_color_ = QColor("white"); @@ -25,7 +25,7 @@ TextField::TextField(QWidget *parent) setTextMargins(0, 4, 0, 6); QFont font("Open Sans"); - font.setPixelSize(12); + font.setPixelSize(14); setFont(font); state_machine_->start(); @@ -341,8 +341,8 @@ TextFieldLabel::TextFieldLabel(TextField *parent) scale_ = 1; color_ = parent->labelColor(); - QFontDatabase db; - QFont font(db.font("Open Sans", "Medium", parent->labelFontSize())); + QFont font("Open Sans SemiBold"); + font.setPixelSize(parent->labelFontSize()); font.setLetterSpacing(QFont::PercentageSpacing, 102); setFont(font); } |