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

refs #822, display file ts in views

Browse Source 
* consolidated models
* renamed flags
This commit is contained in:
Klaus Basan
2016-12-04 19:17:55 +01:00
parent 02798a7f2b
commit 6e1efaf88a
5 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/dbownmodelscomponent.cpp
View File

@@ -43,7 +43,7 @@ namespace BlackGui
{ {
ui->setupUi(this); ui->setupUi(this);
ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons); ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
ui->tvp_OwnAircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnSimulatorModelMapping); ui->tvp_OwnAircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnAircraftModelMappingTool);
ui->tvp_OwnAircraftModels->addFilterDialog(); ui->tvp_OwnAircraftModels->addFilterDialog();
ui->tvp_OwnAircraftModels->setDisplayAutomatically(true); ui->tvp_OwnAircraftModels->setDisplayAutomatically(true);
ui->tvp_OwnAircraftModels->setCustomMenu(new CLoadModelsMenu(this, true)); ui->tvp_OwnAircraftModels->setCustomMenu(new CLoadModelsMenu(this, true));

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

@@ -62,7 +62,7 @@ namespace BlackGui
ui(new Ui::CMappingComponent) ui(new Ui::CMappingComponent)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tvp_AircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnSimulatorModel); ui->tvp_AircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnAircraftModelClient);
ui->tvp_AircraftModels->setResizeMode(CAircraftModelView::ResizingOff); ui->tvp_AircraftModels->setResizeMode(CAircraftModelView::ResizingOff);
ui->tvp_AircraftModels->addFilterDialog(); ui->tvp_AircraftModels->addFilterDialog();
ui->tvp_AircraftModels->menuRemoveItems(CViewBaseNonTemplate::MenuBackend); ui->tvp_AircraftModels->menuRemoveItems(CViewBaseNonTemplate::MenuBackend);

13
src/blackgui/models/aircraftmodellistmodel.cpp
View File

@@ -50,8 +50,7 @@ namespace BlackGui
switch (mode) switch (mode)
{ {
case NotSet: case NotSet:
case OwnSimulatorModel: case OwnAircraftModelClient:
case StashModel:
this->m_columns.addColumn(CColumn::standardString("model", { CAircraftModel::IndexModelString})); this->m_columns.addColumn(CColumn::standardString("model", { CAircraftModel::IndexModelString}));
this->m_columns.addColumn(CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter())); this->m_columns.addColumn(CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter()));
this->m_columns.addColumn(CColumn::standardString("DB", "parts from DB", { CAircraftModel::IndexMembersDbStatus})); this->m_columns.addColumn(CColumn::standardString("DB", "parts from DB", { CAircraftModel::IndexMembersDbStatus}));
@@ -77,11 +76,15 @@ namespace BlackGui
// intentional fall thru // intentional fall thru
this->m_columns.addColumn(CColumn::orderColumn()); this->m_columns.addColumn(CColumn::orderColumn());
case OwnSimulatorModelMapping: case OwnAircraftModelMappingTool:
case StashModel:
this->m_columns.addColumn(CColumn::standardString("model", CAircraftModel::IndexModelString)); this->m_columns.addColumn(CColumn::standardString("model", CAircraftModel::IndexModelString));
this->m_columns.addColumn(CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter())); this->m_columns.addColumn(CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter()));
if (mode == StashModel)
{
this->m_columns.addColumn(CColumn::standardString("flags", "parts from DB", { CAircraftModel::IndexMembersDbStatus}));
}
this->m_columns.addColumn(CColumn("mode", "model mode(include, exclude)", CAircraftModel::IndexModelModeAsIcon, new CPixmapFormatter())); this->m_columns.addColumn(CColumn("mode", "model mode(include, exclude)", CAircraftModel::IndexModelModeAsIcon, new CPixmapFormatter()));
// this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraftModel::IndexCallsign));
this->m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey})); this->m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey}));
if (mode == OwnModelSet) if (mode == OwnModelSet)
{ {
@@ -89,9 +92,11 @@ namespace BlackGui
} }
this->m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator})); this->m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator}));
this->m_columns.addColumn(CColumn::standardString("fam.", "aircraft family", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexFamily})); this->m_columns.addColumn(CColumn::standardString("fam.", "aircraft family", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexFamily}));
this->m_columns.addColumn(CColumn::standardString("livery", { CAircraftModel::IndexLivery, CLivery::IndexCombinedCode}));
this->m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator})); this->m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator}));
this->m_columns.addColumn(CColumn::standardString("description", CAircraftModel::IndexDescription)); this->m_columns.addColumn(CColumn::standardString("description", CAircraftModel::IndexDescription));
this->m_columns.addColumn(CColumn::standardString("filename", CAircraftModel::IndexFileName)); this->m_columns.addColumn(CColumn::standardString("filename", CAircraftModel::IndexFileName));
this->m_columns.addColumn(CColumn::standardString("file ts.", "file timestamp", CAircraftModel::IndexFileTimestampFormattedYmdhms));
this->m_columns.addColumn(CColumn::standardString("icon", CAircraftModel::IndexIconPath)); this->m_columns.addColumn(CColumn::standardString("icon", CAircraftModel::IndexIconPath));
this->m_columns.addColumn(CColumn::standardString("changed", CAircraftModel::IndexUtcTimestampFormattedYmdhms)); this->m_columns.addColumn(CColumn::standardString("changed", CAircraftModel::IndexUtcTimestampFormattedYmdhms));

