diff --git a/examples/iot-dashboard/DaytimeSkin.cpp b/examples/iot-dashboard/DaytimeSkin.cpp index ce9f6175..238098ec 100644 --- a/examples/iot-dashboard/DaytimeSkin.cpp +++ b/examples/iot-dashboard/DaytimeSkin.cpp @@ -5,6 +5,20 @@ #include #include +#include + +#include + +namespace +{ + static inline QFont qskFont( qreal pointSize ) + { + QFont font("Proxima Nova"); // the other one is Proxima Nova Lt + font.setPointSizeF( pointSize /*/ qskDpiScaled( 1.0 )*/ ); + return font; + } + +} DaytimeSkin::DaytimeSkin( QObject* parent ) : QskSkin( parent ) { @@ -14,6 +28,16 @@ DaytimeSkin::DaytimeSkin( QObject* parent ) : QskSkin( parent ) void DaytimeSkin::initHints() { + QFontDatabase db; + db.addApplicationFont(":/fonts/ProximaNova-Regular.otf"); // ### use fontconfig + db.addApplicationFont(":/fonts/ProximaNova-Semibold.otf"); // ### use fontconfig + + setFont( QskSkin::DefaultFont, qskFont( 12 ) ); + setFont( QskSkin::TinyFont, qskFont( 12 ) ); + setFont( QskSkin::SmallFont, qskFont( 10 ) ); + setFont( QskSkin::LargeFont, qskFont( 14 ) ); + setFont( QskSkin::HugeFont, qskFont( 36 ) ); + setBoxBorderMetrics( PieChart::Panel, 2 ); setGradient( PieChart::Panel, Qt::blue ); setBoxBorderColors( PieChart::Panel, Qt::green ); diff --git a/examples/iot-dashboard/MenuBar.cpp b/examples/iot-dashboard/MenuBar.cpp index b78c4cac..289c840b 100644 --- a/examples/iot-dashboard/MenuBar.cpp +++ b/examples/iot-dashboard/MenuBar.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -23,6 +24,7 @@ MenuItem::MenuItem( const QString& name, QQuickItem* parent ) : QskLinearBox( Qt auto* textLabel = new QskTextLabel( name, this ); textLabel->setTextColor( Qt::white ); // ### style + textLabel->setFontRole(QskSkin::SmallFont); } MenuBar::MenuBar( QQuickItem *parent ) : QskLinearBox( Qt::Vertical, parent ) diff --git a/examples/iot-dashboard/fonts.qrc b/examples/iot-dashboard/fonts.qrc new file mode 100644 index 00000000..505d33de --- /dev/null +++ b/examples/iot-dashboard/fonts.qrc @@ -0,0 +1,6 @@ + + + fonts/ProximaNova-Regular.otf + fonts/ProximaNova-Semibold.otf + + diff --git a/examples/iot-dashboard/fonts/ProximaNova-Regular.otf b/examples/iot-dashboard/fonts/ProximaNova-Regular.otf new file mode 100644 index 00000000..018b6f83 Binary files /dev/null and b/examples/iot-dashboard/fonts/ProximaNova-Regular.otf differ diff --git a/examples/iot-dashboard/fonts/ProximaNova-Semibold.otf b/examples/iot-dashboard/fonts/ProximaNova-Semibold.otf new file mode 100644 index 00000000..11a950a0 Binary files /dev/null and b/examples/iot-dashboard/fonts/ProximaNova-Semibold.otf differ diff --git a/examples/iot-dashboard/iot-dashboard.pro b/examples/iot-dashboard/iot-dashboard.pro index 58d79f4f..1e243006 100644 --- a/examples/iot-dashboard/iot-dashboard.pro +++ b/examples/iot-dashboard/iot-dashboard.pro @@ -20,4 +20,5 @@ HEADERS += \ PieChartSkinlet.h RESOURCES += \ - images.qrc + images.qrc \ + fonts.qrc