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

Propagate FacilityType and LoginMode to value objects

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-09-13 11:07:38 +02:00
parent 4772aadc1a
commit fa6e7108c7
21 changed files with 243 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@
#include "blackcore/context/contextnetwork.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/webdataservices.h"
#include "blackcore/network.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include "blackmisc/simulation/aircraftmodel.h"
@@ -167,11 +166,10 @@ namespace BlackGui
ui->comp_OwnAircraft->updateOwnAircaftIcaoValuesFromGuiValues();
// Login mode
const INetwork::LoginMode mode = ui->comp_NetworkDetails->getLoginMode();
switch (mode)
const CLoginMode mode = ui->comp_NetworkDetails->getLoginMode();
switch (mode.getLoginMode())
{
case INetwork::LoginStealth: CLogMessage(this).info(u"login in stealth mode"); break;
case INetwork::LoginAsObserver: CLogMessage(this).info(u"login in observer mode"); break;
case CLoginMode::Observer: CLogMessage(this).info(u"login in observer mode"); break;
default: break; // INetwork::LoginNormal
}

9
src/blackgui/components/logincomponent.cpp
View File

@@ -289,13 +289,8 @@ namespace BlackGui
this->updateOwnAircaftIcaoValuesFromGuiValues();
// Login mode
const INetwork::LoginMode mode = ui->frp_LoginMode->getLoginMode();
switch (mode)
{
case INetwork::LoginStealth: CLogMessage(this).info(u"login in stealth mode"); break;
case INetwork::LoginAsObserver: CLogMessage(this).info(u"login in observer mode"); break;
default: break; // INetwork::LoginNormal
}
const CLoginMode mode = ui->frp_LoginMode->getLoginMode();
if(mode.isObserver()) { CLogMessage(this).info(u"login in observer mode"); }
// Server
currentServer = this->getCurrentServer();

1
src/blackgui/components/logincomponent.h
View File

@@ -13,7 +13,6 @@
#include "blackcore/vatsim/vatsimsettings.h"
#include "blackcore/data/networksetup.h"
#include "blackcore/network.h"
#include "blackgui/settings/guisettings.h"
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/blackguiexport.h"

4
src/blackgui/components/networkdetailscomponent.cpp
View File

@@ -75,12 +75,12 @@ namespace BlackGui
CNetworkDetailsComponent::~CNetworkDetailsComponent()
{ }
INetwork::LoginMode CNetworkDetailsComponent::getLoginMode() const
CLoginMode CNetworkDetailsComponent::getLoginMode() const
{
return ui->frp_LoginMode->getLoginMode();
}
void CNetworkDetailsComponent::setLoginMode(INetwork::LoginMode mode)
void CNetworkDetailsComponent::setLoginMode(CLoginMode mode)
{
ui->frp_LoginMode->setLoginMode(mode);
}

6
src/blackgui/components/networkdetailscomponent.h
View File

@@ -15,7 +15,6 @@
#include <QScopedPointer>
#include "blackcore/data/networksetup.h"
#include "blackcore/network.h"
#include "blackmisc/network/data/lastserver.h"
#include "blackmisc/network/entityflags.h"
#include "blackmisc/network/fsdsetup.h"
@@ -23,6 +22,7 @@
#include "blackmisc/settingscache.h"
#include "blackmisc/datacache.h"
#include "blackmisc/network/connectionstatus.h"
#include "blackmisc/network/loginmode.h"
namespace Ui { class CNetworkDetailsComponent; }
namespace BlackGui
@@ -79,10 +79,10 @@ namespace BlackGui
bool isVoiceSetupOverrideEnabled() const;
//! Login mode
BlackCore::INetwork::LoginMode getLoginMode() const;
BlackMisc::Network::CLoginMode getLoginMode() const;
//! Login mode
void setLoginMode(BlackCore::INetwork::LoginMode mode);
void setLoginMode(BlackMisc::Network::CLoginMode mode);
//! Reset state
void resetState();