This commit is contained in:
Klaus Basan
2019-10-28 23:55:43 +01:00
committed by Mat Sutcliffe
parent 602e8ab913
commit 209c00b430
2 changed files with 7 additions and 7 deletions

View File

@@ -101,10 +101,10 @@ namespace BlackCore
connect(m_airspace, &CAirspaceMonitor::changedAtcStationsBooked, this, &CContextNetwork::changedAtcStationsBooked, Qt::QueuedConnection); connect(m_airspace, &CAirspaceMonitor::changedAtcStationsBooked, this, &CContextNetwork::changedAtcStationsBooked, Qt::QueuedConnection);
connect(m_airspace, &CAirspaceMonitor::changedAtcStationOnlineConnectionStatus, this, &CContextNetwork::changedAtcStationOnlineConnectionStatus, Qt::QueuedConnection); connect(m_airspace, &CAirspaceMonitor::changedAtcStationOnlineConnectionStatus, this, &CContextNetwork::changedAtcStationOnlineConnectionStatus, Qt::QueuedConnection);
connect(m_airspace, &CAirspaceMonitor::changedAircraftInRange, this, &CContextNetwork::changedAircraftInRange, Qt::QueuedConnection); connect(m_airspace, &CAirspaceMonitor::changedAircraftInRange, this, &CContextNetwork::changedAircraftInRange, Qt::QueuedConnection);
connect(m_airspace, &CAirspaceMonitor::removedAircraft, this, &IContextNetwork::removedAircraft, Qt::QueuedConnection); // DBus connect(m_airspace, &CAirspaceMonitor::removedAircraft, this, &IContextNetwork::removedAircraft, Qt::QueuedConnection); // DBus
connect(m_airspace, &CAirspaceMonitor::readyForModelMatching, this, &CContextNetwork::readyForModelMatching, Qt::QueuedConnection); connect(m_airspace, &CAirspaceMonitor::readyForModelMatching, this, &CContextNetwork::readyForModelMatching, Qt::QueuedConnection);
connect(m_airspace, &CAirspaceMonitor::addedAircraft, this, &CContextNetwork::addedAircraft, Qt::QueuedConnection); connect(m_airspace, &CAirspaceMonitor::addedAircraft, this, &CContextNetwork::addedAircraft, Qt::QueuedConnection);
connect(m_airspace, &CAirspaceMonitor::changedAtisReceived , this, &CContextNetwork::onChangedAtisReceived, Qt::QueuedConnection); connect(m_airspace, &CAirspaceMonitor::changedAtisReceived, this, &CContextNetwork::onChangedAtisReceived, Qt::QueuedConnection);
} }
CContextNetwork *CContextNetwork::registerWithDBus(BlackMisc::CDBusServer *server) CContextNetwork *CContextNetwork::registerWithDBus(BlackMisc::CDBusServer *server)

View File

@@ -290,7 +290,7 @@ namespace BlackGui
// Login mode // Login mode
const CLoginMode mode = ui->frp_LoginMode->getLoginMode(); const CLoginMode mode = ui->frp_LoginMode->getLoginMode();
if(mode.isObserver()) { CLogMessage(this).info(u"login in observer mode"); } if (mode.isObserver()) { CLogMessage(this).info(u"login in observer mode"); }
// Server // Server
currentServer = this->getCurrentServer(); currentServer = this->getCurrentServer();
@@ -475,14 +475,14 @@ namespace BlackGui
void CLoginComponent::onDetailsTabChanged(int index) void CLoginComponent::onDetailsTabChanged(int index)
{ {
Q_UNUSED(index); Q_UNUSED(index)
const bool showNetwork = (ui->tw_Details->currentWidget() != ui->tb_FsdDetails); const bool showNetwork = (ui->tw_Details->currentWidget() != ui->tb_FsdDetails);
const CServer server = this->getCurrentServer(); const CServer server = this->getCurrentServer();
// only override if not yet enabled // only override if not yet enabled
if (!ui->form_FsdDetails->isFsdSetupEnabled()) { ui->form_FsdDetails->setValue(server.getFsdSetup()); } if (!ui->form_FsdDetails->isFsdSetupEnabled()) { ui->form_FsdDetails->setValue(server.getFsdSetup()); }
if (!ui->form_Voice->isVoiceSetupEnabled()) { ui->form_Voice->setValue(server.getVoiceSetup()); } if (!ui->form_Voice->isVoiceSetupEnabled()) { ui->form_Voice->setValue(server.getVoiceSetup()); }
ui->tw_Network->setVisible(showNetwork); ui->tw_Network->setVisible(showNetwork);
ui->tw_Details->setMinimumHeight(showNetwork ? 0 : 125); ui->tw_Details->setMinimumHeight(showNetwork ? 0 : 125);