From ea8d18dffd94a202c093502462447250cb080582 Mon Sep 17 00:00:00 2001 From: Paul Jewell Date: Tue, 6 Oct 2015 06:23:32 +0100 Subject: [PATCH] Fixed remaining OpenPilot Wiki Links --- ground/gcs/src/libs/version_info/version_info.h | 2 +- .../plugins/importexport/importexportgadgetwidget.cpp | 5 +++-- .../plugins/uavsettingsimportexport/importsummary.cpp | 6 ++++-- ground/gcs/src/plugins/uploader/uploadergadgetwidget.cpp | 9 ++++++--- ground/gcs/src/plugins/welcome/qml/SitesPanel.qml | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ground/gcs/src/libs/version_info/version_info.h b/ground/gcs/src/libs/version_info/version_info.h index ede18e81c..7cd5b80b6 100644 --- a/ground/gcs/src/libs/version_info/version_info.h +++ b/ground/gcs/src/libs/version_info/version_info.h @@ -37,7 +37,7 @@ * @note If repository or git utility is unavailable, strings can be empty or be "None". * So do not assume they have some particular format when used, use them as strings only. * - * More info: http://wiki.openpilot.org/display/Doc/Building+and+Packaging+Overview + * More info: https://librepilot.atlassian.net/wiki/display/LPDOC/Building+and+Packaging+Overview */ class VersionInfo { public: diff --git a/ground/gcs/src/plugins/importexport/importexportgadgetwidget.cpp b/ground/gcs/src/plugins/importexport/importexportgadgetwidget.cpp index 4b17c5a9a..7df622e18 100644 --- a/ground/gcs/src/plugins/importexport/importexportgadgetwidget.cpp +++ b/ground/gcs/src/plugins/importexport/importexportgadgetwidget.cpp @@ -2,7 +2,8 @@ ****************************************************************************** * * @file importexportgadgetwidget.cpp - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. + * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015 + * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @see The GNU Public License (GPL) Version 3 * @brief Widget for Import/Export Plugin * @addtogroup GCSPlugins GCS Plugins @@ -202,7 +203,7 @@ void ImportExportGadgetWidget::importConfiguration(const QString & fileName) void ImportExportGadgetWidget::on_helpButton_clicked() { - QDesktopServices::openUrl(QUrl(tr("http://wiki.openpilot.org/x/OQBj"))); + QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Import+and+Export+Settings"))); } diff --git a/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp b/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp index 5ad6a9172..c70f028d5 100644 --- a/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp +++ b/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp @@ -2,7 +2,8 @@ ****************************************************************************** * * @file importsummary.cpp - * @author (C) 2011 The OpenPilot Team, http://www.openpilot.org + * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015 + * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2011 * @addtogroup GCSPlugins GCS Plugins * @{ * @addtogroup UAVSettingsImportExport UAVSettings Import/Export Plugin @@ -59,7 +60,8 @@ ImportSummaryDialog::~ImportSummaryDialog() */ void ImportSummaryDialog::openHelp() { - QDesktopServices::openUrl(QUrl(tr("http://wiki.openpilot.org/display/Doc/UAV+Settings+import-export"), QUrl::StrictMode)); + QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("UAV+Settings+Import-Export"), + QUrl::StrictMode)); } /* diff --git a/ground/gcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/gcs/src/plugins/uploader/uploadergadgetwidget.cpp index 81e5a879e..2db5c9a88 100644 --- a/ground/gcs/src/plugins/uploader/uploadergadgetwidget.cpp +++ b/ground/gcs/src/plugins/uploader/uploadergadgetwidget.cpp @@ -2,7 +2,8 @@ ****************************************************************************** * * @file uploadergadgetwidget.cpp - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. + * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015 + * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @addtogroup GCSPlugins GCS Plugins * @{ * @addtogroup YModemUploader YModem Serial Uploader Plugin @@ -550,7 +551,8 @@ void UploaderGadgetWidget::systemEraseBoot() commonSystemBoot(true, true); break; case QMessageBox::Help: - QDesktopServices::openUrl(QUrl(tr("http://wiki.openpilot.org/display/Doc/Erase+board+settings"), QUrl::StrictMode)); + QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Erase+board+settings"), + QUrl::StrictMode)); break; } } @@ -1148,7 +1150,8 @@ UploaderGadgetWidget::~UploaderGadgetWidget() void UploaderGadgetWidget::openHelp() { - QDesktopServices::openUrl(QUrl(tr("http://wiki.openpilot.org/x/AoBZ"), QUrl::StrictMode)); + QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Firmware+Tab"), + QUrl::StrictMode)); } int UploaderGadgetWidget::confirmEraseSettingsMessageBox() diff --git a/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml b/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml index d7e7f57cd..1510b75d9 100644 --- a/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml +++ b/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml @@ -22,7 +22,7 @@ Item { ListModel { id: sitesModel ListElement { link: "http://www.librepilot.org" } - ListElement { link: "http://wiki.openpilot.org" } + ListElement { link: "https://librepilot.atlassian.net/wiki/display/LPDOC/Welcome" } ListElement { link: "http://forum.librepilot.org" } ListElement { link: "http://github.com/librepilot/LibrePilot/pulls" } ListElement { link: "http://github.com/librepilot/LibrePilot/issues" }