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

Ref T285, some smaller view refactoring

Browse Source
This commit is contained in:
Klaus Basan
2018-07-20 01:30:41 +02:00
parent 07759ed539
commit 507167fb8b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/views/aircraftmodelview.h
View File

@@ -106,7 +106,7 @@ namespace BlackGui
bool highlightModelStrings() const; bool highlightModelStrings() const;
//! Loading data will be restricted to simulator //! Loading data will be restricted to simulator
void setSimulatorForLoading(const BlackMisc::Simulation::CSimulatorInfo &sim) { m_loadingRequiresSimulator = sim; } void setSimulatorForLoading(const BlackMisc::Simulation::CSimulatorInfo &simulator) { m_loadingRequiresSimulator = simulator; }
signals: signals:
//! Request to stash if applicable //! Request to stash if applicable

4
src/blackgui/views/viewbase.cpp
View File

@@ -271,7 +271,7 @@ namespace BlackGui
break; break;
} }
case MenuMaterializeFilter: { ma.addAction(CIcons::tableRelationship16(), "Materialize filtered data", CMenuAction::pathViewFilter(), { this, &CViewBaseNonTemplate::materializeFilter }); break; } case MenuMaterializeFilter: { ma.addAction(CIcons::tableRelationship16(), "Materialize filtered data", CMenuAction::pathViewFilter(), { this, &CViewBaseNonTemplate::materializeFilter }); break; }
case MenuLoad: { ma.addAction(CIcons::disk16(), "Load from file", CMenuAction::pathViewLoadSave(), { this, &CViewBaseNonTemplate::ps_loadJsonAction }); break; } case MenuLoad: { ma.addAction(CIcons::disk16(), "Load from file", CMenuAction::pathViewLoadSave(), { this, &CViewBaseNonTemplate::loadJsonAction }); break; }
case MenuSave: { ma.addAction(CIcons::disk16(), "Save data in file", CMenuAction::pathViewLoadSave(), { this, &CViewBaseNonTemplate::saveJsonAction }, CShortcut::keySaveViews()); break; } case MenuSave: { ma.addAction(CIcons::disk16(), "Save data in file", CMenuAction::pathViewLoadSave(), { this, &CViewBaseNonTemplate::saveJsonAction }, CShortcut::keySaveViews()); break; }
case MenuCut: case MenuCut:
{ {
@@ -609,7 +609,7 @@ namespace BlackGui
m_filterWidget->show(); m_filterWidget->show();
} }
void CViewBaseNonTemplate::ps_loadJsonAction() void CViewBaseNonTemplate::loadJsonAction()
{ {
if (!m_menus.testFlag(MenuLoad)) { return; } if (!m_menus.testFlag(MenuLoad)) { return; }
const CStatusMessage m = this->ps_loadJson(); const CStatusMessage m = this->ps_loadJson();

8
src/blackgui/views/viewbase.h
View File

@@ -438,9 +438,12 @@ namespace BlackGui
//! Draw drop indicator //! Draw drop indicator
virtual void drawDropIndicator(bool indicator) = 0; virtual void drawDropIndicator(bool indicator) = 0;
//! Save JSON for action/menu, no return signatur //! Save JSON for action/menu, void return signatur
void saveJsonAction(); void saveJsonAction();
//! Load JSON for action/menu, void return signatur
void loadJsonAction();
//! Display the filter dialog //! Display the filter dialog
void displayFilterDialog(); void displayFilterDialog();
@@ -515,9 +518,6 @@ namespace BlackGui
//! Load JSON //! Load JSON
virtual BlackMisc::CStatusMessage ps_loadJson() = 0; virtual BlackMisc::CStatusMessage ps_loadJson() = 0;
//! Load JSON for action/menu, no return signatur
void ps_loadJsonAction();
//! Save JSON //! Save JSON
virtual BlackMisc::CStatusMessage ps_saveJson() = 0; virtual BlackMisc::CStatusMessage ps_saveJson() = 0;