refs #740, GUI settings in own component

* used in client/mapping tool
* reset font possible
This commit is contained in:
Klaus Basan
2016-08-22 15:31:52 +02:00
committed by Mathew Sutcliffe
parent 6037ce85ed
commit 4e381a048f
12 changed files with 589 additions and 378 deletions

View File

@@ -20,7 +20,7 @@
<string>Settings</string>
</property>
<property name="currentIndex">
<number>0</number>
<number>6</number>
</property>
<widget class="QWidget" name="tb_SettingsTrafficNetworkServers">
<attribute name="title">
@@ -281,222 +281,7 @@
</property>
<item>
<layout class="QFormLayout" name="fl_SettingsGui">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="gb_GuiGeneral">
<property name="title">
<string>General</string>
</property>
<layout class="QFormLayout" name="fl_GuiGeneral">
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsGuiOpacity">
<property name="text">
<string>Opacity (0-100%)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSlider" name="hs_SettingsGuiOpacity">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cb_SettingsGuiWidgetStyle"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsGuiWidgetStyle">
<property name="text">
<string>Widget Style</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="gb_Font">
<property name="title">
<string>Font</string>
</property>
<layout class="QFormLayout" name="fl_GuiFont">
<item row="0" column="0">
<widget class="QLabel" name="lbl_SettingsGuiFont">
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QFontComboBox" name="cb_SettingsGuiFont">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<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">
<size>
<width>150</width>
<height>16777215</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="2" column="1">
<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="3" column="0">
<widget class="QLabel" name="lbl_SettingsGuiFontColor">
<property name="text">
<string>Font color</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QWidget" name="wi_FontColor" native="true">
<layout class="QHBoxLayout" name="hl_FontColor">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="le_SettingsGuiFontColor">
<property name="maxLength">
<number>200</number>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="tb_SettingsGuiFontColor">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="gb_ViewRefreshTimes">
<property name="title">
<string>View refresh times</string>
@@ -628,7 +413,7 @@
<zorder>hs_SettingsGuiAircraftRefreshTime</zorder>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QWidget" name="qw_SettingsGuiFont" native="true">
<layout class="QHBoxLayout" name="hl_SettingsGuiFontColor">
<property name="spacing">
@@ -649,6 +434,16 @@
</layout>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="BlackGui::Components::CSettingsGuiComponent" name="comp_SettingsGuiGeneral">
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
</layout>
@@ -716,6 +511,18 @@
</widget>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CSettingsSimulatorBasicsComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/settingssimulatorbasicscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CSettingsGuiComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/settingsguicomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CAudioSetupComponent</class>
<extends>QFrame</extends>
@@ -752,12 +559,6 @@
<header>blackgui/components/settingshotkeycomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CSettingsSimulatorBasicsComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/settingssimulatorbasicscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CSettingsSimulatorMessagesComponent</class>
<extends>QFrame</extends>