From 9ee0b173c6b542873e8c0385310463f1d801a072 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 21 Mar 2017 16:32:50 +0100 Subject: [PATCH] refs #906, wizard improvements * fixed text * only init copy wizard when using "back" button --- src/blackgui/components/configurationwizard.cpp | 5 ++--- src/blackgui/components/initialdataloadcomponent.ui | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/blackgui/components/configurationwizard.cpp b/src/blackgui/components/configurationwizard.cpp index e2860e59c..89aa5756a 100644 --- a/src/blackgui/components/configurationwizard.cpp +++ b/src/blackgui/components/configurationwizard.cpp @@ -63,16 +63,15 @@ namespace BlackGui const bool skipped = m_skipped; m_previousId = id; // update m_skipped = false; // reset - Q_UNUSED(backward); Q_UNUSED(skipped); const QWizardPage *page = this->currentPage(); - if (page == ui->wp_CopyCaches) + if (backward && page == ui->wp_CopyCaches) { ui->comp_CopyCaches->setCacheMode(); ui->comp_CopyCaches->initCurrentDirectories(true); } - else if (page == ui->wp_CopySettings) + else if (backward && page == ui->wp_CopySettings) { ui->comp_CopySettings->setSettingsMode(); ui->comp_CopySettings->initCurrentDirectories(true); diff --git a/src/blackgui/components/initialdataloadcomponent.ui b/src/blackgui/components/initialdataloadcomponent.ui index e8cdf6c05..c5e1a47de 100644 --- a/src/blackgui/components/initialdataloadcomponent.ui +++ b/src/blackgui/components/initialdataloadcomponent.ui @@ -54,7 +54,7 @@ - <html><head/><body><p>We recommend to download an initial data set. This may some time, but then you can start to use all tool straight away with full functionality.</p></body></html> + <html><head/><body><p>We recommend to download an initial data set. This may take some time, but then you can start to use all tools with full functionality.</p></body></html> true