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

Check for minimum mapping version

Browse Source 
* check functions in gui application/application
* check for instance mapping wizard
* check on mapping tool's stashing component
This commit is contained in:
Klaus Basan
2018-12-05 03:37:36 +01:00
parent 774458afc9
commit 42af510342
7 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackgui/components/dbstashcomponent.cpp
View File

@@ -269,6 +269,7 @@ namespace BlackGui
{
if (!sGui || sGui->isShuttingDown() || !sGui->hasWebDataServices()) { return; }
if (ui->tvp_StashAircraftModels->isEmpty()) { return; }
if (!sGui->hasMinimumMappingVersion()) { return; }
// get models right here, because later steps might affect selection
const CAircraftModelList models(getSelectedOrAllModels());

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

@@ -38,6 +38,7 @@
#include "blackconfig/buildconfig.h"
#include <QDialogButtonBox>
#include <QMessageBox>
#include <QGroupBox>
#include <QIntValidator>
#include <QLineEdit>
@@ -693,6 +694,8 @@ namespace BlackGui
void CLoginComponent::mappingWizard()
{
if (!sGui || !sGui->getIContextOwnAircraft() || sGui->isShuttingDown()) { return; }
if (!sGui->hasMinimumMappingVersion()) { return; }
if (!m_mappingWizard)
{
m_mappingWizard.reset(new CDbQuickMappingWizard(this));

25
src/blackgui/components/logincomponent.ui
View File

@@ -378,6 +378,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
@@ -845,6 +848,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::CTickLabel</class>
<extends>QLabel</extends>
<header>blackgui/ticklabel.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CServerForm</class>
<extends>QFrame</extends>
@@ -869,11 +877,6 @@
<header>blackgui/components/modelmatcherlogenable.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CTickLabel</class>
<extends>QLabel</extends>
<header>blackgui/ticklabel.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
<extends>QFrame</extends>
@@ -908,10 +911,8 @@
<tabstop>tw_Network</tabstop>
<tabstop>comp_VatsimServers</tabstop>
<tabstop>pb_OverrideCredentialsVatsim</tabstop>
<tabstop>comp_OtherServers</tabstop>
<tabstop>pb_OtherServersGotoSettings</tabstop>
<tabstop>pb_OverrideCredentialsOtherServers</tabstop>
<tabstop>sa_FsdDetails</tabstop>
<tabstop>tw_Details</tabstop>
<tabstop>form_Pilot</tabstop>
<tabstop>le_SimulatorModel</tabstop>
<tabstop>tb_SimulatorIcaoReverseLookup</tabstop>
<tabstop>tb_MappingWizard</tabstop>
@@ -920,11 +921,17 @@
<tabstop>le_AircraftCombinedType</tabstop>
<tabstop>selector_AirlineIcao</tabstop>
<tabstop>le_LoginCallsign</tabstop>
<tabstop>le_LoginHomeBase</tabstop>
<tabstop>le_LoginAsAircaft</tabstop>
<tabstop>le_LoginSince</tabstop>
<tabstop>tb_Timeout</tabstop>
<tabstop>cb_AutoLogoff</tabstop>
<tabstop>pb_Ok</tabstop>
<tabstop>pb_Cancel</tabstop>
<tabstop>comp_OtherServers</tabstop>
<tabstop>pb_OtherServersGotoSettings</tabstop>
<tabstop>pb_OverrideCredentialsOtherServers</tabstop>
<tabstop>sa_FsdDetails</tabstop>
</tabstops>
<resources>
<include location="../../blackmisc/blackmisc.qrc"/>