summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-12-13 16:46:50 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-12-13 16:46:50 +0100
commitf0da5a53593f9e1f50726f5e07fded1d8d9bd9e5 (patch)
tree10b34ac2b43f289c89a20846aab505abbe3806e4
parentLoad animation -> Load Plugin (diff)
parentFurther changes to the webkitsettings page (diff)
downloadrekonq-f0da5a53593f9e1f50726f5e07fded1d8d9bd9e5.tar.xz
Merge commit 'refs/merge-requests/67' of git://gitorious.org/rekonq/mainline into m67
-rw-r--r--src/settings/settings_webkit.ui78
1 files changed, 65 insertions, 13 deletions
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index c59dc9c3..5074522b 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>485</width>
- <height>360</height>
+ <width>437</width>
+ <height>346</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -24,13 +24,6 @@
</property>
</widget>
</item>
- <item row="0" column="2" rowspan="6">
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
<item row="0" column="3">
<widget class="QCheckBox" name="kcfg_linksIncludedInFocusChain">
<property name="text">
@@ -40,6 +33,12 @@
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_javascriptEnabled">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>JavaScript support</string>
</property>
@@ -101,21 +100,74 @@
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="0" column="2" rowspan="6">
+ <widget class="Line" name="line">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Plugin Settings</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>When loading web pages:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QComboBox" name="kcfg_pluginsEnabled">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<item>
<property name="text">
- <string>Autoload plugins</string>
+ <string>Autoload Plugins</string>
</property>
</item>
<item>
<property name="text">
- <string>Manually load plugins</string>
+ <string>Manually Load Plugins</string>
</property>
</item>
<item>
<property name="text">
- <string>Never load plugins</string>
+ <string>Never Load Plugins</string>
</property>
</item>
</widget>