flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added statusMessages (plural) as signal. This makes it easier

Browse Source 
to send either single or multiple messages as required.

Along with the changes fixed some places where not all status
messages had been sent.

MainWindow connected with both signals (statusMessage, statusMessages)

Recreated DBus XML file
This commit is contained in:
Klaus Basan
2014-01-17 18:42:34 +01:00
parent 97dda0b499
commit 72b7a7ab95
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/blackgui/mainwindow_init.cpp
View File

@@ -117,6 +117,7 @@ void MainWindow::init(GuiModes::CoreMode coreMode)
// signal / slots
bool connect;
this->connect(this->m_contextNetwork, &IContextNetwork::statusMessage, this, &MainWindow::displayStatusMessage);
this->connect(this->m_contextNetwork, &IContextNetwork::statusMessages, this, &MainWindow::displayStatusMessages);
this->connect(this->m_contextNetwork, &IContextNetwork::connectionTerminated, this, &MainWindow::connectionTerminated);
this->connect(this->m_contextNetwork, &IContextNetwork::connectionStatusChanged, this, &MainWindow::connectionStatusChanged);
this->connect(this->m_contextSettings, &IContextSettings::changedNetworkSettings, this, &MainWindow::changedNetworkSettings);

4
src/blackcore/blackcore.contextnetwork.xml
View File

@@ -5,6 +5,10 @@
<arg name="message" type="(sii((iii)(iiii)i))" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessage"/>
</signal>
<signal name="statusMessages">
<arg name="messages" type="(a(sii((iii)(iiii)i)))" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
</signal>
<signal name="changedAtcStationsOnline">
</signal>
<signal name="changedAtcStationsBooked">

6
src/blackcore/context_network.cpp
View File

@@ -246,11 +246,11 @@ namespace BlackCore
}
// send as message
QString m("connection status changed ");
m.append(this->m_network->connectionStatusToString(from)).append(" ").append(this->m_network->connectionStatusToString(to));
QString m("connection status changed from %1 to %2");
m = m.arg(INetwork::connectionStatusToString(from), INetwork::connectionStatusToString(to));
msgs.push_back(CStatusMessage(CStatusMessage::TypeTrafficNetwork,
to == INetwork::DisconnectedError ? CStatusMessage::SeverityError : CStatusMessage::SeverityInfo, m));
emit this->statusMessage(msgs[0]);
emit this->statusMessages(msgs);
// send as own signal
emit this->connectionStatusChanged(from, to);

2
src/blackcore/context_network_interface.cpp
View File

@@ -38,6 +38,8 @@ namespace BlackCore
"connectionTerminated", this, SIGNAL(connectionTerminated()));
connection.connect(serviceName, IContextNetwork::ServicePath(), IContextNetwork::InterfaceName(),
"statusMessage", this, SIGNAL(statusMessage(BlackMisc::CStatusMessage)));
connection.connect(serviceName, IContextNetwork::ServicePath(), IContextNetwork::InterfaceName(),
"statusMessages", this, SIGNAL(statusMessages(BlackMisc::CStatusMessageList)));
connection.connect(serviceName, IContextNetwork::ServicePath(), IContextNetwork::InterfaceName(),
"textMessagesReceived", this, SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList)));
}

10
src/blackcore/context_network_interface.h
View File

@@ -106,11 +106,17 @@ namespace BlackCore
signals:
/*!
* \brief ATC station list has been changed
* \brief Send status messages
* \param message
*/
void statusMessage(const BlackMisc::CStatusMessage &message);
/*!
* \brief Send status messages
* \param messages
*/
void statusMessages(const BlackMisc::CStatusMessageList &messages);
/*!
* \brief List has been changed
*/
@@ -137,8 +143,6 @@ namespace BlackCore
* \param to
*/
// If I use the enum, adaptor / interface are not created correctly
void connectionStatusChanged(uint from, uint to);
/*!