From ca4545766d3b51243b821343b9d30a0712676a1c Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 25 Feb 2018 16:08:09 +0100 Subject: [PATCH] fix font selection --- guh-control/main.cpp | 2 +- guh-control/ui/ConnectPage.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guh-control/main.cpp b/guh-control/main.cpp index 13a39019..700283a7 100644 --- a/guh-control/main.cpp +++ b/guh-control/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) application.setOrganizationName("guh"); foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) { - int id = QFontDatabase::addApplicationFont(":/ui/fonts/OldaniaADFStd-Regular.otf"); + int id = QFontDatabase::addApplicationFont(fi.absoluteFilePath()); qDebug() << "Added font" << fi.absoluteFilePath() << QFontDatabase::applicationFontFamilies(id); } diff --git a/guh-control/ui/ConnectPage.qml b/guh-control/ui/ConnectPage.qml index ff1fdd6d..eb4446a0 100644 --- a/guh-control/ui/ConnectPage.qml +++ b/guh-control/ui/ConnectPage.qml @@ -164,7 +164,7 @@ Page { } Label { Layout.fillWidth: true - wrapMode: Text.WordWrap + wrapMode: Text.WrapAtWordBoundaryOrAnywhere text: "Fingerprint: " + certDialog.fingerprint } }