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

Ref T739, style

Browse Source
This commit is contained in:
Klaus Basan
2019-10-05 00:04:35 +02:00
committed by Mat Sutcliffe
parent 7e36e67f89
commit 66968ff3a5
8 changed files with 30 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackgui/components/audiovolumecomponent.cpp
View File

@@ -21,6 +21,7 @@
#include <QtGlobal>
using namespace BlackMisc;
using namespace BlackMisc::Audio;
using namespace BlackCore;
using namespace BlackCore::Context;
@@ -41,28 +42,28 @@ namespace BlackGui
bool c = connect(ui->pb_ShowWinMixer, &QPushButton::pressed, this, &CAudioVolumeComponent::onWindowsMixerRequested);
Q_ASSERT(c);
Q_UNUSED(c);
Q_UNUSED(c)
c = connect(ui->hs_Volume, &QSlider::valueChanged, this, &CAudioVolumeComponent::changeOutputVolumeFromSlider);
Q_ASSERT(c);
Q_UNUSED(c);
Q_UNUSED(c)
c = connect(ui->sb_Volume, qOverload<int>(&QSpinBox::valueChanged), this, &CAudioVolumeComponent::changeOutputVolumeFromSpinBox);
Q_ASSERT(c);
Q_UNUSED(c);
Q_UNUSED(c)
c = connect(ui->pb_Volume100, &QPushButton::clicked, this, &CAudioVolumeComponent::setVolume100);
Q_ASSERT(c);
Q_UNUSED(c);
Q_UNUSED(c)
c = connect(sGui->getIContextAudio(), &IContextAudio::changedMute, this, &CAudioVolumeComponent::onMuteChanged);
Q_ASSERT(c);
Q_UNUSED(c);
Q_UNUSED(c)
connect(sGui->getIContextAudio(), &IContextAudio::changedAudioVolume, this, &CAudioVolumeComponent::onOutputVolumeChanged);
Q_ASSERT(c);
Q_UNUSED(c);
Q_UNUSED(c)
// to audio audio context
c = connect(ui->pb_Mute, &QPushButton::toggled, sGui->getIContextAudio(), &IContextAudio::setMute);
Q_ASSERT(c);
Q_UNUSED(c);
Q_UNUSED(c)
if (sGui->getIContextAudio()->isUsingImplementingObject())
{
@@ -147,7 +148,7 @@ namespace BlackGui
void CAudioVolumeComponent::onWindowsMixerRequested()
{
Audio::startWindowsMixer();
startWindowsMixer();
}
} // namespace

11
src/blackgui/components/infobarstatuscomponent.cpp
View File

@@ -38,6 +38,7 @@ using namespace BlackCore;
using namespace BlackCore::Context;
using namespace BlackGui;
using namespace BlackMisc;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Network;
namespace BlackGui
@@ -117,12 +118,6 @@ namespace BlackGui
CGuiUtility::setElidedText(ui->lbl_MapperReady, QStringLiteral("mapper ready"), Qt::ElideRight);
CGuiUtility::setElidedText(ui->lbl_Ptt, QStringLiteral("PTT"), Qt::ElideRight);
CGuiUtility::setElidedText(ui->lbl_Simulator, QStringLiteral("simulator"), Qt::ElideRight);
// CGuiUtility::setElidedText(ui->lbl_Audio, QStringLiteral("au"), QStringLiteral("audio"), Qt::ElideRight);
// CGuiUtility::setElidedText(ui->lbl_DBus, QStringLiteral("DBus"), {}, Qt::ElideRight);
// CGuiUtility::setElidedText(ui->lbl_MapperReady, QStringLiteral("map"), QStringLiteral("mapper ready"), Qt::ElideRight);
// CGuiUtility::setElidedText(ui->lbl_Ptt, QStringLiteral("PTT"), QStringLiteral("push to talk"), Qt::ElideRight);
// CGuiUtility::setElidedText(ui->lbl_Simulator, QStringLiteral("sim"), QStringLiteral("simulator"), Qt::ElideRight);
}
void CInfoBarStatusComponent::setDBusStatus(bool dbus)
@@ -189,7 +184,7 @@ namespace BlackGui
void CInfoBarStatusComponent::onNetworkConnectionChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
Q_UNUSED(from)
switch (to.getConnectionStatus())
{
case CConnectionStatus::Disconnected:
@@ -233,7 +228,7 @@ namespace BlackGui
}
else if (actions.size() > 1 && selectedItem == actions.at(1))
{
Audio::startWindowsMixer();
startWindowsMixer();
}
}
}