As a follow up of voice testing

* allow to directly go from ATC component to audio component (control volume) * reordered keypad a bit * audio setup, "private slots" -> "private"
2026-03-31 21:15:33 +08:00 · 2018-06-02 01:56:20 +02:00
parent 6fb620a8f6
commit c750ad1dfc
10 changed files with 241 additions and 221 deletions
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -59,6 +59,7 @@ namespace BlackGui
            CIdentifiable(this),
            ui(new Ui::CAtcStationComponent)
        {
+            Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui");
            ui->setupUi(this);
            this->setCurrentIndex(0);
            this->tabBar()->setExpanding(false);
@@ -82,6 +83,7 @@ namespace BlackGui
            // Signal / Slots
            connect(ui->le_AtcStationsOnlineMetar, &QLineEdit::returnPressed, this, &CAtcStationComponent::getMetarAsEntered);
            connect(ui->tb_AtcStationsLoadMetar, &QPushButton::clicked, this, &CAtcStationComponent::getMetarAsEntered);
+            connect(ui->pb_Audio, &QPushButton::clicked, this, &CAtcStationComponent::requestAudioWidget);
            connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::atcStationsTabChanged); // "local" tab changed (booked, online)
            connect(ui->tvp_AtcStationsOnline, &QTableView::clicked, this, &CAtcStationComponent::onlineAtcStationSelected);
            connect(ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::testCreateDummyOnlineAtcStations);
--- a/src/blackgui/components/atcstationcomponent.h
+++ b/src/blackgui/components/atcstationcomponent.h
@@ -74,6 +74,9 @@ namespace BlackGui
            //! Request a text message
            void requestTextMessageWidget(const BlackMisc::Aviation::CCallsign &callsign);

+            //! Request audio widget
+            void requestAudioWidget();
+
        private:
            //! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
            void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool added);
--- a/src/blackgui/components/atcstationcomponent.ui
+++ b/src/blackgui/components/atcstationcomponent.ui
@@ -95,20 +95,7 @@
         </property>
        </widget>
       </item>
-       <item row="0" column="5">
-        <widget class="BlackGui::Components::CSettingsAtcStationsInlineComponent" name="comp_AtcStationsSettings">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="focusPolicy">
-          <enum>Qt::StrongFocus</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="4">
+       <item row="0" column="6">
        <spacer name="hs_buttons">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -153,6 +140,26 @@
         </property>
        </widget>
       </item>
+       <item row="0" column="8">
+        <widget class="BlackGui::Components::CSettingsAtcStationsInlineComponent" name="comp_AtcStationsSettings">
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="4">
+        <widget class="QPushButton" name="pb_Audio">
+         <property name="text">
+          <string>audio</string>
+         </property>
+        </widget>
+       </item>
      </layout>
     </widget>
    </item>
@@ -290,10 +297,11 @@
  <tabstop>le_AtcStationsOnlineMetar</tabstop>
  <tabstop>tb_AtcStationsLoadMetar</tabstop>
  <tabstop>tb_AtcStationsAtisReload</tabstop>
+  <tabstop>pb_Audio</tabstop>
  <tabstop>comp_AtcStationsSettings</tabstop>
  <tabstop>te_AtcStationsOnlineInfo</tabstop>
-  <tabstop>tvp_AtcStationsBooked</tabstop>
  <tabstop>tvp_AtcStationsOnlineTree</tabstop>
+  <tabstop>tvp_AtcStationsBooked</tabstop>
 </tabstops>
 <resources/>
 <connections/>
