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

Adjust the font sizes of the welcome page

This commit is contained in:
Konstantinos Sideris 2018-10-06 17:41:47 +03:00
parent 844443a324
commit 748c5898be
2 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/WelcomePage.cpp
View File

@ -22,17 +22,19 @@
#include "Config.h" #include "Config.h"
#include "WelcomePage.h" #include "WelcomePage.h"
#include "ui/RaisedButton.h" #include "ui/RaisedButton.h"
#include "ui/TextLabel.h"
WelcomePage::WelcomePage(QWidget *parent) WelcomePage::WelcomePage(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
auto topLayout_ = new QVBoxLayout(this); auto topLayout_ = new QVBoxLayout(this);
topLayout_->setSpacing(20); topLayout_->setSpacing(20);
topLayout_->setAlignment(Qt::AlignCenter);
QFont headingFont("Open Sans", 20); QFont headingFont;
QFont subTitleFont("Open Sans", 19); headingFont.setPointSizeF(headingFont.pointSizeF() * 2);
QFont subTitleFont;
subTitleFont.setPointSizeF(subTitleFont.pointSizeF() * 1.5);
QIcon icon; QIcon icon;
icon.addFile(":/logos/splash.png"); icon.addFile(":/logos/splash.png");
@ -44,45 +46,47 @@ WelcomePage::WelcomePage(QWidget *parent)
QString heading(tr("Welcome to nheko! The desktop client for the Matrix protocol.")); QString heading(tr("Welcome to nheko! The desktop client for the Matrix protocol."));
QString main(tr("Enjoy your stay!")); QString main(tr("Enjoy your stay!"));
auto intoTxt_ = new QLabel(heading, this); auto intoTxt_ = new TextLabel(heading, this);
intoTxt_->setFont(headingFont); intoTxt_->setFont(headingFont);
intoTxt_->setContentsMargins(0, 20, 0, 0); intoTxt_->setAlignment(Qt::AlignCenter);
auto subTitle = new QLabel(main, this); auto subTitle = new TextLabel(main, this);
subTitle->setFont(subTitleFont); subTitle->setFont(subTitleFont);
subTitle->setContentsMargins(0, 0, 0, 0); subTitle->setAlignment(Qt::AlignCenter);
topLayout_->addStretch(1); topLayout_->addStretch(1);
topLayout_->addWidget(logo_); topLayout_->addWidget(logo_);
topLayout_->addWidget(intoTxt_, 0, Qt::AlignCenter); topLayout_->addWidget(intoTxt_);
topLayout_->addWidget(subTitle, 0, Qt::AlignCenter); topLayout_->addWidget(subTitle);
auto btnLayout_ = new QHBoxLayout(); auto btnLayout_ = new QHBoxLayout();
btnLayout_->setSpacing(20); btnLayout_->setSpacing(20);
btnLayout_->setContentsMargins(0, 20, 0, 20); btnLayout_->setContentsMargins(0, 20, 0, 20);
registerBtn_ = new RaisedButton(tr("REGISTER"), this); const int fontHeight = QFontMetrics{subTitleFont}.height();
registerBtn_->setBackgroundColor(QColor("#333333")); const int buttonHeight = fontHeight * 2.5;
registerBtn_->setMinimumSize(240, 65); const int buttonWidth = fontHeight * 8;
registerBtn_->setFontSize(conf::btn::fontSize);
registerBtn_->setCornerRadius(conf::btn::cornerRadius);
loginBtn_ = new RaisedButton(tr("LOGIN"), this); auto registerBtn = new RaisedButton(tr("REGISTER"), this);
loginBtn_->setBackgroundColor(QColor("#333333")); registerBtn->setMinimumSize(buttonWidth, buttonHeight);
loginBtn_->setMinimumSize(240, 65); registerBtn->setFontSize(subTitleFont.pointSizeF());
loginBtn_->setFontSize(conf::btn::fontSize); registerBtn->setCornerRadius(conf::btn::cornerRadius);
loginBtn_->setCornerRadius(conf::btn::cornerRadius);
auto loginBtn = new RaisedButton(tr("LOGIN"), this);
loginBtn->setMinimumSize(buttonWidth, buttonHeight);
loginBtn->setFontSize(subTitleFont.pointSizeF());
loginBtn->setCornerRadius(conf::btn::cornerRadius);
btnLayout_->addStretch(1); btnLayout_->addStretch(1);
btnLayout_->addWidget(registerBtn_); btnLayout_->addWidget(registerBtn);
btnLayout_->addWidget(loginBtn_); btnLayout_->addWidget(loginBtn);
btnLayout_->addStretch(1); btnLayout_->addStretch(1);
topLayout_->addLayout(btnLayout_); topLayout_->addLayout(btnLayout_);
topLayout_->addStretch(1); topLayout_->addStretch(1);
connect(registerBtn_, &QPushButton::clicked, this, &WelcomePage::userRegister); connect(registerBtn, &QPushButton::clicked, this, &WelcomePage::userRegister);
connect(loginBtn_, &QPushButton::clicked, this, &WelcomePage::userLogin); connect(loginBtn, &QPushButton::clicked, this, &WelcomePage::userLogin);
} }
void void

25
src/WelcomePage.h
View File

@ -1,26 +1,7 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once #pragma once
#include <QWidget> #include <QWidget>
class RaisedButton;
class WelcomePage : public QWidget class WelcomePage : public QWidget
{ {
Q_OBJECT Q_OBJECT
@ -29,7 +10,7 @@ public:
explicit WelcomePage(QWidget *parent = 0); explicit WelcomePage(QWidget *parent = 0);
protected: protected:
void paintEvent(QPaintEvent *event) override; void paintEvent(QPaintEvent *) override;
signals: signals:
// Notify that the user wants to login in. // Notify that the user wants to login in.
@ -37,8 +18,4 @@ signals:
// Notify that the user wants to register. // Notify that the user wants to register.
void userRegister(); void userRegister();
private:
RaisedButton *registerBtn_;
RaisedButton *loginBtn_;
}; };