Partially ported rekonq to KConfigXT technology..

Perhaps ~50%..going on!!

1 files changed, 237 insertions, 235 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 23b04c83..c06cbc85 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -19,10 +19,14 @@
  * ============================================================ */
 
 
-// Local Includes
+// Self Includes
 #include "settings.h"
 #include "settings.moc"
 
+// Auto Includes
+#include "rekonq.h"
+
+// Local Includes
 #include "browserapplication.h"
 #include "mainwindow.h"
 #include "cookiejar.h"
@@ -32,7 +36,7 @@
 
 //Ui Includes
 #include "ui_settings_general.h"
-#include "ui_settings_appearance.h"
+#include "ui_settings_fonts.h"
 #include "ui_settings_privacy.h"
 #include "ui_settings_proxy.h"
 
@@ -52,7 +56,7 @@ class Private
 {
 private:
     Ui::general generalUi;
-    Ui::appearance appearanceUi;
+    Ui::fonts fontsUi;
     Ui::privacy privacyUi;
     Ui::proxy proxyUi;
 
@@ -72,10 +76,10 @@ Private::Private(SettingsDialog *parent)
     widget->layout()->setMargin(0);
     pageItem = parent->addPage( widget , i18n("General") );
     pageItem->setIcon( KIcon("rekonq") );
-    generalUi.kurlrequester->setMode( KFile::Directory );
+    generalUi.kcfg_downloadDir->setMode( KFile::Directory );
 
     widget = new QWidget;
-    appearanceUi.setupUi( widget );
+    fontsUi.setupUi( widget );
     widget->layout()->setMargin(0);
     pageItem = parent->addPage( widget , i18n("Fonts") );
     pageItem->setIcon( KIcon("preferences-desktop-font") );
@@ -96,7 +100,7 @@ Private::Private(SettingsDialog *parent)
 // -----------------------------------------------------------------------------------------------------
 
 SettingsDialog::SettingsDialog(QWidget *parent)
-    : KConfigDialog(parent, "Settings", new KConfigSkeleton("rekonqrc") )
+    : KConfigDialog(parent, "settings", ReKonfig::self() )
     , d(new Private(this) ) 
 {
     setFaceType(KPageDialog::List);
@@ -106,223 +110,221 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     setWindowTitle( i18n("rekonfig..") );
     setModal(true);
 
-    connect(this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) );
-    connect(this, SIGNAL( closeClicked() ), this, SLOT( close() ) );
-    connect(this, SIGNAL( applyClicked() ), this, SLOT( slotApply() ) );
+    connect(this, SIGNAL(settingsChanged(const QString&)), parent, SLOT(updateConfiguration()));
+//     connect(this, SIGNAL(settingsChanged(const QString&)), this, SLOT(loadFromSettings()));
+
 
     connect( d->generalUi.setHomeToCurrentPageButton, SIGNAL(clicked()), this, SLOT( setHomeToCurrentPage() ) );
     connect( d->privacyUi.exceptionsButton, SIGNAL(clicked()), this, SLOT( showExceptions() ) );
     connect( d->privacyUi.cookiesButton, SIGNAL(clicked()), this, SLOT( showCookies() ) );
-    connect( d->appearanceUi.standardFontButton, SIGNAL(clicked()), this, SLOT( chooseFont() ) );
-    connect( d->appearanceUi.fixedFontButton, SIGNAL(clicked()), this, SLOT( chooseFixedFont() ) );
-
-    loadDefaults();
-    loadFromSettings();
 }
 
 
+
 SettingsDialog::~SettingsDialog()
 {
     delete d;
 }
 
 
