diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index 54d8891b98..535db177da 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -751,6 +751,14 @@
RelativePath=".\src\GameListCtrl.h"
>
+
+
+
+
@@ -759,6 +767,14 @@
RelativePath=".\src\Globals.h"
>
+
+
+
+
diff --git a/Source/Core/DolphinWX/src/Frame.cpp b/Source/Core/DolphinWX/src/Frame.cpp
index 4de8591b3b..0e304dbfe4 100644
--- a/Source/Core/DolphinWX/src/Frame.cpp
+++ b/Source/Core/DolphinWX/src/Frame.cpp
@@ -17,6 +17,7 @@
#include "Globals.h"
#include "Frame.h"
+#include "FileUtil.h"
#include "GameListCtrl.h"
#include "BootManager.h"
@@ -79,8 +80,9 @@ const wxEventType wxEVT_HOST_COMMAND = wxNewEventType();
BEGIN_EVENT_TABLE(CFrame, wxFrame)
EVT_MENU(wxID_OPEN, CFrame::OnOpen)
EVT_MENU(wxID_EXIT, CFrame::OnQuit)
-EVT_MENU(wxID_HELP, CFrame::OnAbout)
-EVT_MENU(IDM_ABOUT, CFrame::OnAbout)
+EVT_MENU(IDM_HELPWEBSITE, CFrame::OnHelp)
+EVT_MENU(IDM_HELPGOOGLECODE, CFrame::OnHelp)
+EVT_MENU(IDM_HELPABOUT, CFrame::OnHelp)
EVT_MENU(wxID_REFRESH, CFrame::OnRefresh)
EVT_MENU(IDM_PLAY, CFrame::OnPlay)
EVT_MENU(IDM_STOP, CFrame::OnStop)
@@ -210,7 +212,10 @@ void CFrame::CreateMenu()
wxMenu* helpMenu = new wxMenu;
/*helpMenu->Append(wxID_HELP, _T("&Help"));
re-enable when there's something useful to display*/
- helpMenu->Append(wxID_HELP, _T("&About..."));
+ helpMenu->Append(IDM_HELPWEBSITE, _T("&Dolphin web site"));
+ helpMenu->Append(IDM_HELPGOOGLECODE, _T("&Dolphin at Google Code"));
+ helpMenu->AppendSeparator();
+ helpMenu->Append(IDM_HELPABOUT, _T("&About..."));
m_pMenuBar->Append(helpMenu, _T("&Help"));
// Associate the menu bar with the frame
@@ -329,28 +334,33 @@ void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event))
}
-void CFrame::OnAbout(wxCommandEvent& WXUNUSED (event))
+void CFrame::OnHelp(wxCommandEvent& event)
{
- wxAboutDialogInfo info;
- info.AddDeveloper(_T("ector"));
- info.AddDeveloper(_T("F|RES"));
- info.AddDeveloper(_T("yaz0r"));
- info.AddDeveloper(_T("zerofrog"));
+ switch (event.GetId()) {
+ case IDM_HELPABOUT:
+ {
+ wxAboutDialogInfo info;
+ info.AddDeveloper(_T("ector"));
+ info.AddDeveloper(_T("F|RES"));
+ info.AddDeveloper(_T("yaz0r"));
+ info.AddDeveloper(_T("zerofrog"));
+ /* info.SetLicence(wxString::FromAscii(
+ "Dolphin Licence 1.0"
+ "#include GPL.TXT"));
+ */
-/* info.SetLicence(wxString::FromAscii(
- "Dolphin Licence 1.0"
- "#include GPL.TXT"));
- */
+ info.AddArtist(_T("miloszwl@miloszwl.com (miloszwl.deviantart.com)"));
- info.AddArtist(_T("miloszwl@miloszwl.com (miloszwl.deviantart.com)"));
-
- wxAboutBox(info);
-}
-
-
-void CFrame::OnHelp(wxCommandEvent& WXUNUSED (event))
-{
- wxMessageBox(wxString::FromAscii("missing OnHelp()"));
+ wxAboutBox(info);
+ break;
+ }
+ case IDM_HELPWEBSITE:
+ File::Launch("http://www.dolphin-emu.com/");
+ break;
+ case IDM_HELPGOOGLECODE:
+ File::Launch("http://code.google.com/p/dolphin-emu/");
+ break;
+ }
}
diff --git a/Source/Core/DolphinWX/src/Frame.h b/Source/Core/DolphinWX/src/Frame.h
index 634829724b..d31d389815 100644
--- a/Source/Core/DolphinWX/src/Frame.h
+++ b/Source/Core/DolphinWX/src/Frame.h
@@ -50,10 +50,8 @@ class CFrame
void RecreateToolbar();
void CreateMenu();
-
// event handler
void OnQuit(wxCommandEvent& event);
- void OnAbout(wxCommandEvent& event);
void OnHelp(wxCommandEvent& event);
void OnRefresh(wxCommandEvent& event);
void OnPluginOptions(wxCommandEvent& event);
diff --git a/Source/Core/DolphinWX/src/Globals.h b/Source/Core/DolphinWX/src/Globals.h
index f52e4b2368..3440b8a8b6 100644
--- a/Source/Core/DolphinWX/src/Globals.h
+++ b/Source/Core/DolphinWX/src/Globals.h
@@ -45,7 +45,9 @@ enum
IDM_HOST_MESSAGE,
IDM_BOOTING_STARTED,
IDM_BOOTING_ENDED,
- IDM_ABOUT,
+ IDM_HELPABOUT,
+ IDM_HELPWEBSITE,
+ IDM_HELPGOOGLECODE,
ID_TOOLBAR = 500,
LIST_CTRL = 1000
};