mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-01 21:56:43 +08:00
Ref T285, some smaller view refactoring
This commit is contained in:
@@ -106,7 +106,7 @@ namespace BlackGui
|
||||
bool highlightModelStrings() const;
|
||||
|
||||
//! 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:
|
||||
//! Request to stash if applicable
|
||||
|
||||
@@ -271,7 +271,7 @@ namespace BlackGui
|
||||
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 MenuCut:
|
||||
{
|
||||
@@ -609,7 +609,7 @@ namespace BlackGui
|
||||
m_filterWidget->show();
|
||||
}
|
||||
|
||||
void CViewBaseNonTemplate::ps_loadJsonAction()
|
||||
void CViewBaseNonTemplate::loadJsonAction()
|
||||
{
|
||||
if (!m_menus.testFlag(MenuLoad)) { return; }
|
||||
const CStatusMessage m = this->ps_loadJson();
|
||||
|
||||
@@ -438,9 +438,12 @@ namespace BlackGui
|
||||
//! Draw drop indicator
|
||||
virtual void drawDropIndicator(bool indicator) = 0;
|
||||
|
||||
//! Save JSON for action/menu, no return signatur
|
||||
//! Save JSON for action/menu, void return signatur
|
||||
void saveJsonAction();
|
||||
|
||||
//! Load JSON for action/menu, void return signatur
|
||||
void loadJsonAction();
|
||||
|
||||
//! Display the filter dialog
|
||||
void displayFilterDialog();
|
||||
|
||||
@@ -515,9 +518,6 @@ namespace BlackGui
|
||||
//! Load JSON
|
||||
virtual BlackMisc::CStatusMessage ps_loadJson() = 0;
|
||||
|
||||
//! Load JSON for action/menu, no return signatur
|
||||
void ps_loadJsonAction();
|
||||
|
||||
//! Save JSON
|
||||
virtual BlackMisc::CStatusMessage ps_saveJson() = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user