From 09aa32dd522176a9b9762e4d85b3e8c66d4d6be2 Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Mon, 20 Aug 2018 12:25:40 +0300 Subject: Fix some major scaling & font issues on ebike-demo Task-number: QTBUG-69840 Change-Id: If519ae62a0a73c8dbf2f6f7b9f681bdfdb8b28a0 Reviewed-by: Sami Nurmenniemi Reviewed-by: Mikko Gronoff --- basicsuite/shared/fonts.qrc | 14 +++++++++----- .../shared/fonts/ebike-fonts/Montserrat-Bold.ttf | Bin 0 -> 191648 bytes .../shared/fonts/ebike-fonts/Montserrat-Light.ttf | Bin 0 -> 192116 bytes .../shared/fonts/ebike-fonts/Montserrat-Medium.ttf | Bin 0 -> 192488 bytes .../shared/fonts/ebike-fonts/Montserrat-Regular.ttf | Bin 0 -> 190648 bytes basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf | Bin 0 -> 305800 bytes basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf | Bin 0 -> 301528 bytes basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf | Bin 0 -> 310028 bytes basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf | Bin 0 -> 311780 bytes .../shared/fonts/ebike-fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes basicsuite/shared/main.cpp | 18 +++++++++--------- basicsuite/shared/shared.pri | 14 +++++++++----- 12 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf create mode 100644 basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf (limited to 'basicsuite/shared') diff --git a/basicsuite/shared/fonts.qrc b/basicsuite/shared/fonts.qrc index 13b8cb2..ccc8864 100644 --- a/basicsuite/shared/fonts.qrc +++ b/basicsuite/shared/fonts.qrc @@ -2,14 +2,18 @@ fonts/TitilliumWeb-Black.ttf fonts/TitilliumWeb-Bold.ttf - fonts/TitilliumWeb-BoldItalic.ttf fonts/TitilliumWeb-ExtraLight.ttf - fonts/TitilliumWeb-ExtraLightItalic.ttf - fonts/TitilliumWeb-Italic.ttf fonts/TitilliumWeb-Light.ttf - fonts/TitilliumWeb-LightItalic.ttf fonts/TitilliumWeb-Regular.ttf fonts/TitilliumWeb-SemiBold.ttf - fonts/TitilliumWeb-SemiBoldItalic.ttf + fonts/ebike-fonts/fontawesome-webfont.ttf + fonts/ebike-fonts/Montserrat-Bold.ttf + fonts/ebike-fonts/Montserrat-Light.ttf + fonts/ebike-fonts/Montserrat-Medium.ttf + fonts/ebike-fonts/Montserrat-Regular.ttf + fonts/ebike-fonts/Teko-Bold.ttf + fonts/ebike-fonts/Teko-Light.ttf + fonts/ebike-fonts/Teko-Medium.ttf + fonts/ebike-fonts/Teko-Regular.ttf diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf new file mode 100644 index 0000000..8e9a5f3 Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Bold.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf new file mode 100644 index 0000000..e66dc5b Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Light.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf new file mode 100644 index 0000000..88d70b8 Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Medium.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf new file mode 100644 index 0000000..626355a Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Montserrat-Regular.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf new file mode 100644 index 0000000..d061824 Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Teko-Bold.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf new file mode 100644 index 0000000..ec5194a Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Teko-Light.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf new file mode 100644 index 0000000..cc38086 Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Teko-Medium.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf b/basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf new file mode 100644 index 0000000..3161e63 Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/Teko-Regular.ttf differ diff --git a/basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf b/basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/basicsuite/shared/fonts/ebike-fonts/fontawesome-webfont.ttf differ diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index 4afbbe4..d22ea8a 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -95,15 +95,15 @@ int main(int argc, char **argv) QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Black.ttf"); //For eBike demo - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Bold.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Light.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Medium.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Montserrat-Regular.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Bold.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Light.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Medium.ttf"); - QFontDatabase::addApplicationFont(":/fonts/Teko-Regular.ttf"); - QFontDatabase::addApplicationFont(":/fonts/fontawesome-webfont.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Light.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Medium.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Montserrat-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Light.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Medium.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/Teko-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/ebike-fonts/fontawesome-webfont.ttf"); QString path = app.applicationDirPath(); diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index 223bb02..50772d0 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -28,15 +28,19 @@ defineTest(b2qtdemo_deploy_defaults) { DISTFILES += $$PWD/fonts/TitilliumWeb-Black.ttf \ $$PWD/fonts/TitilliumWeb-Bold.ttf \ - $$PWD/fonts/TitilliumWeb-BoldItalic.ttf \ $$PWD/fonts/TitilliumWeb-ExtraLight.ttf \ - $$PWD/fonts/TitilliumWeb-ExtraLightItalic.ttf \ - $$PWD/fonts/TitilliumWeb-Italic.ttf \ $$PWD/fonts/TitilliumWeb-Light.ttf \ - $$PWD/fonts/TitilliumWeb-LightItalic.ttf \ $$PWD/fonts/TitilliumWeb-Regular.ttf \ $$PWD/fonts/TitilliumWeb-SemiBold.ttf \ - $$PWD/fonts/TitilliumWeb-SemiBoldItalic.ttf + $$PWD/fonts/ebike-fonts/fontawesome-webfont.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Bold.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Light.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Medium.ttf \ + $$PWD/fonts/ebike-fonts/Montserrat-Regular.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Bold.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Light.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Medium.ttf \ + $$PWD/fonts/ebike-fonts/Teko-Regular.ttf RESOURCES += \ $$PWD/fonts.qrc -- cgit v1.2.3