Merge pull request #507 from Shadoxfix/master

Update references of Google Code to GitHub and update copyright year.
This commit is contained in:
Tony Wasserka 2014-06-18 23:53:21 +02:00
commit dccd9ead7d
4 changed files with 7 additions and 7 deletions

View File

@ -32,7 +32,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
wxBitmap(iDolphinLogo));
const wxString Text = wxString::Format(_("Dolphin %s\n"
"Copyright (c) 2003-2013+ Dolphin Team\n"
"Copyright (c) 2003-2014+ Dolphin Team\n"
"\n"
"Branch: %s\n"
"Revision: %s\n"
@ -43,7 +43,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
"Today Dolphin is an open source project with many\n"
"contributors, too many to list.\n"
"If interested, just go check out the project page at\n"
"http://code.google.com/p/dolphin-emu/ .\n"
"https://github.com/dolphin-emu/dolphin/ .\n"
"\n"
"Special thanks to Bushing, Costis, CrowTRobo,\n"
"Marcan, Segher, Titanik, or9 and Hotquik for their\n"

View File

@ -195,7 +195,7 @@ EVT_MENU(wxID_OPEN, CFrame::OnOpen)
EVT_MENU(wxID_EXIT, CFrame::OnQuit)
EVT_MENU(IDM_HELPWEBSITE, CFrame::OnHelp)
EVT_MENU(IDM_HELPONLINEDOCS, CFrame::OnHelp)
EVT_MENU(IDM_HELPGOOGLECODE, CFrame::OnHelp)
EVT_MENU(IDM_HELPGITHUB, CFrame::OnHelp)
EVT_MENU(wxID_ABOUT, CFrame::OnHelp)
EVT_MENU(wxID_REFRESH, CFrame::OnRefresh)
EVT_MENU(IDM_PLAY, CFrame::OnPlay)

View File

@ -351,7 +351,7 @@ void CFrame::CreateMenu()
// helpMenu->Append(wxID_HELP, _("&Help"));
helpMenu->Append(IDM_HELPWEBSITE, _("Dolphin &Web Site"));
helpMenu->Append(IDM_HELPONLINEDOCS, _("Online &Documentation"));
helpMenu->Append(IDM_HELPGOOGLECODE, _("Dolphin at &Google Code"));
helpMenu->Append(IDM_HELPGITHUB, _("Dolphin at &GitHub"));
helpMenu->AppendSeparator();
helpMenu->Append(wxID_ABOUT, _("&About..."));
m_MenuBar->Append(helpMenu, _("&Help"));
@ -1324,8 +1324,8 @@ void CFrame::OnHelp(wxCommandEvent& event)
case IDM_HELPONLINEDOCS:
WxUtils::Launch("https://dolphin-emu.org/docs/guides/");
break;
case IDM_HELPGOOGLECODE:
WxUtils::Launch("https://code.google.com/p/dolphin-emu/");
case IDM_HELPGITHUB:
WxUtils::Launch("https://github.com/dolphin-emu/dolphin/");
break;
}
}

View File

@ -118,7 +118,7 @@ enum
IDM_HELPWEBSITE, // Help menu
IDM_HELPONLINEDOCS,
IDM_HELPGOOGLECODE,
IDM_HELPGITHUB,
IDM_CONFIG_GFX_BACKEND,
IDM_CONFIG_DSP_EMULATOR,