diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-04-06 12:16:31 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-04-06 12:16:31 +0200 |
| commit | 5e9d152e2c3ff4bbea945e4b65f73da49fc59fdd (patch) | |
| tree | 5b0099c57a53f8115698ae4396048cb2f6d44d08 | |
| parent | Merge commit 'refs/merge-requests/2241' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | Clear downloads in "clear private data" dialog (diff) | |
| download | rekonq-5e9d152e2c3ff4bbea945e4b65f73da49fc59fdd.tar.xz | |
Merge commit 'refs/merge-requests/113' of git://gitorious.org/rekonq/mainline into m113
| -rw-r--r-- | src/cleardata.ui | 12 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 7 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/cleardata.ui b/src/cleardata.ui index b70d3b5a..7de7543f 100644 --- a/src/cleardata.ui +++ b/src/cleardata.ui @@ -24,7 +24,17 @@ <item> <widget class="QCheckBox" name="clearHistory"> <property name="text"> - <string>History</string> + <string>Visited pages history</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="clearDownloads"> + <property name="text"> + <string>Downloads history</string> </property> <property name="checked"> <bool>true</bool> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a3c07cec..d5831fdb 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1184,7 +1184,12 @@ void MainWindow::clearPrivateData() { Application::historyManager()->clear(); } - + + if(clearWidget.clearDownloads->isChecked()) + { + Application::historyManager()->clearDownloadsHistory(); + } + if(clearWidget.clearCookies->isChecked()) { QDBusInterface kcookiejar("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer"); |