summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-03-24 02:02:25 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-03-24 11:29:23 +0100
commit5cb207d1e190efc5ebe8d202bde35ad48c1e9212 (patch)
treef79fd5152f8f9b4d6de3e55a78f2d4b04de489cf /src/mainwindow.cpp
parentFixed setting fonts UI (diff)
downloadrekonq-5cb207d1e190efc5ebe8d202bde35ad48c1e9212.tar.xz
Some fixes on font dim. Updating data still doesn't work..
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp27
1 files changed, 11 insertions, 16 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();
}