Use resource alias to load fonts, as per suggestion from fperillo
This commit is contained in:
parent
8859e2ae2f
commit
2ee5d6dd5d
|
@ -1,7 +1,6 @@
|
|||
#include "lib/qtmaterialcheckable.h"
|
||||
#include "lib/qtmaterialcheckable_p.h"
|
||||
#include <QPainter>
|
||||
#include <QFontDatabase>
|
||||
#include <QEvent>
|
||||
#include <QStateMachine>
|
||||
#include <QSignalTransition>
|
||||
|
@ -49,10 +48,7 @@ void QtMaterialCheckablePrivate::init()
|
|||
|
||||
q->setCheckable(true);
|
||||
q->setStyle(&QtMaterialStyle::instance());
|
||||
|
||||
QFontDatabase db;
|
||||
QFont font(db.font("Roboto", "Regular", 11));
|
||||
q->setFont(font);
|
||||
q->setFont(QFont("Roboto", 11, QFont::Normal));
|
||||
|
||||
stateMachine->addState(uncheckedState);
|
||||
stateMachine->addState(checkedState);
|
||||
|
|
|
@ -20,9 +20,9 @@ void QtMaterialStylePrivate::init()
|
|||
{
|
||||
Q_Q(QtMaterialStyle);
|
||||
|
||||
QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Regular.ttf");
|
||||
QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Medium.ttf");
|
||||
QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Bold.ttf");
|
||||
QFontDatabase::addApplicationFont(":/fonts/roboto_regular");
|
||||
QFontDatabase::addApplicationFont(":/fonts/roboto_medium");
|
||||
QFontDatabase::addApplicationFont(":/fonts/roboto_bold");
|
||||
|
||||
q->setTheme(new QtMaterialTheme);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#include "qtmaterialflatbutton.h"
|
||||
#include "qtmaterialflatbutton_p.h"
|
||||
#include <QFontDatabase>
|
||||
#include <QPainter>
|
||||
#include <QMouseEvent>
|
||||
#include <QResizeEvent>
|
||||
|
@ -58,8 +57,7 @@ void QtMaterialFlatButtonPrivate::init()
|
|||
q->setAttribute(Qt::WA_Hover);
|
||||
q->setMouseTracking(true);
|
||||
|
||||
QFontDatabase db;
|
||||
QFont font(db.font("Roboto", "Medium", fontSize));
|
||||
QFont font("Roboto", fontSize, QFont::Medium);
|
||||
font.setCapitalization(QFont::AllUppercase);
|
||||
q->setFont(font);
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#include "qtmaterialsnackbar_p.h"
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QPainter>
|
||||
#include <QFontDatabase>
|
||||
#include "qtmaterialsnackbar_internal.h"
|
||||
#include "lib/qtmaterialstyle.h"
|
||||
#include "lib/qtmaterialstatetransition.h"
|
||||
|
@ -35,8 +34,7 @@ void QtMaterialSnackbarPrivate::init()
|
|||
|
||||
q->setAttribute(Qt::WA_TransparentForMouseEvents);
|
||||
|
||||
QFontDatabase db;
|
||||
QFont font(db.font("Roboto", "Medium", 10));
|
||||
QFont font("Roboto", 10, QFont::Medium);
|
||||
font.setCapitalization(QFont::AllUppercase);
|
||||
q->setFont(font);
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#include "qtmaterialtextfield.h"
|
||||
#include "qtmaterialtextfield_p.h"
|
||||
#include <QFontDatabase>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QPainter>
|
||||
#include "qtmaterialtextfield_internal.h"
|
||||
|
@ -38,9 +37,7 @@ void QtMaterialTextFieldPrivate::init()
|
|||
q->setMouseTracking(true);
|
||||
q->setTextMargins(0, 2, 0, 4);
|
||||
|
||||
QFontDatabase db;
|
||||
QFont font(db.font("Roboto", "Regular", 11));
|
||||
q->setFont(font);
|
||||
q->setFont(QFont("Roboto", 11, QFont::Normal));
|
||||
|
||||
stateMachine->start();
|
||||
QCoreApplication::processEvents();
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#include <QPropertyAnimation>
|
||||
#include <QEventTransition>
|
||||
#include <QPainter>
|
||||
#include <QFontDatabase>
|
||||
#include "qtmaterialtextfield.h"
|
||||
|
||||
/*!
|
||||
|
@ -134,8 +133,7 @@ QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent)
|
|||
{
|
||||
Q_ASSERT(parent);
|
||||
|
||||
QFontDatabase db;
|
||||
QFont font(db.font("Roboto", "Medium", parent->labelFontSize()));
|
||||
QFont font("Roboto", parent->labelFontSize(), QFont::Medium);
|
||||
font.setLetterSpacing(QFont::PercentageSpacing, 102);
|
||||
setFont(font);
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<RCC>
|
||||
<qresource prefix="/fonts">
|
||||
<file>../fonts/Roboto/Roboto-Black.ttf</file>
|
||||
<file>../fonts/Roboto/Roboto-Bold.ttf</file>
|
||||
<file>../fonts/Roboto/Roboto-Medium.ttf</file>
|
||||
<file>../fonts/Roboto/Roboto-Regular.ttf</file>
|
||||
<file>../fonts/Roboto/Roboto-Light.ttf</file>
|
||||
<file>../fonts/Roboto/Roboto-Thin.ttf</file>
|
||||
<file alias="roboto_black">../fonts/Roboto/Roboto-Black.ttf</file>
|
||||
<file alias="roboto_bold">../fonts/Roboto/Roboto-Bold.ttf</file>
|
||||
<file alias="roboto_medium">../fonts/Roboto/Roboto-Medium.ttf</file>
|
||||
<file alias="roboto_regular">../fonts/Roboto/Roboto-Regular.ttf</file>
|
||||
<file alias="roboto_light">../fonts/Roboto/Roboto-Light.ttf</file>
|
||||
<file alias="roboto_thin">../fonts/Roboto/Roboto-Thin.ttf</file>
|
||||
</qresource>
|
||||
<qresource prefix="/icons">
|
||||
<file>icons/communication/svg/production/ic_message_24px.svg</file>
|
||||
|
|
Loading…
Reference in New Issue