From adedaa2e468e55ddf26223cb92a7d36a1a75d933 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 20 Sep 2009 01:39:13 +0200
Subject: Fixing homepage (user's not rekonq's) opening and behaviour

---
 src/mainwindow.cpp      | 2 +-
 src/rekonq.kcfg         | 2 +-
 src/settings.cpp        | 8 ++++++++
 src/settings_general.ui | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5a095a72..8b4f5c6c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -741,7 +741,7 @@ void MainWindow::slotHome()
 {
     WebView *w = currentTab();
     
-    if(ReKonfig::useNewTabPage())
+    if(ReKonfig::newTabHomePage())
     {
         HomePage p(w);
         w->setHtml( p.rekonqHomePage(), QUrl());
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 1a190fff..354e3719 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -25,7 +25,7 @@
 
 <!-- General Settings -->
   <group name="General">
-    <entry name="useNewTabPage" type="Bool">
+    <entry name="newTabHomePage" type="Bool">
         <default>true</default>
     </entry>
     <entry name="newTabsBehaviour" type="Int">
diff --git a/src/settings.cpp b/src/settings.cpp
index 1950c40a..57793888 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -185,6 +185,12 @@ void SettingsDialog::setWebSettingsToolTips()
 // we need this function to UPDATE the config widget data..
 void SettingsDialog::readConfig()
 {
+    // ======= General Page
+    if( ReKonfig::newTabHomePage() )
+        d->generalUi.rbUseNewTabPage->setChecked( true );
+    else
+        d->generalUi.rbUseHomePage->setChecked( true );
+            
     // ====== New Tab Page
     QTableWidget *t = d->newtabpageUi.tableWidget;
     QStringList names, urls;
@@ -220,6 +226,8 @@ void SettingsDialog::readConfig()
 // we need this function to SAVE settings in rc file..
 void SettingsDialog::saveSettings()
 {
+    ReKonfig::setNewTabHomePage( d->generalUi.rbUseNewTabPage->isChecked() );
+    
     QTableWidget *t = d->newtabpageUi.tableWidget;
     QStringList names, urls;
     for(int i=0; i<9; ++i)
diff --git a/src/settings_general.ui b/src/settings_general.ui
index 66f9e7e9..8e62182f 100644
--- a/src/settings_general.ui
+++ b/src/settings_general.ui
@@ -21,7 +21,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QRadioButton" name="kcfg_useNewTabPage">
+       <widget class="QRadioButton" name="rbUseNewTabPage">
         <property name="text">
          <string>Use new tab page</string>
         </property>
@@ -33,7 +33,7 @@
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QRadioButton" name="radioButton">
+         <widget class="QRadioButton" name="rbUseHomePage">
           <property name="text">
            <string>Use this page:</string>
           </property>
-- 
cgit v1.2.1