author | zautrix <zautrix> | 2005-03-25 00:08:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-25 00:08:08 (UTC) |
commit | 7c2e130ddd194f1c4b5365af6999a27c08232f4b (patch) (unidiff) | |
tree | 75665681327ee49d7650f4d840b5c8c772180fb4 /microkde/kglobalsettings.cpp | |
parent | 5cf054b82738d65f9b0a34ccb51c993ee4a0189f (diff) | |
download | kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.zip kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.tar.gz kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.tar.bz2 |
fixes
-rw-r--r-- | microkde/kglobalsettings.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index e57defe..b6d2feb 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp | |||
@@ -1,24 +1,30 @@ | |||
1 | #include "kglobalsettings.h" | 1 | #include "kglobalsettings.h" |
2 | #include "kconfig.h" | 2 | #include "kconfig.h" |
3 | #include "kglobal.h" | 3 | #include "kglobal.h" |
4 | #include "kconfigbase.h" | 4 | #include "kconfigbase.h" |
5 | 5 | ||
6 | #include <qapplication.h> | 6 | #include <qapplication.h> |
7 | 7 | ||
8 | QFont KGlobalSettings::generalFont() | 8 | QFont KGlobalSettings::generalFont() |
9 | { | 9 | { |
10 | int size = 12; | 10 | int size = 12; |
11 | if (QApplication::desktop()->width() < 480 ) | 11 | if (QApplication::desktop()->width() < 480 ) { |
12 | size = 10; | 12 | size = 10; |
13 | } | ||
14 | #ifndef DESKTOP_VERSION | ||
15 | else | ||
16 | if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | ||
17 | size = 18; | ||
18 | #endif | ||
13 | QFont f = QApplication::font(); | 19 | QFont f = QApplication::font(); |
14 | //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1()); | 20 | //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1()); |
15 | f.setPointSize( size ); | 21 | f.setPointSize( size ); |
16 | return f; | 22 | return f; |
17 | } | 23 | } |
18 | QFont KGlobalSettings::toolBarFont() | 24 | QFont KGlobalSettings::toolBarFont() |
19 | { | 25 | { |
20 | return QApplication::font(); | 26 | return QApplication::font(); |
21 | } | 27 | } |
22 | 28 | ||
23 | QColor KGlobalSettings::toolBarHighlightColor() | 29 | QColor KGlobalSettings::toolBarHighlightColor() |
24 | { | 30 | { |