summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/appearancewidget.cpp2
-rw-r--r--src/settings/settings_appearance.ui118
2 files changed, 55 insertions, 65 deletions
diff --git a/src/settings/appearancewidget.cpp b/src/settings/appearancewidget.cpp
index be3c2980..875b67d2 100644
--- a/src/settings/appearancewidget.cpp
+++ b/src/settings/appearancewidget.cpp
@@ -35,7 +35,7 @@ AppearanceWidget::AppearanceWidget(QWidget *parent)
{
setupUi(this);
- kcfg_fixedFont->setOnlyFixed(true);
+// kcfg_fixedFont->setOnlyFixed(true);
}
diff --git a/src/settings/settings_appearance.ui b/src/settings/settings_appearance.ui
index aff6bfbe..b564033c 100644
--- a/src/settings/settings_appearance.ui
+++ b/src/settings/settings_appearance.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>569</width>
- <height>484</height>
+ <width>454</width>
+ <height>371</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +19,7 @@
<property name="title">
<string>Fonts</string>
</property>
- <layout class="QFormLayout" name="formLayout">
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
@@ -43,14 +43,7 @@
</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>
+ <widget class="KFontRequester" name="kcfg_standardFont"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
@@ -75,26 +68,10 @@
</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>
+ <widget class="KFontRequester" name="kcfg_fixedFont"/>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Dimension</string>
- </property>
- <layout class="QFormLayout" name="formLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="label_3">
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -108,52 +85,65 @@
</size>
</property>
<property name="text">
- <string>Font size:</string>
+ <string>Minimal 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>
+ <item row="6" column="1">
+ <widget class="KIntNumInput" name="kcfg_minFontSize"/>
+ </item>
+ <item row="2" column="1">
+ <widget class="KFontRequester" name="kcfg_serifFont"/>
+ </item>
+ <item row="3" column="1">
+ <widget class="KFontRequester" name="kcfg_sansSerifFont"/>
+ </item>
+ <item row="4" column="1">
+ <widget class="KFontRequester" name="kcfg_cursiveFont"/>
+ </item>
+ <item row="5" column="1">
+ <widget class="KFontRequester" name="kcfg_fantasyFont"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Serif font:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</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>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Sans Serif font:</string>
</property>
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>0</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_7">
<property name="text">
- <string>Minimal font size:</string>
+ <string>Cursive font:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <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>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Fantasy font:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -233,14 +223,14 @@
<header>kurlrequester.h</header>
</customwidget>
<customwidget>
- <class>KFontComboBox</class>
- <extends>KComboBox</extends>
- <header>kfontcombobox.h</header>
+ <class>KFontRequester</class>
+ <extends>QWidget</extends>
+ <header>kfontrequester.h</header>
</customwidget>
<customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
+ <class>KIntNumInput</class>
+ <extends>QWidget</extends>
+ <header>knuminput.h</header>
</customwidget>
</customwidgets>
<resources/>