Ref T30, using font settings in GUI component

This commit is contained in:
Klaus Basan
2017-07-05 02:39:02 +02:00
committed by Mathew Sutcliffe
parent bf573f0f20
commit be3c8b0bdd
3 changed files with 18 additions and 217 deletions

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>209</width>
<height>236</height>
<width>204</width>
<height>235</height>
</rect>
</property>
<property name="windowTitle">
@@ -37,7 +37,7 @@
<property name="title">
<string>Font</string>
</property>
<layout class="QGridLayout" name="gl_SettingsGuiComponent">
<layout class="QVBoxLayout" name="vl_FontSettings">
<property name="leftMargin">
<number>3</number>
</property>
@@ -50,155 +50,14 @@
<property name="bottomMargin">
<number>3</number>
</property>
<property name="spacing">
<number>4</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsGuiFontSize">
<property name="text">
<string>Font size (pt)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cb_SettingsGuiFontSize">
<property name="maximumSize">
<item>
<widget class="BlackGui::Components::CSettingsFontComponent" name="comp_SettingsFonts">
<property name="minimumSize">
<size>
<width>150</width>
<height>16777215</height>
<width>0</width>
<height>100</height>
</size>
</property>
<item>
<property name="text">
<string>6</string>
</property>
</item>
<item>
<property name="text">
<string>7</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
<item>
<property name="text">
<string>9</string>
</property>
</item>
<item>
<property name="text">
<string>10</string>
</property>
</item>
<item>
<property name="text">
<string>11</string>
</property>
</item>
<item>
<property name="text">
<string>12</string>
</property>
</item>
<item>
<property name="text">
<string>14</string>
</property>
</item>
<item>
<property name="text">
<string>16</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsGuiFontStyle">
<property name="text">
<string>Font style</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsGuiFontColor">
<property name="text">
<string>Font color</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_SettingsGuiFont">
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QToolButton" name="tb_SettingsGuiFontColor">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="le_SettingsGuiFontColor">
<property name="maxLength">
<number>200</number>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QFontComboBox" name="cb_SettingsGuiFont">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="cb_SettingsGuiFontStyle">
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>normal</string>
</property>
</item>
<item>
<property name="text">
<string>bold</string>
</property>
</item>
<item>
<property name="text">
<string>italic</string>
</property>
</item>
<item>
<property name="text">
<string>bold italic</string>
</property>
</item>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="tb_ResetFont">
<property name="toolTip">
<string>reset font attributes</string>
</property>
<property name="icon">
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/pastel/icons/pastel/16/cancel.png</normaloff>:/pastel/icons/pastel/16/cancel.png</iconset>
</property>
</widget>
</item>
</layout>
@@ -320,8 +179,14 @@
</item>
</layout>
</widget>
<resources>
<include location="../../blackmisc/blackmisc.qrc"/>
</resources>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CSettingsFontComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/settingsfontcomponent.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>