diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-11-29 18:00:16 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-12-03 22:14:44 +0100 |
| commit | 969cbd6b8e0e31807b340e3f5999ec6c7c2a6b98 (patch) | |
| tree | f64ccecaa8f63705586ee3997c86d5bc585f25a8 /src/settings | |
| parent | Fix typos (diff) | |
| download | rekonq-969cbd6b8e0e31807b340e3f5999ec6c7c2a6b98.tar.xz | |
Move "custom CSS path" from Appearance to Advanced settings
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/settings_advanced.ui | 60 | ||||
| -rw-r--r-- | src/settings/settings_appearance.ui | 46 |
2 files changed, 57 insertions, 49 deletions
diff --git a/src/settings/settings_advanced.ui b/src/settings/settings_advanced.ui index 2799f825..611636c6 100644 --- a/src/settings/settings_advanced.ui +++ b/src/settings/settings_advanced.ui @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>515</width> - <height>440</height> + <height>538</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QGroupBox" name="groupBox_2"> <property name="title"> @@ -19,6 +19,12 @@ <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QLabel" name="label"> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> <property name="text"> <string>Rekonq is using your system's proxy settings</string> </property> @@ -53,6 +59,47 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Custom Style Sheet</string> + </property> + <layout class="QFormLayout" name="formLayout_3"> + <property name="fieldGrowthPolicy"> + <enum>QFormLayout::ExpandingFieldsGrow</enum> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="label_5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>Path to custom CSS file:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="KUrlRequester" name="kcfg_userCSS"> + <property name="filter"> + <string>*.css</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> <string>Misc</string> @@ -150,13 +197,20 @@ <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>155</height> + <height>189</height> </size> </property> </spacer> </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>KUrlRequester</class> + <extends>QFrame</extends> + <header>kurlrequester.h</header> + </customwidget> + </customwidgets> <resources/> <connections/> </ui> diff --git a/src/settings/settings_appearance.ui b/src/settings/settings_appearance.ui index c9a02b0e..525881b5 100644 --- a/src/settings/settings_appearance.ui +++ b/src/settings/settings_appearance.ui @@ -271,47 +271,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> - <property name="title"> - <string>Custom Style Sheet</string> - </property> - <layout class="QFormLayout" name="formLayout_3"> - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="label_5"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="text"> - <string>Path to custom CSS file:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="KUrlRequester" name="kcfg_userCSS"> - <property name="filter"> - <string>*.css</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <spacer name="verticalSpacer_3"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -338,11 +297,6 @@ <header>kcombobox.h</header> </customwidget> <customwidget> - <class>KUrlRequester</class> - <extends>QFrame</extends> - <header>kurlrequester.h</header> - </customwidget> - <customwidget> <class>KIntNumInput</class> <extends>QWidget</extends> <header>knuminput.h</header> |