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

Ref T397, do not show context menu for fast position updates if FSD has disabled it

Browse Source
This commit is contained in:
Klaus Basan
2018-10-27 02:04:19 +02:00
parent 53b3241483
commit 4370f2c614
4 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/components/aircraftcomponent.cpp
View File

@@ -7,9 +7,6 @@
* contained in the LICENSE file.
*/
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/network.h"
#include "blackgui/components/aircraftcomponent.h"
#include "blackgui/guiapplication.h"
#include "blackgui/guiutility.h"
@@ -18,6 +15,11 @@
#include "blackgui/views/airportview.h"
#include "blackgui/views/simulatedaircraftview.h"
#include "blackgui/views/viewbase.h"
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/network.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/fsdsetup.h"
#include "ui_aircraftcomponent.h"
#include <QString>
@@ -31,6 +33,7 @@ using namespace BlackGui::Models;
using namespace BlackGui::Settings;
using namespace BlackCore;
using namespace BlackCore::Context;
using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::PhysicalQuantities;
@@ -161,7 +164,12 @@ namespace BlackGui
}
else if (INetwork::isConnectedStatus(to))
{
// void
if (sGui && sGui->getIContextNetwork())
{
const CServer server = sGui->getIContextNetwork()->getConnectedServer();
const bool sendFast = server.getFsdSetup().sendInterimPositions();
ui->tvp_AircraftInRange->configureMenuFastPositionUpdates(sendFast);
}
}
}

22
src/blackgui/components/mappingcomponent.cpp
View File

@@ -7,9 +7,6 @@
* contained in the LICENSE file.
*/
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/network.h"
#include "blackgui/components/mappingcomponent.h"
#include "blackgui/guiapplication.h"
#include "blackgui/guiutility.h"
@@ -19,13 +16,17 @@
#include "blackgui/views/checkboxdelegate.h"
#include "blackgui/views/simulatedaircraftview.h"
#include "blackgui/views/viewbase.h"
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/network.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/server.h"
#include "blackmisc/icons.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/pixmap.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/statusmessage.h"
#include "mappingcomponent.h"
#include "ui_mappingcomponent.h"
@@ -426,6 +427,15 @@ namespace BlackGui
this->tokenBucketUpdate();
ui->tvp_RenderedAircraft->clear();
}
else if (INetwork::isConnectedStatus(to))
{
if (sGui && sGui->getIContextNetwork())
{
const CServer server = sGui->getIContextNetwork()->getConnectedServer();
const bool sendFast = server.getFsdSetup().sendInterimPositions();
ui->tvp_RenderedAircraft->configureMenuFastPositionUpdates(sendFast);
}
}
}
CSimulatorInfo CMappingComponent::getConnectedOrSelectedSimulator() const

5
src/blackgui/views/simulatedaircraftview.cpp
View File

@@ -53,6 +53,11 @@ namespace BlackGui
m_withMenuEnableGndFlag = menuGndFlag;
}
void CSimulatedAircraftView::configureMenuFastPositionUpdates(bool menuFastPositionUpdates)
{
m_withMenuFastPosition = menuFastPositionUpdates;
}
void CSimulatedAircraftView::customMenu(CMenuActions &menuActions)
{
// sub menus, only adding the path, the content will be added below

5
src/blackgui/views/simulatedaircraftview.h
View File

@@ -50,9 +50,12 @@ namespace BlackGui
//! Mode
void setAircraftMode(Models::CSimulatedAircraftListModel::AircraftMode mode);
//! configure the menu
//! Configure the menu
void configureMenu(bool menuHighlightAndFollow, bool menuEnableAircraft, bool menuFastPositionUpdates, bool menuGndFlag);
//! Configure fast position updates menu
void configureMenuFastPositionUpdates(bool menuFastPositionUpdates);
signals:
//! Request a text message
void requestTextMessageWidget(const BlackMisc::Aviation::CCallsign &callsign);