diff --git a/CMakeLists.txt b/CMakeLists.txt index e452aee77..9f134ff3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,8 @@ endif() ######## Set URLs ######## set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.") set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'") -set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help") +set(Launcher_WIKI_URL "https://prismlauncher.org/wiki/" CACHE STRING "URL that gets opened when the user clicks 'Launcher Help'") +set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help in a dialog window") set(Launcher_LOGIN_CALLBACK_URL "https://prismlauncher.org/successful-login" CACHE STRING "URL that gets opened when the user successfully logins.") set(Launcher_LEGACY_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE STRING "URL for legacy (<=1.5.2) FML Libraries.") diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in index 3c5c74e9f..0d842a3ba 100644 --- a/buildconfig/BuildConfig.cpp.in +++ b/buildconfig/BuildConfig.cpp.in @@ -105,6 +105,7 @@ Config::Config() NEWS_RSS_URL = "@Launcher_NEWS_RSS_URL@"; NEWS_OPEN_URL = "@Launcher_NEWS_OPEN_URL@"; + WIKI_URL = "@Launcher_WIKI_URL@"; HELP_URL = "@Launcher_HELP_URL@"; LOGIN_CALLBACK_URL = "@Launcher_LOGIN_CALLBACK_URL@"; IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@"; diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h index 475cff4f5..a1719f361 100644 --- a/buildconfig/BuildConfig.h +++ b/buildconfig/BuildConfig.h @@ -128,7 +128,12 @@ class Config { QString NEWS_OPEN_URL; /** - * URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help + * URL that gets opened when the user clicks 'Launcher Help' + */ + QString WIKI_URL; + + /** + * URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help in a dialog window */ QString HELP_URL; diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 0f5fd9432..44b570517 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -1005,13 +1005,13 @@ void MainWindow::processURLs(QList urls) receivedData.insert(it->first, it->second); emit APPLICATION->oauthReplyRecieved(receivedData); continue; - } else if ((url.scheme() == "prismlauncher" || url.scheme() == BuildConfig.LAUNCHER_APP_BINARY_NAME) + } else if ((url.scheme() == "prismlauncher" || url.scheme() == BuildConfig.LAUNCHER_APP_BINARY_NAME) && isExternalURLImport) { // PrismLauncher URL protocol modpack import // works for any prism fork // preferred import format: prismlauncher://import?url=ENCODED const auto host = url.host().toLower(); - const auto path = url.path(); + const auto path = url.path(); QString encodedTarget; @@ -1075,7 +1075,7 @@ void MainWindow::processURLs(QList urls) if (res != QMessageBox::Yes) { continue; } - + dl_url = target; } else { dl_url = url; @@ -1435,7 +1435,7 @@ void MainWindow::on_actionAddToPATH_triggered() void MainWindow::on_actionOpenWiki_triggered() { - DesktopServices::openUrl(QUrl(BuildConfig.HELP_URL.arg(""))); + DesktopServices::openUrl(QUrl(BuildConfig.WIKI_URL)); } void MainWindow::on_actionMoreNews_triggered() diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui index ff1b4a25a..353788518 100644 --- a/launcher/ui/MainWindow.ui +++ b/launcher/ui/MainWindow.ui @@ -721,7 +721,7 @@ - %1 &Help + %1 &Wiki Open the %1 wiki