From 9dc154fe7209bd2b4bfad50003a6a1dce18d3b1d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 18 Oct 2018 15:51:57 +0200 Subject: [PATCH] Adjusted wizard * always start with 1st page (legal) * select XSwiftBus copy page as default. --- src/blackgui/components/configurationwizard.cpp | 8 ++++---- src/blackgui/components/configurationwizard.ui | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/blackgui/components/configurationwizard.cpp b/src/blackgui/components/configurationwizard.cpp index 5d9275ef1..10f11132f 100644 --- a/src/blackgui/components/configurationwizard.cpp +++ b/src/blackgui/components/configurationwizard.cpp @@ -36,10 +36,10 @@ namespace BlackGui this->setButtonText(CustomButton1, "skip"); // no other versions, skip copy pages - if (!CDirectoryUtils::hasOtherSwiftDataDirectories()) - { - this->setStartId(ConfigSimulator); - } + // disabled afetr discussion with RP as it is confusing + // if (!CDirectoryUtils::hasOtherSwiftDataDirectories()) { this->setStartId(ConfigSimulator); } + + ui->tb_SimulatorSpecific->setCurrentWidget(ui->comp_InstallXSwiftBus); const QList ids = this->pageIds(); const auto mm = std::minmax_element(ids.begin(), ids.end()); diff --git a/src/blackgui/components/configurationwizard.ui b/src/blackgui/components/configurationwizard.ui index f0aaa9acc..f97e548fd 100644 --- a/src/blackgui/components/configurationwizard.ui +++ b/src/blackgui/components/configurationwizard.ui @@ -232,13 +232,16 @@ + + 1 + 0 0 - 75 - 64 + 668 + 445 @@ -262,8 +265,8 @@ 0 0 - 89 - 64 + 668 + 445