Ref T731, moved QML map in dialog

* initial structure
* embedded a QQuickWidget in dialog

src/swiftguistandard/swiftguistandard.pro

@@ -1,6 +1,6 @@
 load(common_pre)
 
-QT += core dbus network widgets
+QT += core dbus network widgets quickwidgets
 
 TARGET = swiftguistd
 TEMPLATE = app

src/swiftguistandard/swiftguistd.cpp

@@ -12,6 +12,7 @@
 #include "blackgui/components/logcomponent.h"
 #include "blackgui/components/dbloaddatadialog.h"
 #include "blackgui/components/autopublishdialog.h"
+#include "blackgui/components/afvmapdialog.h"
 #include "blackgui/components/logindialog.h"
 #include "blackgui/components/modelbrowserdialog.h"
 #include "blackgui/components/settingscomponent.h"
@@ -305,7 +306,7 @@ void SwiftGuiStd::onKickedFromNetwork(const QString &kickMessage)
 
 void SwiftGuiStd::onConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
 {
-    Q_UNUSED(from);
+    Q_UNUSED(from)
     this->updateGuiStatusInformation();
 
     // sounds
@@ -424,13 +425,13 @@ void SwiftGuiStd::onToggledWindowsOnTop(bool onTop)
 void SwiftGuiStd::onCurrentMainWidgetChanged(int currentIndex)
 {
     emit this->currentMainInfoAreaChanged(ui->sw_MainMiddle->currentWidget());
-    Q_UNUSED(currentIndex);
+    Q_UNUSED(currentIndex)
 }
 
 void SwiftGuiStd::onChangedMainInfoAreaFloating(bool floating)
 {
     // code for whole floating area goes here
-    Q_UNUSED(floating);
+    Q_UNUSED(floating)
 }
 
 void SwiftGuiStd::onRequestedConsoleMessage(const QString &logMsg, bool clear)
@@ -632,3 +633,12 @@ bool SwiftGuiStd::startModelBrowser()
     return true;
 }
 
+bool SwiftGuiStd::startAFVMap()
+{
+    if (!m_mapDialog)
+    {
+        m_mapDialog.reset(new CAfvMapDialog(this));
+    }
+    m_mapDialog->exec();
+    return true;
+}

src/swiftguistandard/swiftguistd.h

@@ -56,6 +56,7 @@ namespace BlackGui
         class CAutoPublishDialog;
         class CLoginDialog;
         class CModelBrowserDialog;
+        class CAfvMapDialog;
     }
 }
 namespace Ui { class SwiftGuiStd; }
@@ -118,6 +119,7 @@ private:
     QScopedPointer<BlackGui::Components::CAutoPublishDialog>  m_autoPublishDialog; //!< auto publish dialog
     QScopedPointer<BlackGui::Components::CLoginDialog>        m_loginDialog;       //!< login dialog
     QScopedPointer<BlackGui::Components::CModelBrowserDialog> m_modelBrower;       //!< model browser
+    QScopedPointer<BlackGui::Components::CAfvMapDialog>       m_mapDialog;         //!< map dialog
     QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
     BlackMisc::CData<BlackMisc::Simulation::Data::TLastAutoPublish> m_lastAutoPublish { this };
     BlackCore::CActionBind m_actionPtt { BlackMisc::Input::pttHotkeyAction(), BlackMisc::CIcons::radio16(), this, &SwiftGuiStd::onPttChanged };
@@ -310,6 +312,9 @@ private:
     //! Start the model browser
     bool startModelBrowser();
 
+    //! Start AFV map
+    bool startAFVMap();
+
     //! Request overlay inline text message @{
     void onShowOverlayVariant(const BlackMisc::CVariant &variant, int durationMs);
     void onShowOverlayInlineTextMessageTab(BlackGui::Components::TextMessageTab tab);

src/swiftguistandard/swiftguistd.ui

@@ -282,6 +282,7 @@
     <addaction name="menu_AutoPublish"/>
     <addaction name="menu_ToggleIncognito"/>
     <addaction name="menu_ModelBrowser"/>
+    <addaction name="menu_AfvMap"/>
    </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_Window"/>
@@ -505,7 +506,7 @@
   </action>
   <action name="menu_AutoPublish">
    <property name="icon">
-    <iconset resource="../blackmisc/blackmisc.qrc">
+    <iconset>
      <normaloff>:/diagona/icons/diagona/icons/paper-plane--plus.png</normaloff>:/diagona/icons/diagona/icons/paper-plane--plus.png</iconset>
    </property>
    <property name="text">
@@ -522,6 +523,11 @@
     <string>Model brower</string>
    </property>
   </action>
+  <action name="menu_AfvMap">
+   <property name="text">
+    <string>AFV map</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -568,9 +574,7 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../blackmisc/blackmisc.qrc"/>
- </resources>
+ <resources/>
  <connections/>
  <slots>
   <slot>setMainPage()</slot>

src/swiftguistandard/swiftguistdinit.cpp

@@ -226,6 +226,7 @@ void SwiftGuiStd::initGuiSignals()
     connect(ui->menu_MovingMap,         &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
     connect(ui->menu_ToggleIncognito,   &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
     connect(ui->menu_ModelBrowser,      &QAction::triggered, this, &SwiftGuiStd::startModelBrowser, Qt::QueuedConnection);
+    connect(ui->menu_AfvMap,            &QAction::triggered, this, &SwiftGuiStd::startAFVMap, Qt::QueuedConnection);
 
     connect(m_navigator.data(), &CNavigatorDialog::navigatorClosed, this, &SwiftGuiStd::onNavigatorClosed, Qt::QueuedConnection);
     m_navigator->setMainWindow(this);

src/swiftguistandard/swiftguistdmenus.cpp

@@ -168,7 +168,7 @@ void SwiftGuiStd::initMenus()
     // for hotkeys
     const QString swift(CGuiActionBindHandler::pathSwiftPilotClient());
     static const CActionBind swiftRoot(swift, CIcons::swift16()); // inserts action for root folder
-    Q_UNUSED(swiftRoot);
+    Q_UNUSED(swiftRoot)
     m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_InfoAreas, swift + "Info areas"));
     m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_File, swift + "File"));
     m_menuHotkeyHandlers.append(CGuiActionBindHandler::bindMenu(ui->menu_Window, swift + "Window"));