diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-03-20 00:57:19 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-03-24 11:29:22 +0100 |
| commit | aab36b488647e298857b7ec24bce0f2b143e4520 (patch) | |
| tree | 7f4f1ff8c3f53a2da82ad8d8ff052c8a78f976ca /src/mainwindow.cpp | |
| parent | pedantic..TODO (diff) | |
| download | rekonq-aab36b488647e298857b7ec24bce0f2b143e4520.tar.xz | |
working on fixing font problem..
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 22110c59..56eb6ecc 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -314,28 +314,30 @@ void MainWindow::slotUpdateConf() // =========== Fonts ============== QWebSettings *defaultSettings = QWebSettings::globalSettings(); + int fnSize = ReKonfig::fontSize(); + QFont standardFont = ReKonfig::standardFont(); - if( !standardFont.exactMatch() ) - { - kWarning() << "Webkit Standard Font doesn't match! Setting to KDE general font.."; - standardFont = KGlobalSettings::generalFont(); - ReKonfig::setStandardFont( standardFont ); - ReKonfig::self()->writeConfig(); - } +// if( !standardFont.exactMatch() ) +// { +// kWarning() << "Webkit Standard Font doesn't match! Setting to KDE general font.."; +// standardFont = KGlobalSettings::generalFont(); +// ReKonfig::setStandardFont( standardFont ); +// ReKonfig::self()->writeConfig(); +// } defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family()); - defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize()); + defaultSettings->setFontSize(QWebSettings::DefaultFontSize, fnSize); QFont fixedFont = ReKonfig::fixedFont(); - if( !fixedFont.exactMatch() ) - { - kWarning() << "Webkit Fixed Font doesn't match! Setting to KDE fixed font.."; - fixedFont = KGlobalSettings::fixedFont(); - ReKonfig::setFixedFont( fixedFont ); - ReKonfig::self()->writeConfig(); - } +// if( !fixedFont.exactMatch() ) +// { +// kWarning() << "Webkit Fixed Font doesn't match! Setting to KDE fixed font.."; +// fixedFont = KGlobalSettings::fixedFont(); +// ReKonfig::setFixedFont( fixedFont ); +// ReKonfig::self()->writeConfig(); +// } defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family()); - defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize()); + defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fnSize); // =========== Privacy ============== |