ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch Forum with discord in help menu

This commit is contained in:
zilmar 2020-11-09 14:19:05 +10:30
parent 9fe3b4c9a6
commit 1256d80bad
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lang/English.pj.Lang
View File

@ -75,8 +75,10 @@
#180# "&Help" #180# "&Help"
#181# "About Conf&ig Files" #181# "About Conf&ig Files"
#182# "&About Project64" #182# "&About Project64"
#183# "Support &Forum" #183# "Support &Forum"
#184# "&Website" #184# "&Website"
#185# "&Support Project64"
#186# "&Discord"
//Current Save Slot menu //Current Save Slot menu
#190# "Default" #190# "Default"

2
Source/Project64-core/Multilanguage.h
View File

@ -105,9 +105,9 @@ enum LanguageStringID
MENU_HELP = 180, MENU_HELP = 180,
MENU_ABOUT_INI = 181, MENU_ABOUT_INI = 181,
MENU_ABOUT_PJ64 = 182, MENU_ABOUT_PJ64 = 182,
MENU_FORUM = 183,
MENU_WEBSITE = 184, MENU_WEBSITE = 184,
MENU_SUPPORT_PROJECT64 = 185, MENU_SUPPORT_PROJECT64 = 185,
MENU_DISCORD = 186,
//Current Save Slot menu //Current Save Slot menu
MENU_SLOT_DEFAULT = 190, MENU_SLOT_DEFAULT = 190,

4
Source/Project64-core/Multilanguage/LanguageClass.cpp
View File

@ -112,9 +112,9 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(MENU_HELP, "&Help"); DEF_STR(MENU_HELP, "&Help");
DEF_STR(MENU_ABOUT_INI, "About Conf&ig Files"); DEF_STR(MENU_ABOUT_INI, "About Conf&ig Files");
DEF_STR(MENU_ABOUT_PJ64, "&About Project64"); DEF_STR(MENU_ABOUT_PJ64, "&About Project64");
DEF_STR(MENU_FORUM, "Support &Forum");
DEF_STR(MENU_WEBSITE, "&Website"); DEF_STR(MENU_WEBSITE, "&Website");
DEF_STR(MENU_SUPPORT_PROJECT64, "Support Project64"); DEF_STR(MENU_SUPPORT_PROJECT64, "&Support Project64");
DEF_STR(MENU_DISCORD, "&Discord");
//Current Save Slot menu //Current Save Slot menu
DEF_STR(MENU_SLOT_DEFAULT, "Default"); DEF_STR(MENU_SLOT_DEFAULT, "Default");

4
Source/Project64/UserInterface/MainMenu.cpp
View File

@ -574,7 +574,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)((MenuID - ID_CURRENT_SAVE_1) + 1)); g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)((MenuID - ID_CURRENT_SAVE_1) + 1));
break; break;
case ID_HELP_SUPPORT_PROJECT64: OnSupportProject64(hWnd); break; case ID_HELP_SUPPORT_PROJECT64: OnSupportProject64(hWnd); break;
case ID_HELP_SUPPORTFORUM: ShellExecute(NULL, L"open", L"http://forum.pj64-emu.com/", NULL, NULL, SW_SHOWMAXIMIZED); break; case ID_HELP_DISCORD: ShellExecute(NULL, L"open", L"https://discord.gg/Cg3zquF", NULL, NULL, SW_SHOWMAXIMIZED); break;
case ID_HELP_WEBSITE: ShellExecute(NULL, L"open", L"http://www.pj64-emu.com", NULL, NULL, SW_SHOWMAXIMIZED); break; case ID_HELP_WEBSITE: ShellExecute(NULL, L"open", L"http://www.pj64-emu.com", NULL, NULL, SW_SHOWMAXIMIZED); break;
case ID_HELP_ABOUT: m_Gui->AboutBox(); break; case ID_HELP_ABOUT: m_Gui->AboutBox(); break;
case ID_HELP_ABOUTSETTINGFILES: m_Gui->AboutIniBox(); break; case ID_HELP_ABOUTSETTINGFILES: m_Gui->AboutIniBox(); break;
@ -1291,7 +1291,7 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
****************/ ****************/
MenuItemList HelpMenu; MenuItemList HelpMenu;
HelpMenu.push_back(MENU_ITEM(ID_HELP_SUPPORT_PROJECT64, MENU_SUPPORT_PROJECT64)); HelpMenu.push_back(MENU_ITEM(ID_HELP_SUPPORT_PROJECT64, MENU_SUPPORT_PROJECT64));
HelpMenu.push_back(MENU_ITEM(ID_HELP_SUPPORTFORUM, MENU_FORUM)); HelpMenu.push_back(MENU_ITEM(ID_HELP_DISCORD, MENU_DISCORD));
HelpMenu.push_back(MENU_ITEM(ID_HELP_WEBSITE, MENU_WEBSITE)); HelpMenu.push_back(MENU_ITEM(ID_HELP_WEBSITE, MENU_WEBSITE));
HelpMenu.push_back(MENU_ITEM(SPLITER)); HelpMenu.push_back(MENU_ITEM(SPLITER));
if (!inBasicMode) if (!inBasicMode)

2
Source/Project64/UserInterface/MainMenu.h
View File

@ -53,7 +53,7 @@ enum MainMenuID
ID_PROFILE_PROFILE, ID_PROFILE_RESETCOUNTER, ID_PROFILE_GENERATELOG, ID_PROFILE_PROFILE, ID_PROFILE_RESETCOUNTER, ID_PROFILE_GENERATELOG,
//Help Menu //Help Menu
ID_HELP_SUPPORT_PROJECT64, ID_HELP_SUPPORTFORUM, ID_HELP_WEBSITE, ID_HELP_ABOUTSETTINGFILES, ID_HELP_ABOUT, ID_HELP_SUPPORT_PROJECT64, ID_HELP_DISCORD, ID_HELP_WEBSITE, ID_HELP_ABOUTSETTINGFILES, ID_HELP_ABOUT,
}; };
class CMainMenu : class CMainMenu :