From 81caa32003d45fb25bf5fb7cb7671cc27a29abc9 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 2 Apr 2017 20:24:36 +0200
Subject: [PATCH] refs #927, streamlined audio/audio setup component

---
 src/blackgui/components/audiocomponent.ui     |  41 +-
 .../components/audiosetupcomponent.ui         |  38 +-
 .../components/audiovolumecomponent.ui        | 354 ++++++++----------
 src/blackgui/share/qss/swiftstdgui.qss        |   5 -
 4 files changed, 173 insertions(+), 265 deletions(-)

diff --git a/src/blackgui/components/audiocomponent.ui b/src/blackgui/components/audiocomponent.ui
index b6cc2aa56..70bd2e463 100644
--- a/src/blackgui/components/audiocomponent.ui
+++ b/src/blackgui/components/audiocomponent.ui
@@ -2,26 +2,9 @@
 <ui version="4.0">
  <class>CAudioComponent</class>
  <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">
    <string>Audio</string>
   </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">
    <property name="spacing">
     <number>0</number>
@@ -40,12 +23,6 @@
    </property>
    <item>
     <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">
       <bool>true</bool>
      </property>
@@ -54,8 +31,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>398</width>
-        <height>298</height>
+        <width>68</width>
+        <height>68</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="vl_ScrollAreaInner">
@@ -79,11 +56,8 @@
        </property>
        <item>
         <widget class="QFrame" name="fr_AudioComponentInner">
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Plain</enum>
          </property>
          <layout class="QVBoxLayout" name="vl_AudioComponentInner">
           <property name="spacing">
@@ -105,14 +79,7 @@
            <widget class="BlackGui::Components::CAudioVolumeComponent" name="comp_AudioVolume"/>
           </item>
           <item>
-           <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>
+           <widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup"/>
           </item>
          </layout>
         </widget>
diff --git a/src/blackgui/components/audiosetupcomponent.ui b/src/blackgui/components/audiosetupcomponent.ui
index 62c06d293..73730b23b 100644
--- a/src/blackgui/components/audiosetupcomponent.ui
+++ b/src/blackgui/components/audiosetupcomponent.ui
@@ -35,22 +35,6 @@
    <property name="bottomMargin">
     <number>2</number>
    </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>
     <layout class="QFormLayout" name="fl_SetupAudio">
      <property name="sizeConstraint">
@@ -71,14 +55,14 @@
      <property name="bottomMargin">
       <number>2</number>
      </property>
-     <item row="0" column="0">
+     <item row="1" column="0">
       <widget class="QLabel" name="lbl_SetupAudioInputDevice">
        <property name="text">
         <string>In</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item row="1" column="1">
       <widget class="QComboBox" name="cb_SetupAudioInputDevice">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -100,14 +84,14 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="lbl_SetupAudioOutputDevice">
        <property name="text">
         <string>Out</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="2" column="1">
       <widget class="QComboBox" name="cb_SetupAudioOutputDevice">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -126,20 +110,30 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="lbl_SetupAudioLoopback">
        <property name="text">
         <string>Test</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QCheckBox" name="cb_SetupAudioLoopback">
        <property name="text">
         <string>Loopback, test sound in- to output</string>
        </property>
       </widget>
      </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>
    </item>
    <item>
diff --git a/src/blackgui/components/audiovolumecomponent.ui b/src/blackgui/components/audiovolumecomponent.ui
index 2705ba128..c8d35067d 100644
--- a/src/blackgui/components/audiovolumecomponent.ui
+++ b/src/blackgui/components/audiovolumecomponent.ui
@@ -2,227 +2,179 @@
 <ui version="4.0">
  <class>CAudioVolumeComponent</class>
  <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">
    <string>Frame</string>
   </property>
-  <property name="frameShape">
-   <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>
+  <layout class="QGridLayout" name="gl_AudioVolumeComponent">
    <property name="leftMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
-   <item>
-    <layout class="QGridLayout" name="gl_Sound">
-     <property name="horizontalSpacing">
-      <number>10</number>
+   <item row="1" column="1" colspan="6">
+    <widget class="QSlider" name="hs_Volume">
+     <property name="maximum">
+      <number>140</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">
-       <property name="maximum">
-        <number>140</number>
-       </property>
-       <property name="singleStep">
-        <number>5</number>
-       </property>
-       <property name="pageStep">
-        <number>20</number>
-       </property>
-       <property name="value">
-        <number>90</number>
-       </property>
-       <property name="sliderPosition">
-        <number>90</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="tickPosition">
-        <enum>QSlider::TicksAbove</enum>
-       </property>
-       <property name="tickInterval">
-        <number>100</number>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QWidget" name="wi_AudioSoundButtons" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <layout class="QHBoxLayout" name="hl_AudioSoundButtons">
-        <property name="spacing">
-         <number>0</number>
+     <property name="singleStep">
+      <number>5</number>
+     </property>
+     <property name="pageStep">
+      <number>20</number>
+     </property>
+     <property name="value">
+      <number>90</number>
+     </property>
+     <property name="sliderPosition">
+      <number>90</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="tickPosition">
+      <enum>QSlider::TicksAbove</enum>
+     </property>
+     <property name="tickInterval">
+      <number>100</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="7">
+    <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">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </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">
+      <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>
+       <widget class="QToolButton" name="pb_ShowWinMixer">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="leftMargin">
-         <number>0</number>
+        <property name="toolTip">
+         <string>Windows sound mixer</string>
         </property>
-        <property name="topMargin">
-         <number>0</number>
+        <property name="text">
+         <string/>
         </property>
-        <property name="rightMargin">
-         <number>0</number>
+        <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>
-        <property name="bottomMargin">
-         <number>0</number>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="pb_Mute">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <item>
-         <widget class="QPushButton" name="pb_Mute">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Toggle mute</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../../blackmisc/blackmisc.qrc">
-            <normaloff>:/diagona/icons/diagona/icons/speaker-volume.png</normaloff>
-            <normalon>:/diagona/icons/diagona/icons/speaker-volume-control-mute.png</normalon>:/diagona/icons/diagona/icons/speaker-volume.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" 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="QPushButton" name="pb_Volume100">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>40</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>100%</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <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>
-        </item>
-       </layout>
-      </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>
+        <property name="toolTip">
+         <string>Toggle mute</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../../blackmisc/blackmisc.qrc">
+          <normaloff>:/diagona/icons/diagona/icons/speaker-volume.png</normaloff>
+          <normalon>:/diagona/icons/diagona/icons/speaker-volume-control-mute.png</normalon>:/diagona/icons/diagona/icons/speaker-volume.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="pb_Volume100">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>40</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>100%</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>BlackGui::CLevelMeter</class>
-   <extends>QWidget</extends>
-   <header>blackgui/levelmeter.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="../../blackmisc/blackmisc.qrc"/>
  </resources>
diff --git a/src/blackgui/share/qss/swiftstdgui.qss b/src/blackgui/share/qss/swiftstdgui.qss
index a0d3d6cb1..a3231ea0a 100644
--- a/src/blackgui/share/qss/swiftstdgui.qss
+++ b/src/blackgui/share/qss/swiftstdgui.qss
@@ -111,11 +111,6 @@ QAbstractScrollArea #pg_StatusPageCons	ole  { background-color: black; }
   background-color: black;
 }
 
-/* volume buttons */
-#wi_AudioSoundButtons QPushButton {
-  background-color: transparent;
-}
-
 /* COM panel */
 #wip_CockpitComPanelShowHideBar QPushButton {
   background-color: transparent;