mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-06-29 01:54:20 +03:00
fix: open correct wiki URL when opened from the Help *menu*
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
parent
6b3a431996
commit
71c0017056
5 changed files with 11 additions and 4 deletions
|
|
@ -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.")
|
||||
|
||||
|
|
|
|||
|
|
@ -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@";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -1357,7 +1357,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()
|
||||
|
|
|
|||
|
|
@ -721,7 +721,7 @@
|
|||
<iconset theme="help"/>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>%1 &Help</string>
|
||||
<string>%1 &Wiki</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Open the %1 wiki</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue