From 3f9a13565557c57f74441442520ab02626c8c3da Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 26 Mar 2012 19:10:39 +0200 Subject: clean up failed rebasing and implement history timed expire check --- src/history/historymanager.cpp | 21 +++++++----- src/rekonq.kcfg | 71 +++++++++++----------------------------- src/settings/settings_privacy.ui | 14 ++++---- src/settings/settingsdialog.cpp | 2 +- 4 files changed, 41 insertions(+), 67 deletions(-) diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp index c78bb009..11b55e84 100644 --- a/src/history/historymanager.cpp +++ b/src/history/historymanager.cpp @@ -82,6 +82,12 @@ HistoryManager::HistoryManager(QObject *parent) HistoryManager::~HistoryManager() { + if (ReKonfig::expireHistory() == 4) + { + m_history.clear(); + save(); + return; + } m_saveTimer->saveIfNeccessary(); } @@ -94,6 +100,9 @@ bool HistoryManager::historyContains(const QString &url) const void HistoryManager::addHistoryEntry(const KUrl &url, const QString &title) { + if (ReKonfig::expireHistory() == 5) // DON'T STORE HISTORY! + return; + QWebSettings *globalSettings = QWebSettings::globalSettings(); if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) return; @@ -259,21 +268,17 @@ void HistoryManager::loadSettings() int days; switch (historyExpire) { - case 0: - days = 1; - break; case 1: - days = 7; + days = 90; break; case 2: - days = 14; + days = 30; break; case 3: - days = 30; + days = 1; break; + case 0: case 4: - days = 365; - break; case 5: default: days = -1; diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index 89d3b742..1fb3c1c4 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -39,6 +39,24 @@ true + + true + + + true + + + true + + + true + + + true + + + true + @@ -164,24 +182,9 @@ false - 1 - - - true - - - true - - - true - - - true - - - true + 0 - + true @@ -229,17 +232,6 @@ - - - - 0 - - - true - - - - @@ -262,29 +254,6 @@ - - - - - false - - - false - - - EasyList - - - https://easylist-downloads.adblockplus.org/easylist.txt - - - QDateTime(QDate(2009,03,13)) - - - 7 - - - diff --git a/src/settings/settings_privacy.ui b/src/settings/settings_privacy.ui index 68245200..04f36bad 100644 --- a/src/settings/settings_privacy.ui +++ b/src/settings/settings_privacy.ui @@ -66,35 +66,35 @@ - + - don't even store them + never - at application exit + every 3 months - every day + every month - every month + every day - every 3 months + at application exit - never + don't even store them diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index 3d5260cf..3e25640d 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -141,7 +141,7 @@ Private::Private(SettingsDialog *parent) // WARNING // remember wheh changing here that the smallest netbooks // have a 1024x576 resolution. So DON'T bother that limits!! - parent->setMinimumSize(700, 576); + parent->setMinimumSize(700, 525); } -- cgit v1.2.1