--- a/src/blackgui/components/audiosetupcomponent.cpp
+++ b/src/blackgui/components/audiosetupcomponent.cpp
@@ -47,9 +47,9 @@ namespace BlackGui
            this->setEnabled(audio);
            ui->lbl_ExtraInfo->setText(audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change.");

-            bool c = connect(ui->tb_ExpandNotificationSounds, &QToolButton::toggled, this, &CAudioSetupComponent::ps_onToggleNotificationSoundsVisibility);
+            bool c = connect(ui->tb_ExpandNotificationSounds, &QToolButton::toggled, this, &CAudioSetupComponent::onToggleNotificationSoundsVisibility);
            Q_ASSERT(c);
-            c = connect(ui->cb_SetupAudioLoopback, &QCheckBox::toggled, this, &CAudioSetupComponent::ps_onLoopbackToggled);
+            c = connect(ui->cb_SetupAudioLoopback, &QCheckBox::toggled, this, &CAudioSetupComponent::onLoopbackToggled);
            Q_ASSERT(c);

            if (audio)
@@ -60,18 +60,18 @@ namespace BlackGui
                ui->cb_SetupAudioLoopback->setChecked(sGui->getIContextAudio()->isAudioLoopbackEnabled());

                // the connects depend on initAudioDeviceLists
-                c = connect(ui->cb_SetupAudioInputDevice,  static_cast<void (QComboBox::*)(int)> (&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::ps_audioDeviceSelected);
+                c = connect(ui->cb_SetupAudioInputDevice,  static_cast<void (QComboBox::*)(int)> (&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::onAudioDeviceSelected);
                Q_ASSERT(c);
-                c = connect(ui->cb_SetupAudioOutputDevice, static_cast<void (QComboBox::*)(int)> (&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::ps_audioDeviceSelected);
+                c = connect(ui->cb_SetupAudioOutputDevice, static_cast<void (QComboBox::*)(int)> (&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::onAudioDeviceSelected);
                Q_ASSERT(c);

                // context
-                c = connect(sGui->getIContextAudio(), &IContextAudio::changedAudioDevices, this, &CAudioSetupComponent::ps_onAudioDevicesChanged);
+                c = connect(sGui->getIContextAudio(), &IContextAudio::changedAudioDevices, this, &CAudioSetupComponent::onAudioDevicesChanged);
                Q_ASSERT(c);
-                c = connect(sGui->getIContextAudio(), &IContextAudio::changedSelectedAudioDevices, this, &CAudioSetupComponent::ps_onCurrentAudioDevicesChanged);
+                c = connect(sGui->getIContextAudio(), &IContextAudio::changedSelectedAudioDevices, this, &CAudioSetupComponent::onCurrentAudioDevicesChanged);
                Q_ASSERT(c);
            }
-            this->ps_reloadSettings();
+            this->reloadSettings();
            ui->tb_ExpandNotificationSounds->setChecked(false); // collapse
            Q_UNUSED(c);
        }
@@ -79,7 +79,7 @@ namespace BlackGui
        CAudioSetupComponent::~CAudioSetupComponent()
        { }

-        void CAudioSetupComponent::ps_reloadSettings()
+        void CAudioSetupComponent::reloadSettings()
        {
            CSettings as(m_audioSettings.getThreadLocal());
            ui->cb_SetupAudioPlayNotificationSounds->setChecked(true);
@@ -87,7 +87,7 @@ namespace BlackGui
            ui->cb_SetupAudioNotificationVoiceRoom->setChecked(as.getNotificationFlag(CNotificationSounds::NotificationVoiceRoomJoined));
        }

-        void CAudioSetupComponent::ps_onToggleNotificationSoundsVisibility(bool checked)
+        void CAudioSetupComponent::onToggleNotificationSoundsVisibility(bool checked)
        {
            ui->fr_NotificationSoundsInner->setVisible(checked);
        }
@@ -95,8 +95,8 @@ namespace BlackGui
        void CAudioSetupComponent::initAudioDeviceLists()
        {
            if (!this->hasAudio()) { return; }
-            this->ps_onAudioDevicesChanged(sGui->getIContextAudio()->getAudioDevices());
-            this->ps_onCurrentAudioDevicesChanged(sGui->getIContextAudio()->getCurrentAudioDevices());
+            this->onAudioDevicesChanged(sGui->getIContextAudio()->getAudioDevices());
+            this->onCurrentAudioDevicesChanged(sGui->getIContextAudio()->getCurrentAudioDevices());
        }

        bool CAudioSetupComponent::hasAudio() const
@@ -109,7 +109,7 @@ namespace BlackGui
            return ui->cb_SetupAudioPlayNotificationSounds->isChecked();
        }

-        void CAudioSetupComponent::ps_audioDeviceSelected(int index)
+        void CAudioSetupComponent::onAudioDeviceSelected(int index)
        {
            if (!sGui->getIContextAudio()) return;
            if (index < 0) { return; }
@@ -134,7 +134,7 @@ namespace BlackGui
            }
        }

-        void CAudioSetupComponent::ps_onCurrentAudioDevicesChanged(const CAudioDeviceInfoList &devices)
+        void CAudioSetupComponent::onCurrentAudioDevicesChanged(const CAudioDeviceInfoList &devices)
        {
            for (auto &device : devices)
            {
@@ -149,7 +149,7 @@ namespace BlackGui
            }
        }

-        void CAudioSetupComponent::ps_onAudioDevicesChanged(const CAudioDeviceInfoList &devices)
+        void CAudioSetupComponent::onAudioDevicesChanged(const CAudioDeviceInfoList &devices)
        {
            ui->cb_SetupAudioOutputDevice->clear();
            ui->cb_SetupAudioInputDevice->clear();
@@ -167,7 +167,7 @@ namespace BlackGui
            }
        }