-void SettingsDialog::loadDefaults()
-{
-    QWebSettings *defaultSettings = QWebSettings::globalSettings();
-    QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
-    int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
-    m_standardFont = QFont(standardFontFamily, standardFontSize);
-    d->appearanceUi.standardLabel->setText(QString(QLatin1String("%1 %2")).arg( m_standardFont.family() ).arg( m_standardFont.pointSize() ));
-
-    QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
-    int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
-    m_fixedFont = QFont(fixedFontFamily, fixedFontSize);
-    d->appearanceUi.fixedLabel->setText(QString(QLatin1String("%1 %2")).arg( m_fixedFont.family() ).arg( m_fixedFont.pointSize() ));
-
-    d->generalUi.kurlrequester->setUrl( KUrl( "~" ) ); // QDesktopServices::storageLocation(QDesktopServices::DesktopLocation) );
-
-    d->privacyUi.enableJavascript->setChecked(defaultSettings->testAttribute(QWebSettings::JavascriptEnabled));
-    d->privacyUi.enablePlugins->setChecked(defaultSettings->testAttribute(QWebSettings::PluginsEnabled));
-}
-
-
-void SettingsDialog::loadFromSettings()
-{
-    KConfig config("rekonqrc");
-    KConfigGroup group1 = config.group("Global Settings");
-    
-    QString defaultHome = QString("http://www.kde.org");
-    d->generalUi.homeLineEdit->setText( group1.readEntry(QString("home"), defaultHome) );
-
-    int historyExpire = group1.readEntry( QString("historyExpire"), QString().toInt() );
-    int idx = 0;    
-    switch (historyExpire) 
-    {
-        case 1: idx = 0; break;
-        case 7: idx = 1; break;
-        case 14: idx = 2; break;
-        case 30: idx = 3; break;
-        case 365: idx = 4; break;
-        case -1: idx = 5; break;
-        default: idx = 5;
-    }
-    d->generalUi.expireHistory->setCurrentIndex(idx);
-
-    QString downloadDirectory = group1.readEntry( QString("downloadDirectory") , QString() );
-    d->generalUi.kurlrequester->setUrl( KUrl(downloadDirectory) );
-
-    d->generalUi.openLinksIn->setCurrentIndex( group1.readEntry( QString("openLinksIn"), d->generalUi.openLinksIn->currentIndex() ) );
-
-
-    // Appearance
-    KConfigGroup group2 = config.group("Fonts Settings");
-
-    m_fixedFont = group2.readEntry( QString("fixedFont"), m_fixedFont );
-    m_standardFont = group2.readEntry( QString("standardFont"), m_standardFont );
-
-    d->appearanceUi.standardLabel->setText(QString(QLatin1String("%1 %2")).arg( m_standardFont.family() ).arg( m_standardFont.pointSize() ) );
-    d->appearanceUi.fixedLabel->setText(QString(QLatin1String("%1 %2")).arg( m_fixedFont.family() ).arg( m_fixedFont.pointSize() ) );
-
-    // Privacy
-    KConfigGroup group3 = config.group("Privacy Settings");
-
-    d->privacyUi.enableJavascript->setChecked( group3.readEntry( QString("enableJavascript"), d->privacyUi.enableJavascript->isChecked() ) );
-    d->privacyUi.enablePlugins->setChecked( group3.readEntry( QString("enablePlugins"), d->privacyUi.enablePlugins->isChecked() ) );
-
-    CookieJar *jar = BrowserApplication::cookieJar();
-    QString value = group3.readEntry( QString("acceptCookies"), QString("AcceptOnlyFromSitesNavigatedTo") ) ;
-    QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
-    CookieJar::AcceptPolicy acceptCookies = acceptPolicyEnum.keyToValue( value.toLocal8Bit() ) == -1 ?
-                        CookieJar::AcceptOnlyFromSitesNavigatedTo :
-                        static_cast<CookieJar::AcceptPolicy>(acceptPolicyEnum.keyToValue( value.toLocal8Bit() ) );
-    switch(acceptCookies) 
-    {
-    case CookieJar::AcceptAlways:
-        d->privacyUi.acceptCombo->setCurrentIndex(0);
-        break;
-    case CookieJar::AcceptNever:
-        d->privacyUi.acceptCombo->setCurrentIndex(1);
-        break;
-    case CookieJar::AcceptOnlyFromSitesNavigatedTo:
-        d->privacyUi.acceptCombo->setCurrentIndex(2);
-        break;
-    }
-
-    value = group3.readEntry( QString("keepCookiesUntil"), QString("Expire") ); 
-    QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
-    CookieJar::KeepPolicy keepCookies = keepPolicyEnum.keyToValue( value.toLocal8Bit() ) == -1 ?
-                        CookieJar::KeepUntilExpire :
-                        static_cast<CookieJar::KeepPolicy>(keepPolicyEnum.keyToValue( value.toLocal8Bit() ) );
-    switch(keepCookies) 
-    {
-    case CookieJar::KeepUntilExpire:
-        d->privacyUi.keepUntilCombo->setCurrentIndex(0);
-        break;
-    case CookieJar::KeepUntilExit:
-        d->privacyUi.keepUntilCombo->setCurrentIndex(1);
-        break;
-    case CookieJar::KeepUntilTimeLimit:
-        d->privacyUi.keepUntilCombo->setCurrentIndex(2);
-        break;
-    }
-
-    // Proxy
-    KConfigGroup group4 = config.group("Proxy Settings");
-
-    d->proxyUi.proxySupport->setChecked( group4.readEntry( QString("enabled"), false ) );
-    d->proxyUi.proxyType->setCurrentIndex( group4.readEntry( QString("type"), 0) );
-    d->proxyUi.proxyHostName->setText( group4.readEntry( QString("hostName"), QString() ) );
-    d->proxyUi.proxyPort->setValue( group4.readEntry( QString("port"), QString().toInt() ) );
-    d->proxyUi.proxyUserName->setText( group4.readEntry( QString("userName") , QString() ) );
-    d->proxyUi.proxyPassword->setText( group4.readEntry( QString("password") , QString() ) );
-
-}
-
-
-void SettingsDialog::saveToSettings()
+//void SettingsDialog::loadDefaults()
+//{
+//     QWebSettings *defaultSettings = QWebSettings::globalSettings();
+//     QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
+//     int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
+//     m_standardFont = QFont(standardFontFamily, standardFontSize);
+//     d->fontsUi.standardLabel->setText(QString(QLatin1String("%1 %2")).arg( m_standardFont.family() ).arg( m_standardFont.pointSize() ));
+// 
+//     QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
+//     int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
+//     m_fixedFont = QFont(fixedFontFamily, fixedFontSize);
+//     d->fontsUi.fixedLabel->setText(QString(QLatin1String("%1 %2")).arg( m_fixedFont.family() ).arg( m_fixedFont.pointSize() ));
+// 
+//     d->generalUi.kurlrequester->setUrl( KUrl( "~" ) ); // QDesktopServices::storageLocation(QDesktopServices::DesktopLocation) );
+// 
+//     d->privacyUi.enableJavascript->setChecked(defaultSettings->testAttribute(QWebSettings::JavascriptEnabled));
+//     d->privacyUi.enablePlugins->setChecked(defaultSettings->testAttribute(QWebSettings::PluginsEnabled));
+// }
+// 
+// 
+
+/*void SettingsDialog::loadFromSettings()
 {
-    KConfig config("rekonqrc");
-    KConfigGroup group1 = config.group("Global Settings");
-    
-    group1.writeEntry(QString("home"), d->generalUi.homeLineEdit->text() );
-    group1.writeEntry(QString("openLinksIn"), d->generalUi.openLinksIn->currentIndex() );
-    group1.writeEntry(QString("downloadDirectory"), d->generalUi.kurlrequester->url().path() );
-
-    int historyExpire = d->generalUi.expireHistory->currentIndex();
-    int idx = -1;
-    switch (historyExpire) 
-    {
-    case 0: idx = 1; break;
-    case 1: idx = 7; break;
-    case 2: idx = 14; break;
-    case 3: idx = 30; break;
-    case 4: idx = 365; break;
-    case 5: idx = -1; break;
-    }
-    group1.writeEntry(QString("historyExpire"), idx );
-
-    KConfigGroup group2 = config.group("Fonts Settings");
-    group2.writeEntry(QString("fixedFont"), m_fixedFont);
-    group2.writeEntry(QString("standardFont"), m_standardFont);
-
-    KConfigGroup group3 = config.group("Privacy Settings");
-    group3.writeEntry(QString("enableJavascript"), d->privacyUi.enableJavascript->isChecked() );
-    group3.writeEntry(QString("enablePlugins"), d->privacyUi.enablePlugins->isChecked() );
-
-    CookieJar::KeepPolicy keepCookies;
-    switch( d->privacyUi.acceptCombo->currentIndex() ) 
-    {
-    default:
-    case 0:
-        keepCookies = CookieJar::KeepUntilExpire;
-        break;
-    case 1:
-        keepCookies = CookieJar::KeepUntilExit;
-        break;
-    case 2:
-        keepCookies = CookieJar::KeepUntilTimeLimit;
-        break;
-    }
-    CookieJar *jar = BrowserApplication::cookieJar();
-    QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
-    group3.writeEntry(QString("acceptCookies"), QString(acceptPolicyEnum.valueToKey(keepCookies) ) );
-
-    CookieJar::KeepPolicy keepPolicy;
-    switch( d->privacyUi.keepUntilCombo->currentIndex() ) 
-    {
-        default:
-    case 0:
-        keepPolicy = CookieJar::KeepUntilExpire;
-        break;
-    case 1:
-        keepPolicy = CookieJar::KeepUntilExit;
-        break;
-    case 2:
-        keepPolicy = CookieJar::KeepUntilTimeLimit;
-        break;
-    }
-
-    QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
-    group3.writeEntry(QString("keepCookiesUntil"), QString(keepPolicyEnum.valueToKey(keepPolicy) ) );
-
-    
-    KConfigGroup group4 = config.group("Proxy Settings");
-    group4.writeEntry(QString("enabled"), d->proxyUi.proxySupport->isChecked() );
-    group4.writeEntry(QString("type"), d->proxyUi.proxyType->currentIndex() );
-    group4.writeEntry(QString("hostName"), d->proxyUi.proxyHostName->text() );
-    group4.writeEntry(QString("port"), d->proxyUi.proxyPort->text() );
-    group4.writeEntry(QString("userName"), d->proxyUi.proxyUserName->text() );
-    group4.writeEntry(QString("password"), d->proxyUi.proxyPassword->text() );
-
-    config.sync();
-
-    // ---
-    BrowserApplication::instance()->loadSettings();
-    BrowserApplication::networkAccessManager()->loadSettings();
-    BrowserApplication::cookieJar()->loadSettings();
-    BrowserApplication::historyManager()->loadSettings();
-}
+     KConfig config("rekonqrc");
+//     KConfigGroup group1 = config.group("Global Settings");
+//     
+//     QString defaultHome = QString("http://www.kde.org");
+//     d->generalUi.homeLineEdit->setText( group1.readEntry(QString("home"), defaultHome) );
+// 
+//     int historyExpire = group1.readEntry( QString("historyExpire"), QString().toInt() );
+//     int idx = 0;    
+//     switch (historyExpire) 
+//     {
+//         case 1: idx = 0; break;
+//         case 7: idx = 1; break;
+//         case 14: idx = 2; break;
+//         case 30: idx = 3; break;
+//         case 365: idx = 4; break;
+//         case -1: idx = 5; break;
+//         default: idx = 5;
+//     }
+//     d->generalUi.expireHistory->setCurrentIndex(idx);
+// 
+//     QString downloadDirectory = group1.readEntry( QString("downloadDirectory") , QString() );
+//     d->generalUi.kurlrequester->setUrl( KUrl(downloadDirectory) );
+// 
+//     d->generalUi.openLinksIn->setCurrentIndex( group1.readEntry( QString("openLinksIn"), d->generalUi.openLinksIn->currentIndex() ) );
+// 
+// 
+
+     // ===== Fonts
+    KConfigGroup fontsGroup = config.group("Fonts Settings");
+
+    m_standardFont = fontsGroup.readEntry( QString("standardFont"), m_standardFont );
+    d->fontsUi.kcfg_standardFont->setText(QString(QLatin1String("%1 %2")).arg( m_standardFont.family() ).arg( m_standardFont.pointSize() ) );
+
+    m_fixedFont = fontsGroup.readEntry( QString("fixedFont"), m_fixedFont );
+    d->fontsUi.kcfg_fixedFont->setText(QString(QLatin1String("%1 %2")).arg( m_fixedFont.family() ).arg( m_fixedFont.pointSize() ) );
+// 
+//     // Privacy
+//     KConfigGroup group3 = config.group("Privacy Settings");
+// 
+//     d->privacyUi.enableJavascript->setChecked( group3.readEntry( QString("enableJavascript"), d->privacyUi.enableJavascript->isChecked() ) );
+//     d->privacyUi.enablePlugins->setChecked( group3.readEntry( QString("enablePlugins"), d->privacyUi.enablePlugins->isChecked() ) );
+// 
+//     CookieJar *jar = BrowserApplication::cookieJar();
+//     QString value = group3.readEntry( QString("acceptCookies"), QString("AcceptOnlyFromSitesNavigatedTo") ) ;
+//     QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+//     CookieJar::AcceptPolicy acceptCookies = acceptPolicyEnum.keyToValue( value.toLocal8Bit() ) == -1 ?
+//                         CookieJar::AcceptOnlyFromSitesNavigatedTo :
+//                         static_cast<CookieJar::AcceptPolicy>(acceptPolicyEnum.keyToValue( value.toLocal8Bit() ) );
+//     switch(acceptCookies) 
+//     {
+//     case CookieJar::AcceptAlways:
+//         d->privacyUi.acceptCombo->setCurrentIndex(0);
+//         break;
+//     case CookieJar::AcceptNever:
+//         d->privacyUi.acceptCombo->setCurrentIndex(1);
+//         break;
+//     case CookieJar::AcceptOnlyFromSitesNavigatedTo:
+//         d->privacyUi.acceptCombo->setCurrentIndex(2);
+//         break;
+//     }
+// 
+//     value = group3.readEntry( QString("keepCookiesUntil"), QString("Expire") ); 
+//     QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+//     CookieJar::KeepPolicy keepCookies = keepPolicyEnum.keyToValue( value.toLocal8Bit() ) == -1 ?
+//                         CookieJar::KeepUntilExpire :
+//                         static_cast<CookieJar::KeepPolicy>(keepPolicyEnum.keyToValue( value.toLocal8Bit() ) );
+//     switch(keepCookies) 
+//     {
+//     case CookieJar::KeepUntilExpire:
+//         d->privacyUi.keepUntilCombo->setCurrentIndex(0);
+//         break;
+//     case CookieJar::KeepUntilExit:
+//         d->privacyUi.keepUntilCombo->setCurrentIndex(1);
+//         break;
+//     case CookieJar::KeepUntilTimeLimit:
+//         d->privacyUi.keepUntilCombo->setCurrentIndex(2);
+//         break;
+//     }
+// 
+//     // Proxy
+//     KConfigGroup group4 = config.group("Proxy Settings");
+// 
+//     d->proxyUi.proxySupport->setChecked( group4.readEntry( QString("enabled"), false ) );
+//     d->proxyUi.proxyType->setCurrentIndex( group4.readEntry( QString("type"), 0) );
+//     d->proxyUi.proxyHostName->setText( group4.readEntry( QString("hostName"), QString() ) );
+//     d->proxyUi.proxyPort->setValue( group4.readEntry( QString("port"), QString().toInt() ) );
+//     d->proxyUi.proxyUserName->setText( group4.readEntry( QString("userName") , QString() ) );
+//     d->proxyUi.proxyPassword->setText( group4.readEntry( QString("password") , QString() ) );
+// 
+}*/
+// 
+// 
+// void SettingsDialog::saveToSettings()
+// {
+//     KConfig config("rekonqrc");
+//     KConfigGroup group1 = config.group("Global Settings");
+//     
+//     group1.writeEntry(QString("home"), d->generalUi.homeLineEdit->text() );
+//     group1.writeEntry(QString("openLinksIn"), d->generalUi.openLinksIn->currentIndex() );
+//     group1.writeEntry(QString("downloadDirectory"), d->generalUi.kurlrequester->url().path() );
+// 
+//     int historyExpire = d->generalUi.expireHistory->currentIndex();
+//     int idx = -1;
+//     switch (historyExpire) 
+//     {
+//     case 0: idx = 1; break;
+//     case 1: idx = 7; break;
+//     case 2: idx = 14; break;
+//     case 3: idx = 30; break;
+//     case 4: idx = 365; break;
+//     case 5: idx = -1; break;
+//     }
+//     group1.writeEntry(QString("historyExpire"), idx );
+// 
+//     KConfigGroup group2 = config.group("Fonts Settings");
+//     group2.writeEntry(QString("fixedFont"), m_fixedFont);
+//     group2.writeEntry(QString("standardFont"), m_standardFont);
+// 
+//     KConfigGroup group3 = config.group("Privacy Settings");
+//     group3.writeEntry(QString("enableJavascript"), d->privacyUi.enableJavascript->isChecked() );
+//     group3.writeEntry(QString("enablePlugins"), d->privacyUi.enablePlugins->isChecked() );
+// 
+//     CookieJar::KeepPolicy keepCookies;
+//     switch( d->privacyUi.acceptCombo->currentIndex() ) 
+//     {
+//     default:
+//     case 0:
+//         keepCookies = CookieJar::KeepUntilExpire;
+//         break;
+//     case 1:
+//         keepCookies = CookieJar::KeepUntilExit;
+//         break;
+//     case 2:
+//         keepCookies = CookieJar::KeepUntilTimeLimit;
+//         break;
+//     }
+//     CookieJar *jar = BrowserApplication::cookieJar();
+//     QMetaEnum acceptPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+//     group3.writeEntry(QString("acceptCookies"), QString(acceptPolicyEnum.valueToKey(keepCookies) ) );
+// 
+//     CookieJar::KeepPolicy keepPolicy;
+//     switch( d->privacyUi.keepUntilCombo->currentIndex() ) 
+//     {
+//         default:
+//     case 0:
+//         keepPolicy = CookieJar::KeepUntilExpire;
+//         break;
+//     case 1:
+//         keepPolicy = CookieJar::KeepUntilExit;
+//         break;
+//     case 2:
+//         keepPolicy = CookieJar::KeepUntilTimeLimit;
+//         break;
+//     }
+// 
+//     QMetaEnum keepPolicyEnum = jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+//     group3.writeEntry(QString("keepCookiesUntil"), QString(keepPolicyEnum.valueToKey(keepPolicy) ) );
+// 
+//     
+//     KConfigGroup group4 = config.group("Proxy Settings");
+//     group4.writeEntry(QString("enabled"), d->proxyUi.proxySupport->isChecked() );
+//     group4.writeEntry(QString("type"), d->proxyUi.proxyType->currentIndex() );
+//     group4.writeEntry(QString("hostName"), d->proxyUi.proxyHostName->text() );
+//     group4.writeEntry(QString("port"), d->proxyUi.proxyPort->text() );
+//     group4.writeEntry(QString("userName"), d->proxyUi.proxyUserName->text() );
+//     group4.writeEntry(QString("password"), d->proxyUi.proxyPassword->text() );
+// 
+//     config.sync();
+// 
+//     // ---
+//     BrowserApplication::instance()->loadSettings();
+//     BrowserApplication::networkAccessManager()->loadSettings();
+//     BrowserApplication::cookieJar()->loadSettings();
+//     BrowserApplication::historyManager()->loadSettings();
+// }
 
 
 void SettingsDialog::showCookies()
