flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-10 11:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove link to web map

Browse Source 
swift web map is not running anymore
This commit is contained in:
Lars Toenning
2022-06-20 23:04:23 +02:00
committed by Mat Sutcliffe
parent 737ab94f9a
commit 83edec5a90
5 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackcore/data/globalsetup.cpp
View File

@@ -69,7 +69,6 @@ namespace BlackCore::Data
"https://datastore.swift-project.org/page/swifthelpdispatcher.html",
"https://datastore.swift-project.net/page/swifthelpdispatcher.html"
};
m_mapUrls = CUrlList{ "map.swift-project.org/" };
m_ncepGlobalForecastSystemUrl = CUrl("http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_0p50.pl");
m_ncepGlobalForecastSystemUrl25 = CUrl("http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_0p25.pl");
@@ -268,11 +267,6 @@ namespace BlackCore::Data
return m_newsUrls;
}
const CUrlList &CGlobalSetup::getSwiftMapUrls() const
{
return m_mapUrls;
}
CServerList CGlobalSetup::getPredefinedServersPlusHardcodedServers() const
{
static const CServerList hardcoded(
@@ -331,9 +325,6 @@ namespace BlackCore::Data
% separator
% u"Help URLs: "
% m_onlineHelpUrls.toQString(i18n)
% separator
% u"swift map URLs: "
% getSwiftMapUrls().toQString(i18n)
% separator;
s +=
u"DB root directory: "
@@ -398,7 +389,6 @@ namespace BlackCore::Data
case IndexUpdateInfoFileUrls: return QVariant::fromValue(this->getSwiftUpdateInfoFileUrls());
case IndexSharedUrls: return QVariant::fromValue(m_sharedUrls);
case IndexNewsUrls: return QVariant::fromValue(m_newsUrls);
case IndexSwiftMapUrls: return QVariant::fromValue(m_mapUrls);
case IndexOnlineHelpUrls: return QVariant::fromValue(m_onlineHelpUrls);
case IndexCrashReportServerUrl: return QVariant::fromValue(m_crashReportServerUrl);
case IndexWasLoadedFromWeb: return QVariant::fromValue(m_wasLoadedFromWeb);
@@ -432,7 +422,6 @@ namespace BlackCore::Data
case IndexSharedUrls: m_sharedUrls = variant.value<CUrlList>(); break;
case IndexNewsUrls: m_newsUrls = variant.value<CUrlList>(); break;
case IndexOnlineHelpUrls: m_onlineHelpUrls = variant.value<CUrlList>(); break;
case IndexSwiftMapUrls: m_mapUrls = variant.value<CUrlList>(); break;
case IndexCrashReportServerUrl: m_crashReportServerUrl = variant.value<CUrl>(); break;
case IndexWasLoadedFromWeb: m_wasLoadedFromWeb = variant.toBool(); break;
case IndexWasLoadedFromFile: m_wasLoadedFromFile = variant.toBool(); break;

6
src/blackcore/data/globalsetup.h
View File

@@ -51,7 +51,6 @@ namespace BlackCore::Data
IndexVatsimMetars,
IndexVatsimData,
IndexSwiftDbFiles,
IndexSwiftMapUrls,
IndexBootstrapFileUrls,
IndexUpdateInfoFileUrls,
IndexNewsUrls,
@@ -190,9 +189,6 @@ namespace BlackCore::Data
//! \remark working URL evaluated at runtime, based on getOnlineHelpUrls
BlackMisc::Network::CUrl getHelpPageUrl(const QString &context = {}) const;
//! swift map URLs
const BlackMisc::Network::CUrlList &getSwiftMapUrls() const;
//! Predefined servers
const BlackMisc::Network::CServerList &getPredefinedServers() const { return m_predefinedServers; }
@@ -260,7 +256,6 @@ namespace BlackCore::Data
BlackMisc::Network::CUrlList m_sharedUrls; //!< where we can obtain shared info files such as bootstrap, ..
BlackMisc::Network::CUrlList m_newsUrls; //!< where we can obtain latest news
BlackMisc::Network::CUrlList m_onlineHelpUrls; //!< online help URLs
BlackMisc::Network::CUrlList m_mapUrls; //!< swift map URLs
BlackMisc::Network::CServerList m_predefinedServers; //!< Predefined servers loaded from setup file
BlackMisc::Network::CUrl m_ncepGlobalForecastSystemUrl; //!< NCEP GFS url 0.5 degree resolution
BlackMisc::Network::CUrl m_ncepGlobalForecastSystemUrl25; //!< NCEP GFS url 0.25 degree resolution
@@ -288,7 +283,6 @@ namespace BlackCore::Data
BLACK_METAMEMBER(sharedUrls),
BLACK_METAMEMBER(newsUrls),
BLACK_METAMEMBER(onlineHelpUrls),
BLACK_METAMEMBER(mapUrls),
BLACK_METAMEMBER(predefinedServers),
BLACK_METAMEMBER(development),
BLACK_METAMEMBER(mappingMinimumVersion),

6
src/swiftguistandard/swiftguistd.ui
View File

@@ -278,7 +278,6 @@
<property name="title">
<string>Tools</string>
</property>
<addaction name="menu_MovingMap"/>
<addaction name="menu_AutoPublish"/>
<addaction name="menu_ToggleIncognito"/>
<addaction name="menu_ModelBrowser"/>
@@ -499,11 +498,6 @@
<string>Reset</string>
</property>
</action>
<action name="menu_MovingMap">
<property name="text">
<string>Moving map</string>
</property>
</action>
<action name="menu_AutoPublish">
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">

1
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -258,7 +258,6 @@ void SwiftGuiStd::initGuiSignals()
connect(ui->menu_WindowToggleOnTop, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
connect(ui->menu_InternalsPage, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
connect(ui->menu_AutoPublish, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
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);

7
src/swiftguistandard/swiftguistdmenus.cpp
View File

@@ -94,12 +94,6 @@ void SwiftGuiStd::onMenuClicked()
this->displayInOverlayWindow(QStringLiteral("Incognito mode is %1").arg(boolToOnOff(sGui->isIncognito())), 5000);
}
}
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::attachSimulatorWindow()
@@ -152,7 +146,6 @@ void SwiftGuiStd::initMenus()
sGui->addMenuHelp(*ui->menu_Help);
ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
ui->menu_MovingMap->setIcon(CIcons::swiftMap16());
if (CBuildConfig::isLocalDeveloperDebugBuild() && ui->menu_File && ui->menu_File->actions().size() > 5)
{