From f4941b2189dc9d451f7924cdbebba1af74c85748 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 21 Feb 2017 03:34:33 +0100 Subject: [PATCH] refs #886, configuration button in launcher --- src/blackmisc/blackmisc.qrc | 2 + src/blackmisc/icons/misc/toolWizard128.png | Bin 0 -> 13761 bytes src/blackmisc/icons/misc/toolWizard64.png | Bin 0 -> 3681 bytes src/swiftlauncher/swiftlauncher.cpp | 12 ++ src/swiftlauncher/swiftlauncher.h | 5 + src/swiftlauncher/swiftlauncher.ui | 130 +++++++++++---------- 6 files changed, 88 insertions(+), 61 deletions(-) create mode 100644 src/blackmisc/icons/misc/toolWizard128.png create mode 100644 src/blackmisc/icons/misc/toolWizard64.png 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 0000000000000000000000000000000000000000..302f929a95bb7856f5a8cb21c0241712ec1f0910 GIT binary patch literal 13761 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 literal 0 HcmV?d00001 diff --git a/src/blackmisc/icons/misc/toolWizard64.png b/src/blackmisc/icons/misc/toolWizard64.png new file mode 100644 index 0000000000000000000000000000000000000000..2c3858dfcd9a23a55279e5e99f6c2671cad8b729 GIT binary patch literal 3681 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 literal 0 HcmV?d00001 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 + +