summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-11 10:54:59 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-11 10:54:59 +0200
commita519dd47a8feb584ade9dbec7809d97748f8df45 (patch)
tree7bde086efb0eea66c27c8e88317747b8357b80ad
parentThis commit implements another dockwidget for rekonq, containing a (diff)
parentRight align all labels to confirm to the KDE4 HIG. (diff)
downloadrekonq-a519dd47a8feb584ade9dbec7809d97748f8df45.tar.xz
Merge commit 'refs/merge-requests/2255' of git://gitorious.org/rekonq/mainline into m2255
-rw-r--r--src/settings/settings_fonts.ui178
-rw-r--r--src/settings/settings_general.ui47
-rw-r--r--src/settings/settings_tabs.ui36
-rw-r--r--src/settings/settings_webkit.ui36
4 files changed, 185 insertions, 112 deletions
diff --git a/src/settings/settings_fonts.ui b/src/settings/settings_fonts.ui
index 3f9aa9ef..52c7872e 100644
--- a/src/settings/settings_fonts.ui
+++ b/src/settings/settings_fonts.ui
@@ -19,30 +19,70 @@
<property name="title">
<string>Fonts</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Standard font:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Fixed font:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="KFontComboBox" name="kcfg_fixedFont"/>
- </item>
- <item row="0" column="1">
- <widget class="KFontComboBox" name="kcfg_standardFont"/>
- </item>
- </layout>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Standard font:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="KFontComboBox" name="kcfg_standardFont">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Fixed font:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KFontComboBox" name="kcfg_fixedFont">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
</item>
</layout>
</widget>
@@ -52,34 +92,70 @@
<property name="title">
<string>Dimension</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Font size:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="kcfg_fontSize"/>
- </item>
- </layout>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Font size:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="kcfg_fontSize">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Minimal font size:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout2">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Minimal font size:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="kcfg_minFontSize"/>
- </item>
- </layout>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="kcfg_minFontSize">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
</item>
</layout>
</widget>
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index eaa91859..ccc3fa20 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -19,8 +19,8 @@
<property name="title">
<string>Startup</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -30,13 +30,7 @@
</property>
<property name="minimumSize">
<size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="baseSize">
- <size>
- <width>0</width>
+ <width>150</width>
<height>0</height>
</size>
</property>
@@ -46,9 +40,12 @@
<property name="text">
<string>When starting rekonq:</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="KComboBox" name="kcfg_startupBehaviour">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -81,7 +78,7 @@
<property name="title">
<string>Home Page</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
@@ -92,19 +89,16 @@
</property>
<property name="minimumSize">
<size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="baseSize">
- <size>
- <width>120</width>
+ <width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Home page URL:</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
<item row="0" column="1">
@@ -152,8 +146,8 @@
<property name="title">
<string>Search Engine</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
+ <layout class="QFormLayout" name="formLayout_3">
+ <item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -163,13 +157,7 @@
</property>
<property name="minimumSize">
<size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="baseSize">
- <size>
- <width>0</width>
+ <width>150</width>
<height>0</height>
</size>
</property>
@@ -179,9 +167,12 @@
<property name="text">
<string>Default search engine:</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="KComboBox" name="kcfg_searchEngine">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index 45579e90..8bc3ae70 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -19,30 +19,21 @@
<property name="title">
<string>New Tabs Behaviour</string>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
+ <layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="minimumSize">
<size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="baseSize">
- <size>
- <width>120</width>
+ <width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>New tab opens:</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
<item row="0" column="1">
@@ -75,27 +66,18 @@
</item>
<item row="1" 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>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="baseSize">
- <size>
- <width>120</width>
+ <width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>New tab page starts with:</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
<item row="1" column="1">
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index 55f34ab3..e87e3fec 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -137,8 +137,8 @@
<property name="title">
<string>Plugin Settings</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="enabled">
<bool>true</bool>
@@ -149,13 +149,28 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="text">
<string>When loading web pages:</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="KComboBox" name="kcfg_pluginsEnabled">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<item>
<property name="text">
<string>Autoload Plugins</string>
@@ -181,15 +196,24 @@
<property name="title">
<string>User Style Sheet</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
<widget class="QLabel" name="label">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="text">
<string>User CSS path:</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="KUrlRequester" name="kcfg_userCSS">
<property name="filter">
<string>*.css</string>