168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use resource alias to load fonts, as per suggestion from fperillo

This commit is contained in:
johanneshilden 2017-10-06 23:11:41 +03:00
parent 8859e2ae2f
commit 2ee5d6dd5d
7 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/lib/qtmaterialcheckable.cpp
View File

@ -1,7 +1,6 @@
#include "lib/qtmaterialcheckable.h" #include "lib/qtmaterialcheckable.h"
#include "lib/qtmaterialcheckable_p.h" #include "lib/qtmaterialcheckable_p.h"
#include <QPainter> #include <QPainter>
#include <QFontDatabase>
#include <QEvent> #include <QEvent>
#include <QStateMachine> #include <QStateMachine>
#include <QSignalTransition> #include <QSignalTransition>
@ -49,10 +48,7 @@ void QtMaterialCheckablePrivate::init()
q->setCheckable(true); q->setCheckable(true);
q->setStyle(&QtMaterialStyle::instance()); q->setStyle(&QtMaterialStyle::instance());
q->setFont(QFont("Roboto", 11, QFont::Normal));
QFontDatabase db;
QFont font(db.font("Roboto", "Regular", 11));
q->setFont(font);
stateMachine->addState(uncheckedState); stateMachine->addState(uncheckedState);
stateMachine->addState(checkedState); stateMachine->addState(checkedState);

6
components/lib/qtmaterialstyle.cpp
View File

@ -20,9 +20,9 @@ void QtMaterialStylePrivate::init()
{ {
Q_Q(QtMaterialStyle); Q_Q(QtMaterialStyle);
QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Regular.ttf"); QFontDatabase::addApplicationFont(":/fonts/roboto_regular");
QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Medium.ttf"); QFontDatabase::addApplicationFont(":/fonts/roboto_medium");
QFontDatabase::addApplicationFont(":/material/fonts/Roboto/Roboto-Bold.ttf"); QFontDatabase::addApplicationFont(":/fonts/roboto_bold");
q->setTheme(new QtMaterialTheme); q->setTheme(new QtMaterialTheme);
} }

4
components/qtmaterialflatbutton.cpp
View File

@ -1,6 +1,5 @@
#include "qtmaterialflatbutton.h" #include "qtmaterialflatbutton.h"
#include "qtmaterialflatbutton_p.h" #include "qtmaterialflatbutton_p.h"
#include <QFontDatabase>
#include <QPainter> #include <QPainter>
#include <QMouseEvent> #include <QMouseEvent>
#include <QResizeEvent> #include <QResizeEvent>
@ -58,8 +57,7 @@ void QtMaterialFlatButtonPrivate::init()
q->setAttribute(Qt::WA_Hover); q->setAttribute(Qt::WA_Hover);
q->setMouseTracking(true); q->setMouseTracking(true);
QFontDatabase db; QFont font("Roboto", fontSize, QFont::Medium);
QFont font(db.font("Roboto", "Medium", fontSize));
font.setCapitalization(QFont::AllUppercase); font.setCapitalization(QFont::AllUppercase);
q->setFont(font); q->setFont(font);

4
components/qtmaterialsnackbar.cpp
View File

@ -2,7 +2,6 @@
#include "qtmaterialsnackbar_p.h" #include "qtmaterialsnackbar_p.h"
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QPainter> #include <QPainter>
#include <QFontDatabase>
#include "qtmaterialsnackbar_internal.h" #include "qtmaterialsnackbar_internal.h"
#include "lib/qtmaterialstyle.h" #include "lib/qtmaterialstyle.h"
#include "lib/qtmaterialstatetransition.h" #include "lib/qtmaterialstatetransition.h"
@ -35,8 +34,7 @@ void QtMaterialSnackbarPrivate::init()
q->setAttribute(Qt::WA_TransparentForMouseEvents); q->setAttribute(Qt::WA_TransparentForMouseEvents);
QFontDatabase db; QFont font("Roboto", 10, QFont::Medium);
QFont font(db.font("Roboto", "Medium", 10));
font.setCapitalization(QFont::AllUppercase); font.setCapitalization(QFont::AllUppercase);
q->setFont(font); q->setFont(font);

5
components/qtmaterialtextfield.cpp
View File

@ -1,6 +1,5 @@
#include "qtmaterialtextfield.h" #include "qtmaterialtextfield.h"
#include "qtmaterialtextfield_p.h" #include "qtmaterialtextfield_p.h"
#include <QFontDatabase>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QPainter> #include <QPainter>
#include "qtmaterialtextfield_internal.h" #include "qtmaterialtextfield_internal.h"
@ -38,9 +37,7 @@ void QtMaterialTextFieldPrivate::init()
q->setMouseTracking(true); q->setMouseTracking(true);
q->setTextMargins(0, 2, 0, 4); q->setTextMargins(0, 2, 0, 4);
QFontDatabase db; q->setFont(QFont("Roboto", 11, QFont::Normal));
QFont font(db.font("Roboto", "Regular", 11));
q->setFont(font);
stateMachine->start(); stateMachine->start();
QCoreApplication::processEvents(); QCoreApplication::processEvents();

4
components/qtmaterialtextfield_internal.cpp
View File

@ -2,7 +2,6 @@
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QEventTransition> #include <QEventTransition>
#include <QPainter> #include <QPainter>
#include <QFontDatabase>
#include "qtmaterialtextfield.h" #include "qtmaterialtextfield.h"
/*! /*!
@ -134,8 +133,7 @@ QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent)
{ {
Q_ASSERT(parent); Q_ASSERT(parent);
QFontDatabase db; QFont font("Roboto", parent->labelFontSize(), QFont::Medium);
QFont font(db.font("Roboto", "Medium", parent->labelFontSize()));
font.setLetterSpacing(QFont::PercentageSpacing, 102); font.setLetterSpacing(QFont::PercentageSpacing, 102);
setFont(font); setFont(font);
} }

12
components/resources.qrc
View File

@ -1,11 +1,11 @@
<RCC> <RCC>
<qresource prefix="/fonts"> <qresource prefix="/fonts">
<file>../fonts/Roboto/Roboto-Black.ttf</file> <file alias="roboto_black">../fonts/Roboto/Roboto-Black.ttf</file>
<file>../fonts/Roboto/Roboto-Bold.ttf</file> <file alias="roboto_bold">../fonts/Roboto/Roboto-Bold.ttf</file>
<file>../fonts/Roboto/Roboto-Medium.ttf</file> <file alias="roboto_medium">../fonts/Roboto/Roboto-Medium.ttf</file>
<file>../fonts/Roboto/Roboto-Regular.ttf</file> <file alias="roboto_regular">../fonts/Roboto/Roboto-Regular.ttf</file>
<file>../fonts/Roboto/Roboto-Light.ttf</file> <file alias="roboto_light">../fonts/Roboto/Roboto-Light.ttf</file>
<file>../fonts/Roboto/Roboto-Thin.ttf</file> <file alias="roboto_thin">../fonts/Roboto/Roboto-Thin.ttf</file>
</qresource> </qresource>
<qresource prefix="/icons"> <qresource prefix="/icons">
<file>icons/communication/svg/production/ic_message_24px.svg</file> <file>icons/communication/svg/production/ic_message_24px.svg</file>