flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-22 21:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T659, renamed buttons and use "alwaysOverride" function

Browse Source
This commit is contained in:
Klaus Basan
2019-08-06 20:12:45 +02:00
committed by Mat Sutcliffe
parent 04812581ea
commit 1d7e3dc9aa
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackgui/components/loginadvcomponent.cpp
View File

@@ -80,8 +80,8 @@ namespace BlackGui
{
ui->setupUi(this);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &CLoginAdvComponent::loginCancelled, Qt::QueuedConnection);
connect(ui->pb_Ok, &QPushButton::clicked, this, &CLoginAdvComponent::toggleNetworkConnection, Qt::QueuedConnection);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &CLoginAdvComponent::loginCancelled, Qt::QueuedConnection);
connect(ui->pb_Connect, &QPushButton::clicked, this, &CLoginAdvComponent::toggleNetworkConnection, Qt::QueuedConnection);
connect(ui->comp_NetworkDetails, &CNetworkDetailsComponent::overridePilot, this, &CLoginAdvComponent::overrideCredentialsToPilot, Qt::QueuedConnection);
connect(ui->comp_NetworkDetails, &CNetworkDetailsComponent::requestNetworkSettings, this, &CLoginAdvComponent::requestNetworkSettings, Qt::QueuedConnection);
@@ -91,6 +91,9 @@ namespace BlackGui
this->setForceSmall(true);
this->showKillButton(false);
// override details/voice
ui->comp_NetworkDetails->setAlwaysAllowOverride(true);
// auto logoff
// we decided to make it difficult for users to disable it
if (!CBuildConfig::isLocalDeveloperDebugBuild())
@@ -237,6 +240,11 @@ namespace BlackGui
}
}
void CLoginAdvComponent::resetState()
{
ui->comp_NetworkDetails->resetState();
}
void CLoginAdvComponent::loadRememberedUserData()
{
const CServer lastServer = m_networkSetup.getLastServer();