diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-03-26 19:10:39 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-04-12 02:30:01 +0200 |
| commit | 3f9a13565557c57f74441442520ab02626c8c3da (patch) | |
| tree | 882aac9209f4393650bd055755bce6ce5f1d604e /src/settings | |
| parent | Consider new PasswordSavingEnabled privacy check (diff) | |
| download | rekonq-3f9a13565557c57f74441442520ab02626c8c3da.tar.xz | |
clean up failed rebasing and implement history timed expire check
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/settings_privacy.ui | 14 | ||||
| -rw-r--r-- | src/settings/settingsdialog.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
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 @@ </widget> </item> <item> - <widget class="QComboBox" name="kcfg_historyMaintainingPeriod"> + <widget class="QComboBox" name="kcfg_expireHistory"> <item> <property name="text"> - <string>don't even store them</string> + <string>never</string> </property> </item> <item> <property name="text"> - <string>at application exit</string> + <string>every 3 months</string> </property> </item> <item> <property name="text"> - <string>every day</string> + <string>every month</string> </property> </item> <item> <property name="text"> - <string>every month</string> + <string>every day</string> </property> </item> <item> <property name="text"> - <string>every 3 months</string> + <string>at application exit</string> </property> </item> <item> <property name="text"> - <string>never</string> + <string>don't even store them</string> </property> </item> </widget> 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); } |