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

Ref T261, internals component adds client capability when client is not parts enabled

Browse Source
This commit is contained in:
Klaus Basan
2018-05-04 22:45:17 +02:00
committed by Roland Winklmeier
parent 0dca6db4bf
commit c4a900084e
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackgui/components/internalscomponent.cpp
View File

@@ -21,6 +21,7 @@
#include "blackmisc/aviation/aircraftenginelist.h" #include "blackmisc/aviation/aircraftenginelist.h"
#include "blackmisc/aviation/aircraftlights.h" #include "blackmisc/aviation/aircraftlights.h"
#include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/client.h"
#include "blackmisc/network/textmessage.h" #include "blackmisc/network/textmessage.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
@@ -35,6 +36,7 @@
#include <QtGlobal> #include <QtGlobal>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDateTime> #include <QDateTime>
#include <QMessageBox>
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
@@ -78,7 +80,7 @@ namespace BlackGui
connect(ui->pb_RequestFromNetwork, &QPushButton::pressed, this, &CInternalsComponent::requestPartsFromNetwork); connect(ui->pb_RequestFromNetwork, &QPushButton::pressed, this, &CInternalsComponent::requestPartsFromNetwork);
connect(ui->comp_RemoteAircraftSelector, &CRemoteAircraftSelector::changedCallsign, this, &CInternalsComponent::selectorChanged); connect(ui->comp_RemoteAircraftSelector, &CRemoteAircraftSelector::changedCallsign, this, &CInternalsComponent::selectorChanged);
contextFlagsToGui(); this->contextFlagsToGui();
} }
CInternalsComponent::~CInternalsComponent() { } CInternalsComponent::~CInternalsComponent() { }
@@ -92,6 +94,8 @@ namespace BlackGui
void CInternalsComponent::sendAircraftParts() void CInternalsComponent::sendAircraftParts()
{ {
if (!sGui || sGui->isShuttingDown()) { return; }
Q_ASSERT(sGui->getIContextNetwork()); Q_ASSERT(sGui->getIContextNetwork());
if (!sGui->getIContextNetwork()->isConnected()) if (!sGui->getIContextNetwork()->isConnected())
{ {
@@ -105,12 +109,30 @@ namespace BlackGui
return; return;
} }
CClient client = sGui->getIContextNetwork()->getClientsForCallsigns(callsign).frontOrDefault();
if (client.getCallsign().isEmpty() || client.getCallsign() != callsign)
{
CLogMessage(this).validationError("No valid client for '%1'") << callsign.asString();
return;
}
if (!client.hasAircraftPartsCapability())
{
static const QString question("'%1' does not support parts, enable parts for it?");
const QMessageBox::StandardButton reply = QMessageBox::question(this, "No parts supported", question.arg(callsign.asString()), QMessageBox::Yes | QMessageBox::No);
if (reply != QMessageBox::Yes) { return; }
client.addCapability(CClient::FsdWithAircraftConfig);
const bool enabled = sGui->getIContextNetwork()->setOtherClient(client);
Q_UNUSED(enabled);
}
const bool json = (QObject::sender() == ui->pb_SendAircraftPartsJson); const bool json = (QObject::sender() == ui->pb_SendAircraftPartsJson);
const CAircraftParts parts = json ? ui->editor_AircraftParts->getAircraftPartsFromJson() : ui->editor_AircraftParts->getAircraftPartsFromGui(); const CAircraftParts parts = json ? ui->editor_AircraftParts->getAircraftPartsFromJson() : ui->editor_AircraftParts->getAircraftPartsFromGui();
ui->editor_AircraftParts->setAircraftParts(parts); // display in UI as GUI and JSON ui->editor_AircraftParts->setAircraftParts(parts); // display in UI as GUI and JSON
ui->tb_History->setToolTip(""); ui->tb_History->setToolTip("");
sGui->getIContextNetwork()->testAddAircraftParts(callsign, parts, ui->cb_AircraftPartsIncremental->isChecked()); const bool incremental = ui->cb_AircraftPartsIncremental->isChecked();
sGui->getIContextNetwork()->testAddAircraftParts(callsign, parts, incremental);
CLogMessage(this).info("Added parts for %1") << callsign.toQString(); CLogMessage(this).info("Added parts for %1") << callsign.toQString();
} }