refs #273, encapsulated settings GUI into own component

This removed a considerable amount of code from mainwindow
This commit is contained in:
Klaus Basan
2014-06-25 19:23:31 +02:00
parent 42db1fe9ae
commit 6c6bcb4e08
10 changed files with 1363 additions and 1194 deletions

View File

@@ -571,7 +571,7 @@ QStatusBar QLabel {
<rect>
<x>0</x>
<y>0</y>
<width>90</width>
<width>86</width>
<height>59</height>
</rect>
</property>
@@ -857,724 +857,10 @@ QStatusBar QLabel {
<number>0</number>
</property>
<item>
<widget class="QTabWidget" name="tw_Settings">
<widget class="BlackGui::CSettingsComponent" name="comp_Settings">
<property name="currentIndex">
<number>1</number>
<number>-1</number>
</property>
<widget class="QWidget" name="tb_SettingsTrafficNetwork">
<attribute name="title">
<string>Traffic Network</string>
</attribute>
<layout class="QVBoxLayout" name="vl_SettingsTrafficNetwork">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<widget class="BlackGui::CServerView" name="tvp_SettingsTnServers">
<property name="editTriggers">
<set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
<item>
<layout class="QFormLayout" name="fl_SettingsTnCurrentServer">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbl_SettingsTnCsName">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="le_SettingsTnCsName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsTnCsDescription">
<property name="text">
<string>Description</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="le_SettingsTnCsDescription"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsTnCsAddress">
<property name="text">
<string>Address</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="le_SettingsTnCsAddress"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsTnCsPort">
<property name="text">
<string>Port</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="le_SettingsTnCsPort">
<property name="maxLength">
<number>5</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_SettingsTnCsRealName">
<property name="text">
<string>Real name</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="le_SettingsTnCsRealName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_SettingsTnCsNetworkId">
<property name="text">
<string>Id:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="le_SettingsTnCsNetworkId">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="lbl_SettingsTnCsPassword">
<property name="text">
<string>Password</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="le_SettingsTnCsPassword">
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>32</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="fr_SettingsTnButtons">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="hl_SettingsBottomBar">
<property name="topMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QPushButton" name="pb_SettingsTnSaveServer">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsTnRemoveServer">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsTnCurrentServer">
<property name="text">
<string>Current server</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsAircraft">
<attribute name="title">
<string>Aircraft</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QFormLayout" name="fl_SettingsAircraft">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbl_SettingsAircraftCallsign">
<property name="text">
<string>Callsign</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="le_SettingsAircraftCallsign">
<property name="inputMethodHints">
<set>Qt::ImhLatinOnly|Qt::ImhUppercaseOnly</set>
</property>
<property name="text">
<string>BLACK</string>
</property>
<property name="maxLength">
<number>20</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsIcaoAircraftDesignator">
<property name="text">
<string>ICAO type (e.g. A320)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="le_SettingsIcaoAircraftDesignator">
<property name="inputMethodHints">
<set>Qt::ImhUppercaseOnly</set>
</property>
<property name="text">
<string>C172</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsIcaoAirlineDesignator">
<property name="text">
<string>ICAO airline (e.g.DLH)</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="le_SettingsIcaoAirlineDesignator">
<property name="text">
<string>SGN</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsIcaoCombinedType">
<property name="text">
<string>Aircraft type (e.g. L2J)</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="le_SettingsIcaoCombinedType">
<property name="text">
<string>L1P</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_SettingsModes">
<property name="text">
<string>Login modes</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QGroupBox" name="gb_LoginModes">
<property name="title">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="rb_SetttingsNormalLoginMode">
<property name="text">
<string>Normal</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rb_SettingsLoginStealthMode">
<property name="text">
<string>Stealth mode</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rb_SettingsLoginObserver">
<property name="text">
<string>Observer</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsAudio">
<attribute name="title">
<string>Audio</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="leftMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<item>
<layout class="QFormLayout" name="fl_SettingsAudio">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbl_SettingsAudioInputDevice">
<property name="text">
<string>In</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cb_SettingsAudioInputDevice"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsAudioOutputDevice">
<property name="text">
<string>Out</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cb_SettingsAudioOutputDevice"/>
</item>
<item row="2" column="1">
<spacer name="vs_SettingsAudioVoiceTests">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsAudioVoiceTests">
<property name="text">
<string>Tests</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QWidget" name="wi_SettingsAudioTests" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</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>
<layout class="QHBoxLayout" name="hl_SettingsAudioTests">
<item>
<widget class="QPushButton" name="pb_SettingsAudioSquelchTest">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Start squelch test</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsAudioMicrophoneTest">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Start microphone test</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_SettingsAudioTestActionAndResult">
<property name="text">
<string>Result</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPlainTextEdit" name="pte_SettingsAudioTestActionAndResult">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>40</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QProgressBar" name="prb_SettingsAudioTestProgress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="6" column="1">
<spacer name="vs_SettingsAudioMisc">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="1">
<widget class="QCheckBox" name="cb_SettingsAudioPlayNotificationSounds">
<property name="text">
<string>play notification sounds</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="cb_SettingsAudioNotificationTextMessage">
<property name="text">
<string>notification for text messages</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="lbl_SettingsAudioNotificationSounds">
<property name="text">
<string>Notification sounds</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QCheckBox" name="cb_SettingsAudioNotificationVoiceRoom">
<property name="text">
<string>notification for join/leave voice room</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsSimulatorFsx">
<attribute name="title">
<string>Simulator</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="BlackGui::CSettingsFsxComponent" name="comp_SettingsSimulatorFsx">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsGui">
<attribute name="title">
<string>GUI</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QFormLayout" name="fl_SettingsGui">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbl_SettingsGuiOpacity">
<property name="text">
<string>Opacity (0-100%)</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSlider" name="hs_SettingsGuiOpacity">
<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="1" column="0">
<widget class="QLabel" name="lbl_SettingsGuiAircraftRefreshTime">
<property name="text">
<string>Aircraft refresh time (5-30s)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSlider" name="hs_SettingsGuiAircraftRefreshTime">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsGuiAtcRefreshTime">
<property name="text">
<string>ATC refresh time (5-30s)</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="hs_SettingsGuiAtcRefreshTime">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsGuiUserRefreshTime">
<property name="text">
<string>User refresh time (5-30s)</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSlider" name="hs_SettingsGuiUserRefreshTime">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsMisc">
<attribute name="title">
<string>Misc</string>
</attribute>
<layout class="QVBoxLayout" name="vl_SettingsMisc">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="BlackGui::CKeyboardKeyView" name="tvp_SettingsMiscHotkeys">
<property name="cornerButtonEnabled">
<bool>true</bool>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
<item>
<widget class="QFrame" name="fr_SettingsMisc">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pb_SettingsMiscSave">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsMiscRemove">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsMiscCancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
@@ -2241,28 +1527,12 @@ QStatusBar QLabel {
<extends>QTableView</extends>
<header>blackgui/statusmessageview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::CKeyboardKeyView</class>
<extends>QTableView</extends>
<header>blackgui/keyboardkeyview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::CServerView</class>
<extends>QTableView</extends>
<header>blackgui/serverview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::CFlightPlanComponent</class>
<extends>QTabWidget</extends>
<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>
<customwidget>
<class>BlackGui::CUserComponent</class>
<extends>QTabWidget</extends>
@@ -2293,6 +1563,12 @@ QStatusBar QLabel {
<header>blackgui/cockpitv1component.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CSettingsComponent</class>
<extends>QTabWidget</extends>
<header>blackgui/settingscomponent.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>cb_StatusWithDBus</tabstop>
@@ -2302,27 +1578,7 @@ QStatusBar QLabel {
<tabstop>le_CommandLineInput</tabstop>
<tabstop>comp_AtcStations</tabstop>
<tabstop>comp_TextMessages</tabstop>
<tabstop>tw_Settings</tabstop>
<tabstop>tvp_SettingsTnServers</tabstop>
<tabstop>le_SettingsTnCsName</tabstop>
<tabstop>le_SettingsTnCsDescription</tabstop>
<tabstop>le_SettingsTnCsAddress</tabstop>
<tabstop>le_SettingsTnCsPort</tabstop>
<tabstop>le_SettingsTnCsRealName</tabstop>
<tabstop>le_SettingsTnCsNetworkId</tabstop>
<tabstop>le_SettingsTnCsPassword</tabstop>
<tabstop>pb_SettingsTnSaveServer</tabstop>
<tabstop>pb_SettingsTnRemoveServer</tabstop>
<tabstop>pb_SettingsTnCurrentServer</tabstop>
<tabstop>le_SettingsAircraftCallsign</tabstop>
<tabstop>le_SettingsIcaoAircraftDesignator</tabstop>
<tabstop>le_SettingsIcaoAirlineDesignator</tabstop>
<tabstop>le_SettingsIcaoCombinedType</tabstop>
<tabstop>cb_SettingsAudioInputDevice</tabstop>
<tabstop>cb_SettingsAudioOutputDevice</tabstop>
<tabstop>hs_SettingsGuiOpacity</tabstop>
<tabstop>hs_SettingsGuiAircraftRefreshTime</tabstop>
<tabstop>hs_SettingsGuiAtcRefreshTime</tabstop>
<tabstop>comp_Settings</tabstop>
<tabstop>pb_MainConnect</tabstop>
<tabstop>pb_MainStatus</tabstop>
<tabstop>pb_MainWeather</tabstop>
@@ -2340,13 +1596,6 @@ QStatusBar QLabel {
<tabstop>pb_SoundMute</tabstop>
<tabstop>pb_SoundMaxVolume</tabstop>
<tabstop>te_StatusPageConsole</tabstop>
<tabstop>rb_SetttingsNormalLoginMode</tabstop>
<tabstop>rb_SettingsLoginStealthMode</tabstop>
<tabstop>rb_SettingsLoginObserver</tabstop>
<tabstop>pb_SettingsAudioSquelchTest</tabstop>
<tabstop>pb_SettingsAudioMicrophoneTest</tabstop>
<tabstop>pte_SettingsAudioTestActionAndResult</tabstop>
<tabstop>hs_SettingsGuiUserRefreshTime</tabstop>
</tabstops>
<resources>
<include location="../../src/blackgui/blackgui.qrc"/>