diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc
index f2bec0c02..7d0a3b361 100644
--- a/src/blackmisc/blackmisc.qrc
+++ b/src/blackmisc/blackmisc.qrc
@@ -527,5 +527,7 @@
icons/misc/skull128.png
icons/misc/skull256.png
icons/misc/skull512.png
+ icons/misc/toolWizard64.png
+ icons/misc/toolWizard128.png
diff --git a/src/blackmisc/icons/misc/toolWizard128.png b/src/blackmisc/icons/misc/toolWizard128.png
new file mode 100644
index 000000000..302f929a9
Binary files /dev/null and b/src/blackmisc/icons/misc/toolWizard128.png differ
diff --git a/src/blackmisc/icons/misc/toolWizard64.png b/src/blackmisc/icons/misc/toolWizard64.png
new file mode 100644
index 000000000..2c3858dfc
Binary files /dev/null and b/src/blackmisc/icons/misc/toolWizard64.png differ
diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index 3d3a4c59e..84e5f9b2e 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -10,6 +10,7 @@
#include "swiftlauncher.h"
#include "ui_swiftlauncher.h"
#include "blackconfig/buildconfig.h"
+#include "blackgui/components/configurationwizard.h"
#include "blackgui/guiapplication.h"
#include "blackgui/stylesheetutility.h"
#include "blackcore/context/contextapplicationproxy.h"
@@ -29,6 +30,7 @@
using namespace BlackConfig;
using namespace BlackGui;
+using namespace BlackGui::Components;
using namespace BlackCore;
using namespace BlackCore::Application;
using namespace BlackCore::Context;
@@ -50,6 +52,7 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
connect(ui->tb_SwiftGui, &QPushButton::pressed, this, &CSwiftLauncher::ps_startButtonPressed);
connect(ui->tb_Database, &QPushButton::pressed, this, &CSwiftLauncher::ps_startButtonPressed);
connect(ui->tb_BackToMain, &QToolButton::pressed, this, &CSwiftLauncher::ps_showMainPage);
+ connect(ui->tb_ConfigurationWizard, &QToolButton::pressed, this, &CSwiftLauncher::ps_startWizard);
connect(ui->tb_Launcher, &QToolBox::currentChanged, this, &CSwiftLauncher::ps_tabChanged);
// use version signal as trigger for completion
@@ -521,3 +524,12 @@ void CSwiftLauncher::ps_checkRunningApplicationsAndCore()
ui->tb_SwiftMappingTool->setEnabled(!foundLocalMappingTool && m_startMappingToolWaitCycles < 1);
ui->tb_SwiftGui->setEnabled(!foundLocalPilotClientGui && m_startGuiWaitCycles < 1);
}
+
+void CSwiftLauncher::ps_startWizard()
+{
+ if (!m_wizard)
+ {
+ m_wizard.reset(new CConfigurationWizard(this));
+ }
+ m_wizard->show();
+}
diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h
index 9a6b20400..08701abfe 100644
--- a/src/swiftlauncher/swiftlauncher.h
+++ b/src/swiftlauncher/swiftlauncher.h
@@ -26,6 +26,7 @@
#include
namespace Ui { class CSwiftLauncher; }
+namespace BlackGui { namespace Components { class CConfigurationWizard; }}
/*!
* swift launcher tool
@@ -76,6 +77,7 @@ protected:
private:
QScopedPointer ui;
+ QScopedPointer m_wizard;
BlackMisc::CData m_updateInfo { this, &CSwiftLauncher::ps_changedUpdateInfoCache }; //!< version cache
BlackMisc::CData m_setup { this }; //! setup, ie last user selection
QString m_executable;
@@ -183,6 +185,9 @@ private slots:
//! Check if applicationas are already running
void ps_checkRunningApplicationsAndCore();
+
+ //! Start the configuration wizard
+ void ps_startWizard();
};
#endif // guard
diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui
index 20ca518aa..068e5ce76 100644
--- a/src/swiftlauncher/swiftlauncher.ui
+++ b/src/swiftlauncher/swiftlauncher.ui
@@ -722,52 +722,18 @@ p, li { white-space: pre-wrap; }
Start application
-
- -
-
+
+
-
+
+
+ start swift data (the mapping tool)
+
mapping tool
-
-
- -
-
-
- goto swift DB
-
-
-
- -
-
-
- start swift core
-
-
- swift core
-
- :/own/icons/own/swift3D/sw3DOrange-256.png:/own/icons/own/swift3D/sw3DOrange-256.png
-
-
-
- 64
- 64
-
-
-
-
- -
-
-
- start swift GUI
-
-
- swift GUI
-
-
-
- :/own/icons/own/swift3D/sw3DBlue-256.png:/own/icons/own/swift3D/sw3DBlue-256.png
+ :/own/icons/own/swift3D/sw3DGreen-256.png:/own/icons/own/swift3D/sw3DGreen-256.png
@@ -791,23 +757,37 @@ p, li { white-space: pre-wrap; }
- 64
- 64
+ 48
+ 48
- -
-
-
- start swift data (the mapping tool)
-
+
-
+
mapping tool
+
+
+ -
+
+
+ core
+
+
+
+ -
+
+
+ start swift GUI
+
+
+ swift GUI
+
- :/own/icons/own/swift3D/sw3DGreen-256.png:/own/icons/own/swift3D/sw3DGreen-256.png
+ :/own/icons/own/swift3D/sw3DBlue-256.png:/own/icons/own/swift3D/sw3DBlue-256.png
@@ -824,28 +804,56 @@ p, li { white-space: pre-wrap; }
- -
-
+
-
+
+
+ start swift core
+
- core
+ swift core
+
+
+
+ :/own/icons/own/swift3D/sw3DOrange-256.png:/own/icons/own/swift3D/sw3DOrange-256.png
+
+
+
+ 64
+ 64
+
-
-
-
- Qt::Horizontal
+
+
+ ...
-
- QSizePolicy::Fixed
+
+
+ :/misc/icons/misc/toolWizard128.png:/misc/icons/misc/toolWizard128.png
-
+
- 25
- 20
+ 48
+ 48
-
+
+
+ -
+
+
+ config
+
+
+
+ -
+
+
+ goto DB
+
+