From afac4b06bc9252d2a4bb5e2d640c4c5105a7be06 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 2 Feb 2016 00:38:21 +0100 Subject: [PATCH] Tweaks * use current view * normalize designator and only use when valid --- src/blackgui/components/dbaircrafticaocomponent.cpp | 2 +- src/blackgui/components/dbairlineicaocomponent.cpp | 4 ++-- src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/blackgui/components/dbaircrafticaocomponent.cpp index a961da01e..e837c2231 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.cpp +++ b/src/blackgui/components/dbaircrafticaocomponent.cpp @@ -26,7 +26,7 @@ namespace BlackGui { ui->setupUi(this); this->setViewWithIndicator(this->ui->tvp_AircraftIcao); - this->ui->tvp_AircraftIcao->setResizeMode(CViewBaseNonTemplate::ResizingOff); + this->ui->tvp_AircraftIcao->setResizeMode(CAircraftIcaoCodeView::ResizingOff); connect(this->ui->tvp_AircraftIcao, &CAircraftIcaoCodeView::requestNewBackendData, this, &CDbAircraftIcaoComponent::ps_reload); this->ui->tvp_AircraftIcao->allowDragDropValueObjects(true, false); diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/blackgui/components/dbairlineicaocomponent.cpp index 39fcd0a60..1b5756195 100644 --- a/src/blackgui/components/dbairlineicaocomponent.cpp +++ b/src/blackgui/components/dbairlineicaocomponent.cpp @@ -26,8 +26,8 @@ namespace BlackGui { ui->setupUi(this); this->setViewWithIndicator(this->ui->tvp_AirlineIcao); - this->ui->tvp_AirlineIcao->setResizeMode(CViewBaseNonTemplate::ResizingOff); - this->ui->tvp_AirlineIcao->setResizeMode(CViewBaseNonTemplate::ResizingOff); + this->ui->tvp_AirlineIcao->setResizeMode(CAirlineIcaoCodeView::ResizingOff); + this->ui->tvp_AirlineIcao->setResizeMode(CAirlineIcaoCodeView::ResizingOff); this->ui->tvp_AirlineIcao->allowDragDropValueObjects(true, false); this->ui->tvp_AirlineIcao->setFilterWidget(this->ui->filter_AirlineIcao); connect(this->ui->tvp_AirlineIcao, &CAirlineIcaoCodeView::requestNewBackendData, this, &CDbAirlineIcaoComponent::ps_reload); diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp index 98b6eae73..f7b28fda1 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp @@ -121,7 +121,11 @@ namespace BlackMisc model.setFileName(this->getFileName()); model.setName(this->getSimName()); - CAircraftIcaoCode aircraft(getAtcModel()); + const QString designator(CAircraftIcaoCode::normalizeDesignator(getAtcModel())); + CAircraftIcaoCode aircraft( + CAircraftIcaoCode::isValidDesignator(designator) ? + designator : + CAircraftIcaoCode::getUnassignedDesignator()); aircraft.setManufacturer(this->getUiManufacturer()); model.setAircraftIcaoCode(aircraft);