Fixed options show recently closed tabs / show recent history

4 files changed, 11 insertions, 97 deletions

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 76c4f393..1f056a92 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -73,7 +73,7 @@ QString HomePage::rekonqHomePage()
 
     QString speed = speedDial();
     QString search = searchEngines();
-    QString lastBlock = ReKonfig::useRecentlyClosedTabs() ? recentlyClosedTabs() : fillRecentHistory(); 
+    QString lastBlock = ReKonfig::showLastVisitedSites() ? fillRecentHistory() : recentlyClosedTabs() ; 
     
 
     QString html = QString(QLatin1String(file.readAll()))
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 417b7fbc..16a77d2c 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -17,8 +17,8 @@
     <entry name="previewUrls" type="StringList">
         <default>http://www.kde.org,http://www.google.com,http://rekonq.sourceforge.net</default>
     </entry>
-    <entry name="useRecentlyClosedTabs" type="Bool">
-        <default>false</default>
+    <entry name="showLastVisitedSites" type="Bool">
+        <default>true</default>
     </entry>
   </group>
 
diff --git a/src/settings.cpp b/src/settings.cpp
index c43b23fc..ae8ccc4d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -200,7 +200,9 @@ void SettingsDialog::readConfig()
 
     ReKonfig::setPreviewNames(names);
     ReKonfig::setPreviewUrls(urls);
-    
+
+    d->newtabpageUi.showLastVisitedSites->setChecked( ReKonfig::showLastVisitedSites() );
+
     
     // ======= Fonts
     d->fontsUi.kcfg_fixedFont->setOnlyFixed(true);
@@ -225,7 +227,9 @@ void SettingsDialog::saveSettings()
 
     ReKonfig::setPreviewNames(names);
     ReKonfig::setPreviewUrls(urls);
-    
+
+    ReKonfig::setShowLastVisitedSites( d->newtabpageUi.showLastVisitedSites->isChecked() );
+
     ReKonfig::self()->writeConfig();
     d->ebrowsingModule->save();
     d->cookiesModule->save();
diff --git a/src/settings_newtabpage.ui b/src/settings_newtabpage.ui
index 006185c0..2061d285 100644
--- a/src/settings_newtabpage.ui
+++ b/src/settings_newtabpage.ui
@@ -39,96 +39,6 @@
         <row/>
         <column/>
         <column/>
-        <item row="0" column="0">
-         <property name="text">
-          <string>KDE site</string>
-         </property>
-        </item>
-        <item row="0" column="1">
-         <property name="text">
-          <string>http://www.kde.org</string>
-         </property>
-        </item>
-        <item row="1" column="0">
-         <property name="text">
-          <string>KDE apps</string>
-         </property>
-        </item>
-        <item row="1" column="1">
-         <property name="text">
-          <string>http://kde-apps.org</string>
-         </property>
-        </item>
-        <item row="2" column="0">
-         <property name="text">
-          <string>rekonq site</string>
-         </property>
-        </item>
-        <item row="2" column="1">
-         <property name="text">
-          <string>http://rekonq.sourceforge.net</string>
-         </property>
-        </item>
-        <item row="3" column="0">
-         <property name="text">
-          <string>Google</string>
-         </property>
-        </item>
-        <item row="3" column="1">
-         <property name="text">
-          <string>http://www.google.com</string>
-         </property>
-        </item>
-        <item row="4" column="0">
-         <property name="text">
-          <string>Wikipedia</string>
-         </property>
-        </item>
-        <item row="4" column="1">
-         <property name="text">
-          <string>http://wikipedia.org</string>
-         </property>
-        </item>
-        <item row="5" column="0">
-         <property name="text">
-          <string>SourceForge</string>
-         </property>
-        </item>
-        <item row="5" column="1">
-         <property name="text">
-          <string>http://sourceforge.net</string>
-         </property>
-        </item>
-        <item row="6" column="0">
-         <property name="text">
-          <string>Kernel</string>
-         </property>
-        </item>
-        <item row="6" column="1">
-         <property name="text">
-          <string>http://www.kernel.org</string>
-         </property>
-        </item>
-        <item row="7" column="0">
-         <property name="text">
-          <string>Wordpress</string>
-         </property>
-        </item>
-        <item row="7" column="1">
-         <property name="text">
-          <string>http://wordpress.com</string>
-         </property>
-        </item>
-        <item row="8" column="0">
-         <property name="text">
-          <string>Planet KDE</string>
-         </property>
-        </item>
-        <item row="8" column="1">
-         <property name="text">
-          <string>http://planetkde.org</string>
-         </property>
-        </item>
        </widget>
       </item>
      </layout>
@@ -141,14 +51,14 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QRadioButton" name="kcfg_useRecentlyClosedTabs">
+       <widget class="QRadioButton" name="showLastVisitedSites">
         <property name="text">
          <string>show last 20 visited sites</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton_2">
+       <widget class="QRadioButton" name="showRecentlyClosedTabs">
         <property name="text">
          <string>show recently closed tabs</string>
         </property>