From 8df362ef1f1ecb6a8a52145eff4ac47dbaa50164 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Sat, 10 Jul 2021 18:05:28 -0400 Subject: [PATCH 1/5] Add "Talk" link to "Help" menu. --- interface/src/Menu.cpp | 6 +++--- libraries/networking/src/NetworkingConstants.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 3a320cc628..47c0ee2966 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -827,10 +827,10 @@ Menu::Menu() { }); // Help > Vircadia Forum - /* action = addActionToQMenuAndActionHash(helpMenu, "Online Forums"); + action = addActionToQMenuAndActionHash(helpMenu, "Talk"); connect(action, &QAction::triggered, qApp, [] { - QDesktopServices::openUrl(NetworkingConstants::HELP_FORUM_URL)); - }); */ + QDesktopServices::openUrl(NetworkingConstants::TALK_DIRECTORY_URL)); + }); // Help > Scripting Reference action = addActionToQMenuAndActionHash(helpMenu, "Online Script Reference"); diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index d5ad90a6f4..5ea13064a0 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -71,10 +71,11 @@ namespace NetworkingConstants { const unsigned short STUN_SERVER_DEFAULT_PORT = 19302; #endif - const QUrl HELP_DOCS_URL { "https://docs.vircadia.dev" }; - const QUrl HELP_FORUM_URL { "https://forums.vircadia.dev" }; + const QUrl HELP_DOCS_URL{ "https://docs.vircadia.com" }; + const QUrl HELP_FORUM_URL{ "https://forum.vircadia.com" }; + const QUrl TALK_DIRECTORY_URL{ "https://vircadia.com/#talk" }; const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" }; - const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.dev/release-notes.html" }; + const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.com/release-notes.html" }; const QUrl HELP_BUG_REPORT_URL{ "https://github.com/vircadia/vircadia/issues" }; const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json"; From f62c964fdc1948b4927af4597ba53a00d5b31144 Mon Sep 17 00:00:00 2001 From: Kalila <69767640+digisomni@users.noreply.github.com> Date: Thu, 15 Jul 2021 22:16:32 -0400 Subject: [PATCH 2/5] Typo, remove double definitions of constants. --- libraries/networking/src/NetworkingConstants.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index bebeab4eb1..b19f6f2ce4 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -75,8 +75,6 @@ namespace NetworkingConstants { const QUrl HELP_DOCS_URL{ "https://docs.vircadia.com" }; const QUrl HELP_FORUM_URL{ "https://forum.vircadia.com" }; - const QUrl HELP_DOCS_URL { "https://docs.vircadia.com" }; - const QUrl HELP_FORUM_URL { "https://forum.vircadia.com" }; const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" }; const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.com/release-notes.html" }; const QUrl HELP_BUG_REPORT_URL{ "https://github.com/vircadia/vircadia/issues" }; From 030cdbf34876790eec7659a5eaf25faf2336c470 Mon Sep 17 00:00:00 2001 From: Kalila <69767640+digisomni@users.noreply.github.com> Date: Fri, 23 Jul 2021 20:43:33 -0400 Subject: [PATCH 3/5] Update Menu.cpp --- interface/src/Menu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 47c0ee2966..857316a4b7 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -827,9 +827,9 @@ Menu::Menu() { }); // Help > Vircadia Forum - action = addActionToQMenuAndActionHash(helpMenu, "Talk"); + action = addActionToQMenuAndActionHash(helpMenu, "Community Support"); connect(action, &QAction::triggered, qApp, [] { - QDesktopServices::openUrl(NetworkingConstants::TALK_DIRECTORY_URL)); + QDesktopServices::openUrl(NetworkingConstants::HELP_COMMUNITY_URL)); }); // Help > Scripting Reference From 10e8d9f6d8b6d4a2ad2d2907afd9c08804970ab5 Mon Sep 17 00:00:00 2001 From: Kalila <69767640+digisomni@users.noreply.github.com> Date: Fri, 23 Jul 2021 20:44:24 -0400 Subject: [PATCH 4/5] Update NetworkingConstants.h --- libraries/networking/src/NetworkingConstants.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index b19f6f2ce4..35180e5829 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -71,8 +71,7 @@ namespace NetworkingConstants { const unsigned short STUN_SERVER_DEFAULT_PORT = 19302; #endif - const QUrl TALK_DIRECTORY_URL{ "https://vircadia.com/#talk" }; - + const QUrl HELP_COMMUNITY_URL{ "https://vircadia.com/#community" }; const QUrl HELP_DOCS_URL{ "https://docs.vircadia.com" }; const QUrl HELP_FORUM_URL{ "https://forum.vircadia.com" }; const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" }; From 4b6d1e47e25f0ca2eeea62bb95552d8301b16a1e Mon Sep 17 00:00:00 2001 From: Kalila <69767640+digisomni@users.noreply.github.com> Date: Mon, 26 Jul 2021 01:10:55 +0200 Subject: [PATCH 5/5] Fix syntax error in Menu.cpp. --- interface/src/Menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 857316a4b7..760a7b1127 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -829,7 +829,7 @@ Menu::Menu() { // Help > Vircadia Forum action = addActionToQMenuAndActionHash(helpMenu, "Community Support"); connect(action, &QAction::triggered, qApp, [] { - QDesktopServices::openUrl(NetworkingConstants::HELP_COMMUNITY_URL)); + QDesktopServices::openUrl(NetworkingConstants::HELP_COMMUNITY_URL); }); // Help > Scripting Reference