flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-25 10:15:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #927, streamlined audio/audio setup component

Browse Source
This commit is contained in:
Klaus Basan
2017-04-02 20:24:36 +02:00
committed by Mathew Sutcliffe
parent 05761b6e07
commit 81caa32003
4 changed files with 173 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/blackgui/components/audiocomponent.ui
View File

@@ -2,26 +2,9 @@
<ui version="4.0"> <ui version="4.0">
<class>CAudioComponent</class> <class>CAudioComponent</class>
<widget class="QFrame" name="CAudioComponent"> <widget class="QFrame" name="CAudioComponent">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Audio</string> <string>Audio</string>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="vl_AudioComponent"> <layout class="QVBoxLayout" name="vl_AudioComponent">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
@@ -40,12 +23,6 @@
</property> </property>
<item> <item>
<widget class="QScrollArea" name="sa_AudioComponent"> <widget class="QScrollArea" name="sa_AudioComponent">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
@@ -54,8 +31,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>398</width> <width>68</width>
<height>298</height> <height>68</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="vl_ScrollAreaInner"> <layout class="QVBoxLayout" name="vl_ScrollAreaInner">
@@ -79,11 +56,8 @@
</property> </property>
<item> <item>
<widget class="QFrame" name="fr_AudioComponentInner"> <widget class="QFrame" name="fr_AudioComponentInner">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QVBoxLayout" name="vl_AudioComponentInner"> <layout class="QVBoxLayout" name="vl_AudioComponentInner">
<property name="spacing"> <property name="spacing">
@@ -105,14 +79,7 @@
<widget class="BlackGui::Components::CAudioVolumeComponent" name="comp_AudioVolume"/> <widget class="BlackGui::Components::CAudioVolumeComponent" name="comp_AudioVolume"/>
</item> </item>
<item> <item>
<widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup"> <widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup"/>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

38
src/blackgui/components/audiosetupcomponent.ui
View File

@@ -35,22 +35,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item>
<widget class="QWidget" name="wi_ExtraInfo" native="true">
<layout class="QVBoxLayout" name="vl_ExtraInfo">
<item>
<widget class="QLabel" name="lbl_ExtraInfo">
<property name="text">
<string>Extra info goes here</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<layout class="QFormLayout" name="fl_SetupAudio"> <layout class="QFormLayout" name="fl_SetupAudio">
<property name="sizeConstraint"> <property name="sizeConstraint">
@@ -71,14 +55,14 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item row="0" column="0"> <item row="1" column="0">
<widget class="QLabel" name="lbl_SetupAudioInputDevice"> <widget class="QLabel" name="lbl_SetupAudioInputDevice">
<property name="text"> <property name="text">
<string>In</string> <string>In</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="cb_SetupAudioInputDevice"> <widget class="QComboBox" name="cb_SetupAudioInputDevice">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -100,14 +84,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lbl_SetupAudioOutputDevice"> <widget class="QLabel" name="lbl_SetupAudioOutputDevice">
<property name="text"> <property name="text">
<string>Out</string> <string>Out</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="cb_SetupAudioOutputDevice"> <widget class="QComboBox" name="cb_SetupAudioOutputDevice">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -126,20 +110,30 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="lbl_SetupAudioLoopback"> <widget class="QLabel" name="lbl_SetupAudioLoopback">
<property name="text"> <property name="text">
<string>Test</string> <string>Test</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="1">
<widget class="QCheckBox" name="cb_SetupAudioLoopback"> <widget class="QCheckBox" name="cb_SetupAudioLoopback">
<property name="text"> <property name="text">
<string>Loopback, test sound in- to output</string> <string>Loopback, test sound in- to output</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="lbl_ExtraInfo">
<property name="text">
<string>Extra info goes here</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>

180
src/blackgui/components/audiovolumecomponent.ui
View File

@@ -2,65 +2,23 @@
<ui version="4.0"> <ui version="4.0">
<class>CAudioVolumeComponent</class> <class>CAudioVolumeComponent</class>
<widget class="QFrame" name="CAudioVolumeComponent"> <widget class="QFrame" name="CAudioVolumeComponent">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>275</width>
<height>58</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Frame</string> <string>Frame</string>
</property> </property>
<property name="frameShape"> <layout class="QGridLayout" name="gl_AudioVolumeComponent">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="vl_AudioVolume">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>2</number>
</property> </property>
<item> <item row="1" column="1" colspan="6">
<layout class="QGridLayout" name="gl_Sound">
<property name="horizontalSpacing">
<number>10</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbl_AudioSound">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Sound:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_Volume">
<property name="text">
<string>Volume</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="hs_Volume"> <widget class="QSlider" name="hs_Volume">
<property name="maximum"> <property name="maximum">
<number>140</number> <number>140</number>
@@ -88,14 +46,48 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="7">
<widget class="QWidget" name="wi_AudioSoundButtons" native="true"> <widget class="QLabel" name="lbl_ContextLocation">
<property name="text">
<string>local</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_AudioSound">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text">
<string>Sound</string>
</property>
</widget>
</item>
<item row="1" column="7">
<widget class="QSpinBox" name="sb_Volume">
<property name="maximum">
<number>300</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="value">
<number>90</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_Volume">
<property name="text">
<string>Volume</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QWidget" name="wi_AudioSoundButtons" native="true">
<layout class="QHBoxLayout" name="hl_AudioSoundButtons"> <layout class="QHBoxLayout" name="hl_AudioSoundButtons">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
@@ -113,7 +105,27 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="pb_Mute"> <widget class="QToolButton" name="pb_ShowWinMixer">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Windows sound mixer</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/diagona/icons/diagona/icons/speaker--pencil.png</normaloff>:/diagona/icons/diagona/icons/speaker--pencil.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="pb_Mute">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -140,27 +152,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_ShowWinMixer"> <widget class="QToolButton" name="pb_Volume100">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Windows sound mixer</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/diagona/icons/diagona/icons/speaker--pencil.png</normaloff>:/diagona/icons/diagona/icons/speaker--pencil.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_Volume100">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -178,51 +170,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="BlackGui::CLevelMeter" name="wip_LevelMeter" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="lbl_ContextLocation">
<property name="text">
<string>local</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="sb_Volume">
<property name="maximum">
<number>300</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="value">
<number>90</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::CLevelMeter</class>
<extends>QWidget</extends>
<header>blackgui/levelmeter.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources> <resources>
<include location="../../blackmisc/blackmisc.qrc"/> <include location="../../blackmisc/blackmisc.qrc"/>
</resources> </resources>

5
src/blackgui/share/qss/swiftstdgui.qss
View File

@@ -111,11 +111,6 @@ QAbstractScrollArea #pg_StatusPageCons ole { background-color: black; }
background-color: black; background-color: black;
} }
/* volume buttons */
#wi_AudioSoundButtons QPushButton {
background-color: transparent;
}
/* COM panel */ /* COM panel */
#wip_CockpitComPanelShowHideBar QPushButton { #wip_CockpitComPanelShowHideBar QPushButton {
background-color: transparent; background-color: transparent;