author | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
commit | cf4848d972efe96640f2d5f5d52704306d0cbe4c (patch) (side-by-side diff) | |
tree | 123a2075927def5f7f59a20949d6b59174ae79b6 /microkde | |
parent | 6add774cf9841377f32613c7aa23161a823aa1da (diff) | |
download | kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.zip kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.gz kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.bz2 |
fixes
-rw-r--r-- | microkde/kglobalsettings.cpp | 16 | ||||
-rw-r--r-- | microkde/kglobalsettings.h | 1 | ||||
-rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index b6d2feb..b837b23 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp @@ -21,6 +21,22 @@ QFont KGlobalSettings::generalFont() f.setPointSize( size ); return f; } +QFont KGlobalSettings::generalMaxFont() +{ + int size = 12; + if (QApplication::desktop()->width() < 480 ) { + size = 10; + } +#ifndef DESKTOP_VERSION + else + if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) + size = 18; +#endif + QFont f = QApplication::font(); + if ( f.pointSize() > size ) + f.setPointSize( size ); + return f; +} QFont KGlobalSettings::toolBarFont() { return QApplication::font(); diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h index 7df8012..075bb1c 100644 --- a/microkde/kglobalsettings.h +++ b/microkde/kglobalsettings.h @@ -12,6 +12,7 @@ class KGlobalSettings { public: static QFont generalFont(); + static QFont generalMaxFont(); static QFont toolBarFont(); static QColor toolBarHighlightColor(); diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index bb41b18..9c87682 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp @@ -42,7 +42,7 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, parent, name, modal, true), d(0L) { - setFont( KGlobalSettings::generalFont() ); + setFont( KGlobalSettings::generalMaxFont() ); enableButton(Apply, false); //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); |