mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-19 12:15:29 +08:00
committed by
Roland Winklmeier
parent
ce78b65079
commit
4ce5144516
@@ -195,7 +195,10 @@ namespace BlackCore
|
|||||||
|
|
||||||
void CContextAudio::setVolumes(int com1Volume, int com2Volume)
|
void CContextAudio::setVolumes(int com1Volume, int com2Volume)
|
||||||
{
|
{
|
||||||
if (m_channelCom1->getVolume() == com1Volume && m_channelCom2->getVolume() == com2Volume) { return; }
|
//! \todo Fix when VATLIB 2.0 is available
|
||||||
|
int channelV1 = static_cast<int>(m_channelCom1->getVolume());
|
||||||
|
int channelV2 = static_cast<int>(m_channelCom2->getVolume());
|
||||||
|
if (channelV1 == com1Volume && channelV2 == com2Volume) { return; }
|
||||||
|
|
||||||
bool enable1 = com1Volume > 0;
|
bool enable1 = com1Volume > 0;
|
||||||
bool enable2 = com2Volume > 0;
|
bool enable2 = com2Volume > 0;
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ namespace BlackCore
|
|||||||
BlackCore::ISimulator *m_simulator = nullptr;
|
BlackCore::ISimulator *m_simulator = nullptr;
|
||||||
|
|
||||||
QTimer *m_updateTimer = nullptr;
|
QTimer *m_updateTimer = nullptr;
|
||||||
QDir m_pluginsDir = nullptr;
|
QDir m_pluginsDir;
|
||||||
QSet<ISimulatorFactory *> m_simulatorFactories;
|
QSet<ISimulatorFactory *> m_simulatorFactories;
|
||||||
QFuture<bool> m_canConnectResult;
|
QFuture<bool> m_canConnectResult;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -183,6 +183,9 @@ namespace BlackGui
|
|||||||
case INetwork::LoginAsObserver:
|
case INetwork::LoginAsObserver:
|
||||||
CLogMessage(this).info("login in observer mode");
|
CLogMessage(this).info("login in observer mode");
|
||||||
break;
|
break;
|
||||||
|
case INetwork::LoginNormal:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Server
|
// Server
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
void CLedWidget::toggleValue()
|
void CLedWidget::toggleValue()
|
||||||
{
|
{
|
||||||
m_value = (m_value == Off) ? m_value = On : m_value = Off;
|
m_value = (m_value == Off) ? On : Off;
|
||||||
setLed();
|
setLed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace Ui { class CLoginModeButtons; }
|
|||||||
|
|
||||||
namespace BlackGui
|
namespace BlackGui
|
||||||
{
|
{
|
||||||
|
//! Display login modes (normal, stealth, ...)
|
||||||
class CLoginModeButtons : public QGroupBox
|
class CLoginModeButtons : public QGroupBox
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace BlackGui
|
|||||||
{ }
|
{ }
|
||||||
|
|
||||||
CUpperCaseValidator::CUpperCaseValidator(bool optionalValue, int minLength, int maxLength, QObject *parent) : QValidator(parent),
|
CUpperCaseValidator::CUpperCaseValidator(bool optionalValue, int minLength, int maxLength, QObject *parent) : QValidator(parent),
|
||||||
m_minLength(minLength), m_maxLength(maxLength), m_optionalValue(optionalValue)
|
m_optionalValue(optionalValue), m_minLength(minLength), m_maxLength(maxLength)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
QValidator::State CUpperCaseValidator::validate(QString &input, int &pos) const
|
QValidator::State CUpperCaseValidator::validate(QString &input, int &pos) const
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ namespace BlackMisc
|
|||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
// QSysInfo::WindowsVersion only available on Win platforms
|
// QSysInfo::WindowsVersion only available on Win platforms
|
||||||
return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? true : false;
|
return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? true : false;
|
||||||
#elif
|
#else
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user