* use current view
* normalize designator and only use when valid
This commit is contained in:
Klaus Basan
2016-02-02 00:38:21 +01:00
parent 0de32e9c2f
commit afac4b06bc
3 changed files with 8 additions and 4 deletions

View File

@@ -26,7 +26,7 @@ namespace BlackGui
{ {
ui->setupUi(this); ui->setupUi(this);
this->setViewWithIndicator(this->ui->tvp_AircraftIcao); 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); connect(this->ui->tvp_AircraftIcao, &CAircraftIcaoCodeView::requestNewBackendData, this, &CDbAircraftIcaoComponent::ps_reload);
this->ui->tvp_AircraftIcao->allowDragDropValueObjects(true, false); this->ui->tvp_AircraftIcao->allowDragDropValueObjects(true, false);

View File

@@ -26,8 +26,8 @@ namespace BlackGui
{ {
ui->setupUi(this); ui->setupUi(this);
this->setViewWithIndicator(this->ui->tvp_AirlineIcao); this->setViewWithIndicator(this->ui->tvp_AirlineIcao);
this->ui->tvp_AirlineIcao->setResizeMode(CViewBaseNonTemplate::ResizingOff); this->ui->tvp_AirlineIcao->setResizeMode(CAirlineIcaoCodeView::ResizingOff);
this->ui->tvp_AirlineIcao->setResizeMode(CViewBaseNonTemplate::ResizingOff); this->ui->tvp_AirlineIcao->setResizeMode(CAirlineIcaoCodeView::ResizingOff);
this->ui->tvp_AirlineIcao->allowDragDropValueObjects(true, false); this->ui->tvp_AirlineIcao->allowDragDropValueObjects(true, false);
this->ui->tvp_AirlineIcao->setFilterWidget(this->ui->filter_AirlineIcao); this->ui->tvp_AirlineIcao->setFilterWidget(this->ui->filter_AirlineIcao);
connect(this->ui->tvp_AirlineIcao, &CAirlineIcaoCodeView::requestNewBackendData, this, &CDbAirlineIcaoComponent::ps_reload); connect(this->ui->tvp_AirlineIcao, &CAirlineIcaoCodeView::requestNewBackendData, this, &CDbAirlineIcaoComponent::ps_reload);

View File

@@ -121,7 +121,11 @@ namespace BlackMisc
model.setFileName(this->getFileName()); model.setFileName(this->getFileName());
model.setName(this->getSimName()); 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()); aircraft.setManufacturer(this->getUiManufacturer());
model.setAircraftIcaoCode(aircraft); model.setAircraftIcaoCode(aircraft);