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

refs #912, static utility function lastStepSkipped for configuration wizard

Browse Source
This commit is contained in:
Klaus Basan
2017-03-19 22:58:32 +01:00
committed by Mathew Sutcliffe
parent d214739912
commit 3575eed37b
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/components/configurationwizard.cpp
View File

@@ -50,6 +50,12 @@ namespace BlackGui
return m_skipped;
}
bool CConfigurationWizard::lastWizardStepSkipped(const QWizard *standardWizard)
{
const CConfigurationWizard *wizard = qobject_cast<const CConfigurationWizard *>(standardWizard);
return wizard && wizard->lastStepSkipped();
}
void CConfigurationWizard::wizardCurrentIdChanged(int id)
{
const int previousId = m_previousId;

3
src/blackgui/components/configurationwizard.h
View File

@@ -48,6 +48,9 @@ namespace BlackGui
//! Was the last step skipped?
bool lastStepSkipped() const;
//! Static version of CConfigurationWizard::lastStepSkipped
static bool lastWizardStepSkipped(const QWizard *standardWizard);
private:
//! The current page has changed
void wizardCurrentIdChanged(int id);

6
src/blackgui/components/copyconfigurationcomponent.cpp
View File

@@ -252,11 +252,7 @@ namespace BlackGui
bool CCopyConfigurationWizardPage::validatePage()
{
CConfigurationWizard *wizard = qobject_cast<CConfigurationWizard *>(this->wizard());
Q_ASSERT_X(m_config, Q_FUNC_INFO, "Missing config");
Q_ASSERT_X(wizard, Q_FUNC_INFO, "No wizard");
if (wizard->lastStepSkipped()) { return true; }
if (CConfigurationWizard::lastWizardStepSkipped(this->wizard())) { return true; }
m_config->copySelectedFiles();
return true;
}