diff --git a/guh-control/main.cpp b/guh-control/main.cpp index 6a27edad..50d5cdf1 100644 --- a/guh-control/main.cpp +++ b/guh-control/main.cpp @@ -53,6 +53,18 @@ int main(int argc, char *argv[]) application.setApplicationName("guh-control"); application.setOrganizationName("guh"); + foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) { + int id = QFontDatabase::addApplicationFont(":/ui/fonts/OldaniaADFStd-Regular.otf"); + qDebug() << "Added font" << fi.absoluteFilePath() << QFontDatabase::applicationFontFamilies(id); + } + + QFont applicationFont; + applicationFont.setFamily("Ubuntu"); + applicationFont.setCapitalization(QFont::MixedCase); + applicationFont.setPixelSize(16); + applicationFont.setWeight(QFont::Normal); + QGuiApplication::setFont(applicationFont); + QQuickStyle::setStyle("Material"); const char uri[] = "Guh"; diff --git a/guh-control/resources.qrc b/guh-control/resources.qrc index 44a62967..a76d7821 100644 --- a/guh-control/resources.qrc +++ b/guh-control/resources.qrc @@ -124,5 +124,14 @@ ui/system/PluginParamsPage.qml ui/paramdelegates-ng/ParamDelegate.qml ui/components/ErrorDialog.qml + ui/fonts/Ubuntu-B.ttf + ui/fonts/Ubuntu-BI.ttf + ui/fonts/Ubuntu-C.ttf + ui/fonts/Ubuntu-L.ttf + ui/fonts/Ubuntu-LI.ttf + ui/fonts/Ubuntu-M.ttf + ui/fonts/Ubuntu-MI.ttf + ui/fonts/Ubuntu-R.ttf + ui/fonts/Ubuntu-RI.ttf diff --git a/guh-control/ui/MainPage.qml b/guh-control/ui/MainPage.qml index f136675e..6152fb70 100644 --- a/guh-control/ui/MainPage.qml +++ b/guh-control/ui/MainPage.qml @@ -50,6 +50,7 @@ Page { ColumnLayout { anchors.fill: parent + anchors.margins: app.margins SwipeView { id: swipeView diff --git a/guh-control/ui/fonts/Ubuntu-B.ttf b/guh-control/ui/fonts/Ubuntu-B.ttf new file mode 100644 index 00000000..b173da27 Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-B.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-BI.ttf b/guh-control/ui/fonts/Ubuntu-BI.ttf new file mode 100644 index 00000000..72a5a99a Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-BI.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-C.ttf b/guh-control/ui/fonts/Ubuntu-C.ttf new file mode 100644 index 00000000..602a3ee4 Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-C.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-L.ttf b/guh-control/ui/fonts/Ubuntu-L.ttf new file mode 100644 index 00000000..ed0f5bce Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-L.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-LI.ttf b/guh-control/ui/fonts/Ubuntu-LI.ttf new file mode 100644 index 00000000..c6cec55f Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-LI.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-M.ttf b/guh-control/ui/fonts/Ubuntu-M.ttf new file mode 100644 index 00000000..ca9c03a4 Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-M.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-MI.ttf b/guh-control/ui/fonts/Ubuntu-MI.ttf new file mode 100644 index 00000000..e8d186c5 Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-MI.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-R.ttf b/guh-control/ui/fonts/Ubuntu-R.ttf new file mode 100644 index 00000000..d748728a Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-R.ttf differ diff --git a/guh-control/ui/fonts/Ubuntu-RI.ttf b/guh-control/ui/fonts/Ubuntu-RI.ttf new file mode 100644 index 00000000..4f2d2bc7 Binary files /dev/null and b/guh-control/ui/fonts/Ubuntu-RI.ttf differ diff --git a/guh-control/ui/main.qml b/guh-control/ui/main.qml index 36b33630..6f9623c2 100644 --- a/guh-control/ui/main.qml +++ b/guh-control/ui/main.qml @@ -11,7 +11,7 @@ ApplicationWindow { width: 270 * 1.5 height: 480 * 1.5 visibility: settings.viewMode - + font: Qt.application.font property color guhAccent: "#ff57baae" // Material.primary: "#ff57baae"