As a follow up of refs #217, moved FSX settings into GUI component

This commit is contained in:
Klaus Basan
2014-04-28 19:07:35 +02:00
parent 9e5666e0e2
commit 72843fac90
7 changed files with 398 additions and 266 deletions

View File

@@ -461,7 +461,7 @@ QStatusBar QLabel {
<enum>QFrame::NoFrame</enum>
</property>
<property name="currentIndex">
<number>4</number>
<number>7</number>
</property>
<widget class="QWidget" name="pg_StatusPage">
<property name="sizePolicy">
@@ -571,8 +571,8 @@ QStatusBar QLabel {
<rect>
<x>0</x>
<y>0</y>
<width>326</width>
<height>267</height>
<width>86</width>
<height>59</height>
</rect>
</property>
<attribute name="label">
@@ -1801,9 +1801,9 @@ QStatusBar QLabel {
<number>0</number>
</property>
<item>
<widget class="QTabWidget" name="Simulator">
<widget class="QTabWidget" name="tw_Settings">
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="tb_SettingsTrafficNetwork">
<attribute name="title">
@@ -2292,119 +2292,20 @@ QStatusBar QLabel {
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsSimulator">
<widget class="QWidget" name="tb_SettingsSimulatorFsx">
<attribute name="title">
<string>Simulator</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QFormLayout" name="fl_SettingsSimulator">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<widget class="BlackGui::CSettingsFsxComponent" name="comp_SettingsSimulatorFsx">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbl_SettingsSimulatorFsxAddress">
<property name="text">
<string>FSX address</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="le_SettingsSimulatorFsxAddress">
<property name="text">
<string>127.0.0.1</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsSimulatorFsxPort">
<property name="text">
<string>FSX port</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="le_SettingsSimulatorFsxPort">
<property name="text">
<string>500</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="hl_SettingsSimulatorSimconnectCfgButtons">
<item>
<widget class="QPushButton" name="pb_SettingsSimulatorFsxOpenSimconnectCfg">
<property name="text">
<string>Open</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsSimulatorFsxDeleteSimconnectCfg">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsSimulatorFsxSaveSimconnectCfg">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsSimulatorFsxTestConnection">
<property name="text">
<string>Test connection</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsSimulatorFsxExistsSimconncetCfg">
<property name="text">
<string>&quot;simconnect.cfg&quot; exists?</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="wi_SettingsSimulatorFsxExistsSimconncetCfg" native="true">
<layout class="QHBoxLayout" name="hl_SettingsSimulatorFsxExistsSimconncetCfg">
<property name="spacing">
<number>4</number>
</property>
<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_SettingsSimulatorFsxExistsSimconncetCfg">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsSimulatorFsxExistsSimconncetCfg">
<property name="text">
<string>Check</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
@@ -3302,6 +3203,12 @@ QStatusBar QLabel {
<header>blackgui/flightplancomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CSettingsFsxComponent</class>
<extends>QFrame</extends>
<header>blackgui/settingsfsxcomponent.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>cb_StatusWithDBus</tabstop>
@@ -3343,7 +3250,7 @@ QStatusBar QLabel {
<tabstop>te_TextMessagesUnicom</tabstop>
<tabstop>te_TextMessagesCOM1</tabstop>
<tabstop>te_TextMessagesCOM2</tabstop>
<tabstop>Simulator</tabstop>
<tabstop>tw_Settings</tabstop>
<tabstop>tvp_SettingsTnServers</tabstop>
<tabstop>le_SettingsTnCsName</tabstop>
<tabstop>le_SettingsTnCsDescription</tabstop>