8
src/blackgui/models/aircraftmodellistmodel.h
View File

@@ -40,12 +40,12 @@ namespace BlackGui
enum AircraftModelMode enum AircraftModelMode
{ {
NotSet, NotSet,
OwnSimulatorModel, //!< models existing for my simulator OwnAircraftModelClient, //!< models existing for my simulator
OwnAircraftModelMappingTool, //!< models of my simulator, but in mapping mode
OwnModelSet, //!< own model set OwnModelSet, //!< own model set
OwnSimulatorModelMapping, //!< models of my simulator, but in mapping mode StashModel, //!< stashed models
Database, //!< Database entry Database, //!< Database entry
VPilotRuleModel, //!< vPilot rule turned into model VPilotRuleModel //!< vPilot rule turned into model
StashModel //!< stashed models
}; };
//! Constructor //! Constructor

6
src/blackgui/views/aircraftmodelview.cpp
View File

@@ -48,7 +48,7 @@ namespace BlackGui
CAircraftModelView::CAircraftModelView(QWidget *parent) : COrderableViewWithDbObjects(parent) CAircraftModelView::CAircraftModelView(QWidget *parent) : COrderableViewWithDbObjects(parent)
{ {
// default // default
this->standardInit(new CAircraftModelListModel(CAircraftModelListModel::OwnSimulatorModel, this)); this->standardInit(new CAircraftModelListModel(CAircraftModelListModel::OwnAircraftModelClient, this));
// shortcut // shortcut
new QShortcut(CShortcut::keyStash(), this, SLOT(ps_requestStash()), nullptr, Qt::WidgetShortcut); new QShortcut(CShortcut::keyStash(), this, SLOT(ps_requestStash()), nullptr, Qt::WidgetShortcut);
@@ -75,10 +75,10 @@ namespace BlackGui
case CAircraftModelListModel::VPilotRuleModel: case CAircraftModelListModel::VPilotRuleModel:
this->m_menus = MenuDefaultNoClear | MenuStashing; this->m_menus = MenuDefaultNoClear | MenuStashing;
break; break;
case CAircraftModelListModel::OwnSimulatorModelMapping: case CAircraftModelListModel::OwnAircraftModelMappingTool:
this->m_menus = MenuDefaultNoClear | MenuStashing | MenuLoadAndSave; this->m_menus = MenuDefaultNoClear | MenuStashing | MenuLoadAndSave;
break; break;
case CAircraftModelListModel::OwnSimulatorModel: case CAircraftModelListModel::OwnAircraftModelClient:
default: default:
this->m_menus = MenuDefaultNoClear | MenuBackend; this->m_menus = MenuDefaultNoClear | MenuBackend;
break; break;