Removed privacy settings and ported history ones into the General

Group.

6 files changed, 60 insertions, 98 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ce7b1f8d..45a2afb2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,7 +30,6 @@ KDE4_ADD_UI_FILES( rekonq_SRCS
     proxy.ui
     settings_general.ui
     settings_fonts.ui
-    settings_privacy.ui
     settings_proxy.ui
     settings_webkit.ui
     cleardata.ui
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cf25e1b7..bde298f8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -451,7 +451,6 @@ void MainWindow::slotUpdateConfiguration()
 
     // ====== load Settings on main classes
     Application::networkAccessManager()->loadSettings();
-// FIXME (?)    Application::cookieJar()->loadSettings();
     Application::historyManager()->loadSettings();
 }
 
diff --git a/src/settings.cpp b/src/settings.cpp
index e0f9e8e7..b5316ff5 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -43,7 +43,6 @@
 //Ui Includes
 #include "ui_settings_general.h"
 #include "ui_settings_fonts.h"
-#include "ui_settings_privacy.h"
 #include "ui_settings_proxy.h"
 #include "ui_settings_webkit.h"
 
@@ -65,7 +64,6 @@ class Private
 private:
     Ui::general generalUi;
     Ui::fonts fontsUi;
-    Ui::privacy privacyUi;
     Ui::proxy proxyUi;
     Ui::webkit webkitUi;
     KCModuleProxy *ebrowsingModule;
@@ -94,12 +92,6 @@ Private::Private(SettingsDialog *parent)
     pageItem = parent->addPage(widget , i18n("Fonts"));
     pageItem->setIcon(KIcon("preferences-desktop-font"));
 
-    widget = new QWidget;
-    privacyUi.setupUi(widget);
-    widget->layout()->setMargin(0);
-    pageItem = parent->addPage(widget , i18n("History"));
-    pageItem->setIcon(KIcon("view-history"));
-
     KCModuleInfo cookiesInfo("cookies.desktop");
     cookiesModule = new KCModuleProxy(cookiesInfo,parent);
     pageItem = parent->addPage(cookiesModule, i18n(cookiesInfo.moduleName().toLocal8Bit()));
diff --git a/src/settings.h b/src/settings.h
index 3b476ec1..0be89173 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -43,7 +43,8 @@ class SettingsDialog : public KConfigDialog
 public:
     SettingsDialog(QWidget *parent = 0);
     ~SettingsDialog();
-    virtual bool hasChanged ();
+    
+    virtual bool hasChanged();
 
 private:
     Private* const d;
diff --git a/src/settings_general.ui b/src/settings_general.ui
index 90136755..d40dff99 100644
--- a/src/settings_general.ui
+++ b/src/settings_general.ui
@@ -107,6 +107,59 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>History</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Remove history items:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="KComboBox" name="kcfg_expireHistory">
+        <item>
+         <property name="text">
+          <string>After one day</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>After one week</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>After two weeks</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>After one month</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>After one year</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Manually</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -127,6 +180,11 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/settings_privacy.ui b/src/settings_privacy.ui
deleted file mode 100644
index a716dc8d..00000000
--- a/src/settings_privacy.ui
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>privacy</class>
- <widget class="QWidget" name="privacy">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>461</width>
-    <height>313</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Privacy</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>History</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Remove history items:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="KComboBox" name="kcfg_expireHistory">
-        <item>
-         <property name="text">
-          <string>After one day</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After one week</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After two weeks</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After one month</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After one year</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Manually</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>136</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>