@@ -339,29 +341,29 @@ void SettingsDialog::showExceptions()
 }
 
 
-void SettingsDialog::chooseFont()
-{
-    QFont myFont( m_standardFont );
-    int result = KFontDialog::getFont( myFont );
-    if ( result == KFontDialog::Accepted  ) 
-    {
-        m_standardFont = myFont;
-        d->appearanceUi.standardLabel->setText(QString(QLatin1String("%1 %2")).arg( m_standardFont.family() ).arg( m_standardFont.pointSize() ) );
-    }
-}
-
-
-void SettingsDialog::chooseFixedFont()
-{
-   
-    QFont myFont( m_fixedFont );
-    int result = KFontDialog::getFont( myFont , KFontChooser::FixedFontsOnly );
-    if ( result == KFontDialog::Accepted  ) 
-    {
-        m_fixedFont = myFont;
-        d->appearanceUi.fixedLabel->setText(QString(QLatin1String("%1 %2")).arg( m_fixedFont.family() ).arg( m_fixedFont.pointSize() ) );
-    }
-}
+// void SettingsDialog::chooseStandardFont()
+// {
+//     QFont myFont( m_standardFont );
+//     int result = KFontDialog::getFont( myFont );
+//     if ( result == KFontDialog::Accepted  ) 
+//     {
+//         m_standardFont = myFont;
+//         d->fontsUi.kcfg_standardFont->setText(QString(QLatin1String("%1 %2")).arg( m_standardFont.family() ).arg( m_standardFont.pointSize() ) );
+//     }
+// }
+// 
+// 
+// void SettingsDialog::chooseFixedFont()
+// {
+//    
+//     QFont myFont( m_fixedFont );
+//     int result = KFontDialog::getFont( myFont , KFontChooser::FixedFontsOnly );
+//     if ( result == KFontDialog::Accepted  ) 
+//     {
+//         m_fixedFont = myFont;
+//         d->fontsUi.kcfg_fixedFont->setText(QString(QLatin1String("%1 %2")).arg( m_fixedFont.family() ).arg( m_fixedFont.pointSize() ) );
+//     }
+// }
 
 
 void SettingsDialog::setHomeToCurrentPage()
@@ -370,10 +372,10 @@ void SettingsDialog::setHomeToCurrentPage()
     WebView *webView = mw->currentTab();
     if (webView)
     {
-        d->generalUi.homeLineEdit->setText( webView->url().prettyUrl() );
+        d->generalUi.kcfg_homePage->setText( webView->url().prettyUrl() );
     }
 }
-
+/*
 
 void SettingsDialog::slotOk()
 {
@@ -384,4 +386,4 @@ void SettingsDialog::slotOk()
 void SettingsDialog::slotApply()
 {
     saveToSettings();
-}
+}*/