From 48f65ee080a48c7f59a58621e6a2800cc688b46c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 14 Jul 2017 03:33:59 +0200 Subject: [PATCH] Ref T25, menu starting swift map --- src/swiftguistandard/swiftguistd.ui | 12 ++++++++++++ src/swiftguistandard/swiftguistdinit.cpp | 1 + src/swiftguistandard/swiftguistdmenus.cpp | 10 ++++++++++ 3 files changed, 23 insertions(+) diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui index 69a346370..bba1c9ab4 100644 --- a/src/swiftguistandard/swiftguistd.ui +++ b/src/swiftguistandard/swiftguistd.ui @@ -280,9 +280,16 @@ + + + Map + + + + @@ -499,6 +506,11 @@ Reset + + + Moving map + + diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp index 98c17ff1a..2317ff98f 100644 --- a/src/swiftguistandard/swiftguistdinit.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -208,6 +208,7 @@ void SwiftGuiStd::initGuiSignals() connect(ui->menu_WindowToggleNavigator, &QAction::triggered, this->m_navigator.data(), &CNavigatorDialog::toggleNavigator); connect(this->m_navigator.data(), &CNavigatorDialog::navigatorClosed, this, &SwiftGuiStd::ps_navigatorClosed); connect(ui->menu_InternalsPage, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); + connect(ui->menu_MovingMap, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); // command line / text messages connect(ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::displayInInfoWindow, ui->fr_CentralFrameInside, &COverlayMessagesFrame::showOverlayVariant); diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp index 66d5b6b34..b1f57b9ba 100644 --- a/src/swiftguistandard/swiftguistdmenus.cpp +++ b/src/swiftguistandard/swiftguistdmenus.cpp @@ -12,6 +12,7 @@ #include "blackgui/guiactionbind.h" #include "blackgui/guiapplication.h" #include "blackmisc/aviation/altitude.h" +#include "blackmisc/network/urllist.h" #include "blackmisc/pq/units.h" #include "swiftguistd.h" #include "ui_swiftguistd.h" @@ -22,12 +23,14 @@ #include #include #include +#include using namespace BlackGui; using namespace BlackCore; using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Network; void SwiftGuiStd::ps_onMenuClicked() { @@ -61,6 +64,12 @@ void SwiftGuiStd::ps_onMenuClicked() { ui->sw_MainMiddle->setCurrentIndex(MainPageInternals); } + else if (sender == ui->menu_MovingMap && sGui && !sGui->getGlobalSetup().getSwiftMapUrls().isEmpty()) + { + const CUrlList urls = sGui->getGlobalSetup().getSwiftMapUrls(); + const CUrl url = urls.getRandomUrl(); + QDesktopServices::openUrl(url); + } } void SwiftGuiStd::initMenus() @@ -72,6 +81,7 @@ void SwiftGuiStd::initMenus() sGui->addMenuWindow(*ui->menu_Window); sGui->addMenuHelp(*ui->menu_Help); ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas)); + ui->menu_MovingMap->setIcon(CIcons::swiftMap16()); // for hotkeys const QString swift(CGuiActionBindHandler::pathSwiftPilotClient());