From 5cb207d1e190efc5ebe8d202bde35ad48c1e9212 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 24 Mar 2009 02:02:25 +0100 Subject: Some fixes on font dim. Updating data still doesn't work.. --- src/mainwindow.cpp | 27 +++++++++++---------------- src/mainwindow.h | 1 + src/rekonq.kcfg | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 56eb6ecc..df596bdd 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -317,25 +317,11 @@ void MainWindow::slotUpdateConf() 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(); -// } defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family()); 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(); -// } defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family()); defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fnSize); @@ -352,6 +338,15 @@ void MainWindow::slotUpdateConf() Application::networkAccessManager()->loadSettings(); Application::cookieJar()->loadSettings(); Application::historyManager()->loadSettings(); + + // ============ Proxy ================ +} + + +void MainWindow::slotUpdateBrowser() +{ + slotUpdateConf(); + tabWidget()->reloadAllTabs(); } @@ -447,9 +442,9 @@ void MainWindow::slotPreferences() SettingsDialog *s = new SettingsDialog(this); // keep us informed when the user changes settings - connect( s, SIGNAL(settingsChanged(const QString&)), this, SLOT(slotUpdateConf()) ); + connect(s, SIGNAL(settingsChanged(const QString&)), this, SLOT(slotUpdateBrowser())); - s->show(); + s->exec(); } diff --git a/src/mainwindow.h b/src/mainwindow.h index e2212535..ee07707d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -68,6 +68,7 @@ private: public slots: void slotHome(); void loadUrl(const KUrl &url); + void slotUpdateBrowser(); private slots: void slotUpdateConf(); diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index e7c433fd..373f3fd1 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -34,7 +34,7 @@ QFont(QWebSettings::globalSettings()->fontFamily(QWebSettings::FixedFont)) - 10 + 12 -- cgit v1.2.1