flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T168, relay kicked message thru context to UI

Browse Source 
* new signal in context, connected with VATLIB
* display in UI
This commit is contained in:
Klaus Basan
2017-09-30 00:48:31 +02:00
committed by Mathew Sutcliffe
parent 2aa5ed431f
commit 27ebf3e43d
7 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/context/contextnetwork.h
View File

@@ -144,6 +144,9 @@ namespace BlackCore
//! Terminated connection
void connectionTerminated();
//! User has been kicked from network
void kicked(const QString &kickMessage);
//! Connection status changed
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);

1
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -67,6 +67,7 @@ namespace BlackCore
// 1. Init by "network driver"
m_network = new CNetworkVatlib(this->getRuntime()->getCContextOwnAircraft(), this);
connect(m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::ps_fsdConnectionStatusChanged);
connect(m_network, &INetwork::kicked, this, &CContextNetwork::kicked);
connect(m_network, &INetwork::textMessagesReceived, this, &CContextNetwork::textMessagesReceived);
connect(m_network, &INetwork::textMessagesReceived, this, &CContextNetwork::ps_checkForSupervisiorTextMessage);
connect(m_network, &INetwork::textMessageSent, this, &CContextNetwork::textMessageSent);

3
src/blackcore/context/contextnetworkproxy.cpp
View File

@@ -75,6 +75,9 @@ namespace BlackCore
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"connectionTerminated", this, SIGNAL(connectionTerminated()));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"kicked", this, SIGNAL(kicked(QString)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"textMessagesReceived", this, SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList)));
Q_ASSERT(s);

18
src/blackcore/vatsim/networkvatlib.h
View File

@@ -123,7 +123,7 @@ namespace BlackCore
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) override;
//! @}
//! Cmd. line options this library can handle
//! Command line options this library can handle
static const QList<QCommandLineOption> &getCmdLineOptions();
static int const c_positionTimeOffsetMsec = 6000; //!< offset time for received position updates
@@ -206,18 +206,18 @@ namespace BlackCore
};
QScopedPointer<PCSBClient, VatlibQScopedPointerDeleter> m_net;
LoginMode m_loginMode;
VatConnectionStatus m_status;
BlackMisc::Network::CServer m_server;
QTextCodec *m_fsdTextCodec = nullptr;
BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo;
LoginMode m_loginMode;
VatConnectionStatus m_status;
BlackMisc::Network::CServer m_server;
QTextCodec *m_fsdTextCodec = nullptr;
BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo; //!< used simulator
BlackMisc::Aviation::CCallsign m_ownCallsign; //!< "buffered callsign", as this must not change when connected
BlackMisc::Aviation::CAircraftIcaoCode m_ownAircraftIcaoCode; //!< "buffered icao", as this must not change when connected
BlackMisc::Aviation::CAirlineIcaoCode m_ownAirlineIcaoCode; //!< "buffered icao", as this must not change when connected
QString m_ownLiveryDescription; //!< "buffered livery", as this must not change when connected
BlackMisc::Aviation::CCallsignSet m_interimPositionReceivers;
BlackMisc::Aviation::CAircraftParts m_sentAircraftConfig;
CTokenBucket m_tokenBucket;
BlackMisc::Aviation::CCallsignSet m_interimPositionReceivers; //!< all aircraft receiving interim positions
BlackMisc::Aviation::CAircraftParts m_sentAircraftConfig; //!< aircraft parts sent
CTokenBucket m_tokenBucket; //!< used with aircraft parts messages
QTimer m_scheduledConfigUpdate;
QTimer m_processingTimer;