-        void CAudioSetupComponent::ps_onLoopbackToggled(bool loopback)
+        void CAudioSetupComponent::onLoopbackToggled(bool loopback)
        {
            Q_ASSERT(sGui->getIContextAudio());
            if (sGui->getIContextAudio()->isAudioLoopbackEnabled() == loopback) { return; }
--- a/src/blackgui/components/audiosetupcomponent.h
+++ b/src/blackgui/components/audiosetupcomponent.h
@@ -43,27 +43,26 @@ namespace BlackGui
            //! Play notification sounds (at all)
            bool playNotificationSounds() const;

-        private slots:
+        private:
            //! Reload settings
-            void ps_reloadSettings();
+            void reloadSettings();

            //! Audio device selected
            //! \param index audio device index (COM1, COM2)
-            void ps_audioDeviceSelected(int index);
+            void onAudioDeviceSelected(int index);

            //! Current audio devices changed
-            void ps_onCurrentAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
+            void onCurrentAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);

            //! Audio devices changed
-            void ps_onAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
+            void onAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);

            //! Loopback toggled
-            void ps_onLoopbackToggled(bool loopback);
+            void onLoopbackToggled(bool loopback);

            //! Visibilty (show/hide buttons)
-            void ps_onToggleNotificationSoundsVisibility(bool checked);
+            void onToggleNotificationSoundsVisibility(bool checked);

-        private:
            //! Audio device lists from settings
            void initAudioDeviceLists();

@@ -71,7 +70,7 @@ namespace BlackGui
            bool hasAudio() const;

            QScopedPointer<Ui::CAudioSetupComponent> ui;
-            BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
+            BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::reloadSettings };
        };
    } // namespace
 } // namespace
--- a/src/blackgui/components/cockpitcomponent.h
+++ b/src/blackgui/components/cockpitcomponent.h
@@ -50,7 +50,7 @@ namespace BlackGui
            //! \copydoc BlackGui::Components::CTransponderModeSelector::setSelectedTransponderModeStateIdent
            void setSelectedTransponderModeStateIdent();

-            //! Show the audio ui
+            //! Show the audio UI
            void showAudio();

        private:
--- a/src/blackgui/components/maininfoareacomponent.cpp
+++ b/src/blackgui/components/maininfoareacomponent.cpp
@@ -159,6 +159,12 @@ namespace BlackGui
            ui->comp_Settings->setSettingsTab(static_cast<CSettingsComponent::SettingTab>(index));
        }

