diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-08-20 13:59:25 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-08-20 13:59:25 +0200 |
commit | 75b57201e9c0213048cce95f8abc8670b229f547 (patch) | |
tree | d8cb75b039e90a828d86303a25e79308aa3370dc | |
parent | c70900dd854dd8b8777edb0ccd479e311c957aeb (diff) | |
download | kube-75b57201e9c0213048cce95f8abc8670b229f547.tar.gz kube-75b57201e9c0213048cce95f8abc8670b229f547.zip |
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.
-rw-r--r-- | applications/kube/main.cpp | 1 | ||||
-rw-r--r-- | docker/Dockerfile | 4 | ||||
-rw-r--r-- | docker/qt5ct/qt5ct.conf | 3 |
3 files changed, 7 insertions, 1 deletions
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[]) | |||
122 | app.setApplicationVersion(QString("%1 Branch: %2 Commit: %3").arg(kube_VERSION_STRING).arg(kube_BRANCH).arg(kube_COMMIT)); | 122 | app.setApplicationVersion(QString("%1 Branch: %2 Commit: %3").arg(kube_VERSION_STRING).arg(kube_BRANCH).arg(kube_COMMIT)); |
123 | app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); | 123 | app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); |
124 | 124 | ||
125 | qDebug() << "Font size:" << app.font().pointSize(); | ||
125 | 126 | ||
126 | QCommandLineParser parser; | 127 | QCommandLineParser parser; |
127 | parser.setApplicationDescription("A communication and collaboration client."); | 128 | 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 | |||
9 | kf5-ki18n-devel kf5-kcodecs-devel kf5-kcontacts-devel kf5-kmime-devel gpgme-devel kf5-kcalendarcore-devel \ | 9 | kf5-ki18n-devel kf5-kcodecs-devel kf5-kcontacts-devel kf5-kmime-devel gpgme-devel kf5-kcalendarcore-devel \ |
10 | cyrus-imapd cyrus-sasl cyrus-sasl-devel cyrus-sasl-plain gnupg2-smime pinentry-gtk \ | 10 | cyrus-imapd cyrus-sasl cyrus-sasl-devel cyrus-sasl-plain gnupg2-smime pinentry-gtk \ |
11 | google-noto-serif-fonts google-noto-sans-fonts \ | 11 | google-noto-serif-fonts google-noto-sans-fonts \ |
12 | xorg-x11-server-Xvfb | 12 | xorg-x11-server-Xvfb qt5ct |
13 | 13 | ||
14 | RUN useradd -d /home/developer -m developer | 14 | RUN useradd -d /home/developer -m developer |
15 | 15 | ||
@@ -42,6 +42,7 @@ ENV XDG_DATA_DIRS /install/share/:/usr/share | |||
42 | RUN mkdir /tmp/runtime-developer | 42 | RUN mkdir /tmp/runtime-developer |
43 | ENV XDG_RUNTIME_DIR /tmp/runtime-developer | 43 | ENV XDG_RUNTIME_DIR /tmp/runtime-developer |
44 | ENV LANG en_US.UTF-8 | 44 | ENV LANG en_US.UTF-8 |
45 | ENV QT_QPA_PLATFORMTHEME qt5ct | ||
45 | 46 | ||
46 | RUN git config --global url."git://anongit.kde.org/".insteadOf kde: && \ | 47 | RUN git config --global url."git://anongit.kde.org/".insteadOf kde: && \ |
47 | git config --global url."ssh://git@git.kde.org/".pushInsteadOf kde: | 48 | git config --global url."ssh://git@git.kde.org/".pushInsteadOf kde: |
@@ -61,6 +62,7 @@ ADD gdbinit /home/developer/.gdbinit | |||
61 | ADD enableDebug.sh /home/developer/enableDebug.sh | 62 | ADD enableDebug.sh /home/developer/enableDebug.sh |
62 | ADD private-key /home/developer/private-key | 63 | ADD private-key /home/developer/private-key |
63 | ADD public-key /home/developer/public-key | 64 | ADD public-key /home/developer/public-key |
65 | ADD qt5ct /home/developer/.config/qt5ct | ||
64 | RUN sudo chown developer:developer /home/developer/* | 66 | RUN sudo chown developer:developer /home/developer/* |
65 | RUN sudo chown developer:developer /home/developer/.* -R | 67 | RUN sudo chown developer:developer /home/developer/.* -R |
66 | 68 | ||
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 @@ | |||
1 | [Fonts] | ||
2 | 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) | ||
3 | 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) | ||