refs #335, made audio setup a component so it can be used in settings and cockpit

This commit is contained in:
Klaus Basan
2014-10-17 15:40:59 +02:00
committed by Roland Winklmeier
parent ccf308eda1
commit 73eee7af1e
7 changed files with 432 additions and 247 deletions

View File

@@ -372,7 +372,7 @@
<number>0</number>
</property>
<item>
<widget class="BlackGui::Components::CAudioSetup" name="comp_AudioSetup">
<widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@@ -468,9 +468,12 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsGuiAircraftRefreshTime">
<property name="text">
<property name="toolTip">
<string>Aircraft refresh time (5-30s)</string>
</property>
<property name="text">
<string>Aircraft rt (5-30s)</string>
</property>
</widget>
</item>
<item row="1" column="1">
@@ -506,9 +509,12 @@
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsGuiAtcRefreshTime">
<property name="text">
<property name="toolTip">
<string>ATC refresh time (5-30s)</string>
</property>
<property name="text">
<string>ATC rt (5-30s)</string>
</property>
</widget>
</item>
<item row="2" column="1">
@@ -541,9 +547,12 @@
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsGuiUserRefreshTime">
<property name="text">
<property name="toolTip">
<string>User refresh time (5-30s)</string>
</property>
<property name="text">
<string>User rt (5-30s)</string>
</property>
</widget>
</item>
<item row="3" column="1">
@@ -589,6 +598,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<item row="5" column="0">
@@ -792,6 +804,12 @@
</widget>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CAudioSetupComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/audiosetupcomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Views::CKeyboardKeyView</class>
<extends>QTableView</extends>
@@ -808,12 +826,6 @@
<header>blackgui/components/settingssimulatorcomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CAudioSetup</class>
<extends>QFrame</extends>
<header>blackgui/components/audiosetup.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>