From 75b57201e9c0213048cce95f8abc8670b229f547 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 20 Aug 2018 13:59:25 +0200 Subject: Use qt5ct to set the font size to 11 Otherwise we default to a rather small value of 9 which is hardcoded in qgenericunixthemes.cpp. --- applications/kube/main.cpp | 1 + docker/Dockerfile | 4 +++- docker/qt5ct/qt5ct.conf | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 docker/qt5ct/qt5ct.conf diff --git a/applications/kube/main.cpp b/applications/kube/main.cpp index ef9be5ab..61773381 100644 --- a/applications/kube/main.cpp +++ b/applications/kube/main.cpp @@ -122,6 +122,7 @@ int main(int argc, char *argv[]) app.setApplicationVersion(QString("%1 Branch: %2 Commit: %3").arg(kube_VERSION_STRING).arg(kube_BRANCH).arg(kube_COMMIT)); app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); + qDebug() << "Font size:" << app.font().pointSize(); QCommandLineParser parser; parser.setApplicationDescription("A communication and collaboration client."); diff --git a/docker/Dockerfile b/docker/Dockerfile index 99012aee..e6dee8a7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ RUN dnf -y install gcc-c++ git doxygen cmake bzr vim tar make ninja-build clang kf5-ki18n-devel kf5-kcodecs-devel kf5-kcontacts-devel kf5-kmime-devel gpgme-devel kf5-kcalendarcore-devel \ cyrus-imapd cyrus-sasl cyrus-sasl-devel cyrus-sasl-plain gnupg2-smime pinentry-gtk \ google-noto-serif-fonts google-noto-sans-fonts \ - xorg-x11-server-Xvfb + xorg-x11-server-Xvfb qt5ct RUN useradd -d /home/developer -m developer @@ -42,6 +42,7 @@ ENV XDG_DATA_DIRS /install/share/:/usr/share RUN mkdir /tmp/runtime-developer ENV XDG_RUNTIME_DIR /tmp/runtime-developer ENV LANG en_US.UTF-8 +ENV QT_QPA_PLATFORMTHEME qt5ct RUN git config --global url."git://anongit.kde.org/".insteadOf kde: && \ git config --global url."ssh://git@git.kde.org/".pushInsteadOf kde: @@ -61,6 +62,7 @@ ADD gdbinit /home/developer/.gdbinit ADD enableDebug.sh /home/developer/enableDebug.sh ADD private-key /home/developer/private-key ADD public-key /home/developer/public-key +ADD qt5ct /home/developer/.config/qt5ct RUN sudo chown developer:developer /home/developer/* RUN sudo chown developer:developer /home/developer/.* -R diff --git a/docker/qt5ct/qt5ct.conf b/docker/qt5ct/qt5ct.conf new file mode 100644 index 00000000..83a0550a --- /dev/null +++ b/docker/qt5ct/qt5ct.conf @@ -0,0 +1,3 @@ +[Fonts] +fixed=@Variant(\0\0\0@\0\0\0\x12\0M\0o\0n\0o\0s\0p\0\x61\0\x63\0\x65@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) +general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) -- cgit v1.2.3