+        void CMainInfoAreaComponent::selectAudioTab()
+        {
+            this->getCockpitComponent()->showAudio();
+            this->selectArea(CMainInfoAreaComponent::InfoAreaCockpit);
+        }
+
        const QPixmap &CMainInfoAreaComponent::indexToPixmap(int areaIndex) const
        {
            const InfoArea area = static_cast<InfoArea>(areaIndex);
--- a/src/blackgui/components/maininfoareacomponent.h
+++ b/src/blackgui/components/maininfoareacomponent.h
@@ -126,6 +126,9 @@ namespace BlackGui
            //! Select settings with given area
            void selectSettingsTab(int index);

+            //! Select the audio tab
+            void selectAudioTab();
+
        protected:
            // CInfoArea overrides
            virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override;
--- a/src/blackgui/components/mainkeypadareacomponent.ui
+++ b/src/blackgui/components/mainkeypadareacomponent.ui
@@ -62,6 +62,105 @@
      <property name="spacing">
       <number>2</number>
      </property>
+      <item row="0" column="0" colspan="5">
+       <widget class="BlackGui::Components::CCommandInput" name="lep_CommandLineInput">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>command line (e.g. &quot;.com1&quot;, &quot;.x&quot;, &quot;.msg com1&quot;)</string>
+        </property>
+        <property name="placeholderText">
+         <string>.dot commands or text message</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2">
+       <widget class="QPushButton" name="pb_MainSettings">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Use &quot;SHIFT&quot; for overview</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text">
+         <string>Settings</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="3">
+       <widget class="QPushButton" name="pb_Opacity100">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>100%</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QPushButton" name="pb_MainInterpolation">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Interpolation</string>
+        </property>
+        <property name="text">
+         <string>Interpol.</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="pb_MainWeather">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Weather</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QPushButton" name="pb_Audio">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Audio</string>
+        </property>
+       </widget>
+      </item>
      <item row="1" column="4">
       <widget class="QPushButton" name="pb_CockpitIdent">
        <property name="sizePolicy">
@@ -75,52 +174,7 @@
        </property>
       </widget>
      </item>
-      <item row="2" column="3">
-       <widget class="QPushButton" name="pb_Empty">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="4">
-       <widget class="QPushButton" name="pb_Audio">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Audio</string>
-        </property>
-       </widget>
-      </item>
      <item row="3" column="2">
-       <widget class="QPushButton" name="pb_MainLog">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Log</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
       <widget class="QPushButton" name="pb_MainFlightplan">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -152,7 +206,23 @@
        </property>
       </widget>
      </item>
-      <item row="3" column="1">
+      <item row="4" column="2">
+       <widget class="QPushButton" name="pb_MainLog">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Log</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
       <widget class="QPushButton" name="pb_MainMappings">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -171,38 +241,6 @@
        </property>
       </widget>
      </item>
-      <item row="2" column="0">
-       <widget class="QPushButton" name="pb_MainAircrafts">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Aircraft</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="pb_MainTextMessages">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Text/Chat</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      <item row="1" column="1">
       <widget class="QPushButton" name="pb_MainCockpit">
        <property name="sizePolicy">
@@ -219,7 +257,23 @@
        </property>
       </widget>
      </item>
-      <item row="2" column="1">
+      <item row="3" column="0">
+       <widget class="QPushButton" name="pb_MainAircrafts">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Aircraft</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
       <widget class="QPushButton" name="pb_MainSimulator">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -235,7 +289,23 @@
        </property>
       </widget>
      </item>
-      <item row="3" column="0">
+      <item row="1" column="2">
+       <widget class="QPushButton" name="pb_MainTextMessages">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Text/Chat</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
       <widget class="QPushButton" name="pb_MainAtc">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -252,70 +322,6 @@
       </widget>
      </item>
      <item row="4" column="3">
-       <widget class="QPushButton" name="pb_Opacity100">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>100%</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QPushButton" name="pb_MainUsers">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Users</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="4">
-       <widget class="QPushButton" name="pb_SoundMute">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Mute</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2">
-       <widget class="QPushButton" name="pb_MainSettings">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Use &quot;SHIFT&quot; for overview</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="text">
-         <string>Settings</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="4">
       <widget class="QPushButton" name="pb_Opacity050">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -328,7 +334,7 @@
        </property>
       </widget>
      </item>
-      <item row="3" column="3">
+      <item row="5" column="4">
       <widget class="QPushButton" name="pb_SoundMaxVolume">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -344,8 +350,8 @@
        </property>
       </widget>
      </item>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="pb_MainWeather">
+      <item row="4" column="4">
+       <widget class="QPushButton" name="pb_SoundMute">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -353,45 +359,39 @@
         </sizepolicy>
        </property>
        <property name="text">
-         <string>Weather</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
+         <string>Mute</string>
        </property>
       </widget>
      </item>
-      <item row="4" column="1">
-       <widget class="QPushButton" name="pb_MainInterpolation">
+      <item row="3" column="4">
+       <widget class="QPushButton" name="pb_Empty">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-        <property name="toolTip">
-         <string>Interpolation</string>
-        </property>
        <property name="text">
-         <string>Interpol.</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
+         <string/>
        </property>
       </widget>
      </item>
-      <item row="0" column="0" colspan="5">
-       <widget class="BlackGui::Components::CCommandInput" name="lep_CommandLineInput">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>24</height>
-         </size>
+      <item row="3" column="3">
+       <widget class="QPushButton" name="pb_MainUsers">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
        </property>
-        <property name="toolTip">
-         <string>command line (e.g. &quot;.com1&quot;, &quot;.x&quot;, &quot;.msg com1&quot;)</string>
+        <property name="text">
+         <string>Users</string>
        </property>
-        <property name="placeholderText">
-         <string>.dot commands or text message</string>
+        <property name="checkable">
+         <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -413,7 +413,7 @@
  <tabstop>pb_Connect</tabstop>
  <tabstop>pb_MainAircrafts</tabstop>
  <tabstop>pb_MainAtc</tabstop>
-  <tabstop>pb_MainUsers</tabstop>
+  <tabstop>pb_Audio</tabstop>
  <tabstop>pb_MainCockpit</tabstop>
  <tabstop>pb_MainSimulator</tabstop>
  <tabstop>pb_MainMappings</tabstop>
@@ -423,13 +423,13 @@
  <tabstop>pb_MainLog</tabstop>
  <tabstop>pb_MainSettings</tabstop>
  <tabstop>pb_MainWeather</tabstop>
-  <tabstop>pb_Empty</tabstop>
-  <tabstop>pb_SoundMaxVolume</tabstop>
+  <tabstop>pb_MainUsers</tabstop>
+  <tabstop>pb_Opacity050</tabstop>
  <tabstop>pb_Opacity100</tabstop>
  <tabstop>pb_CockpitIdent</tabstop>
-  <tabstop>pb_Audio</tabstop>
+  <tabstop>pb_Empty</tabstop>
  <tabstop>pb_SoundMute</tabstop>
-  <tabstop>pb_Opacity050</tabstop>
+  <tabstop>pb_SoundMaxVolume</tabstop>
 </tabstops>
 <resources/>
 <connections/>
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -206,13 +206,12 @@ void SwiftGuiStd::initGuiSignals()
    connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::changedOpacity, this, &SwiftGuiStd::onChangedWindowOpacity);
    connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::identPressed, ui->comp_MainInfoArea->getCockpitComponent(), &CCockpitComponent::setSelectedTransponderModeStateIdent);
    connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::textEntered, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::handleGlobalCommandLineText);
-    connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::audioPressed, [ = ]
-    {
-        ui->comp_MainInfoArea->getCockpitComponent()->showAudio();
-        ui->comp_MainInfoArea->selectArea(CMainInfoAreaComponent::InfoAreaCockpit);
-    });
+    connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::audioPressed, ui->comp_MainInfoArea, &CMainInfoAreaComponent::selectAudioTab);
    connect(ui->comp_MainInfoArea, &CMainInfoAreaComponent::changedInfoAreaStatus, ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::onMainInfoAreaChanged);

+    // audio
+    connect(ui->comp_MainInfoArea->getAtcStationComponent(), &CAtcStationComponent::requestAudioWidget, ui->comp_MainInfoArea, &CMainInfoAreaComponent::selectAudioTab);
+
    // menu
    connect(ui->menu_TestLocationsEDDF, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
    connect(ui->menu_TestLocationsEDDM, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);