diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
| commit | e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a (patch) | |
| tree | 9d03b385b1eca31487d5df6c0460e335bca6e663 /src/settings | |
| parent | removed current bugged adblock implementation. (diff) | |
| parent | clicktoflash : more cleanup (diff) | |
| download | rekonq-e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a.tar.xz | |
Merge commit 'refs/merge-requests/2237' of git://gitorious.org/rekonq/mainline into FLASH
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/settings_webkit.ui | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui index 129bcf03..c59dc9c3 100644 --- a/src/settings/settings_webkit.ui +++ b/src/settings/settings_webkit.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>622</width> + <width>485</width> <height>360</height> </rect> </property> @@ -66,46 +66,58 @@ </property> </widget> </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="kcfg_pluginsEnabled"> + <item row="3" column="3"> + <widget class="QCheckBox" name="kcfg_offlineStorageDatabaseEnabled"> <property name="text"> - <string>Plugins</string> + <string>Offline storage database</string> </property> </widget> </item> - <item row="3" column="3"> - <widget class="QCheckBox" name="kcfg_offlineStorageDatabaseEnabled"> + <item row="4" column="3"> + <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled"> <property name="text"> - <string>Offline storage database</string> + <string>Offline web application cache</string> </property> </widget> </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows"> + <item row="5" column="3"> + <widget class="QCheckBox" name="kcfg_localStorageDatabaseEnabled"> <property name="text"> - <string>JavaScript can open windows</string> + <string>Local storage database</string> </property> </widget> </item> - <item row="4" column="3"> - <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled"> + <item row="3" column="0"> + <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows"> <property name="text"> - <string>Offline web application cache</string> + <string>JavaScript can open windows</string> </property> </widget> </item> - <item row="5" column="0" colspan="2"> + <item row="4" column="0"> <widget class="QCheckBox" name="kcfg_javascriptCanAccessClipboard"> <property name="text"> <string>JavaScript can access clipboard</string> </property> </widget> </item> - <item row="5" column="3"> - <widget class="QCheckBox" name="kcfg_localStorageDatabaseEnabled"> - <property name="text"> - <string>Local storage database</string> - </property> + <item row="5" column="0"> + <widget class="QComboBox" name="kcfg_pluginsEnabled"> + <item> + <property name="text"> + <string>Autoload plugins</string> + </property> + </item> + <item> + <property name="text"> + <string>Manually load plugins</string> + </property> + </item> + <item> + <property name="text"> + <string>Never load plugins</string> + </property> + </item> </widget> </item> </layout> |