diff options
| author | Zhuowei Zhang <zhuoweizhang@yahoo.com> | 2014-06-23 21:07:46 -0700 |
|---|---|---|
| committer | Zhuowei Zhang <zhuoweizhang@yahoo.com> | 2014-06-30 12:06:45 -0700 |
| commit | 25bd5e237bd4394ddba55db74413efa74805157e (patch) | |
| tree | 211514cf20db88f50ec5c45d70122a06b90ad596 /Source/Core | |
| parent | fb18b8b6892ab8411ce0cdf0a6c56742f30c3742 (diff) | |
Add Change Disc option to the right-click menu in the game list. For issue 7411.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/GameListCtrl.cpp | 16 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/GameListCtrl.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Globals.h | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 31b8dcdfc6..901336b657 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -52,6 +52,7 @@ #include "Core/CoreParameter.h" #include "Core/Movie.h" #include "Core/Boot/Boot.h" +#include "Core/HW/DVDInterface.h" #include "DiscIO/Blob.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeCreator.h" @@ -209,6 +210,7 @@ BEGIN_EVENT_TABLE(CGameListCtrl, wxListCtrl) EVT_MENU(IDM_MULTICOMPRESSGCM, CGameListCtrl::OnMultiCompressGCM) EVT_MENU(IDM_MULTIDECOMPRESSGCM, CGameListCtrl::OnMultiDecompressGCM) EVT_MENU(IDM_DELETEGCM, CGameListCtrl::OnDeleteGCM) + EVT_MENU(IDM_LIST_CHANGEDISC, CGameListCtrl::OnChangeDisc) END_EVENT_TABLE() CGameListCtrl::CGameListCtrl(wxWindow* parent, const wxWindowID id, const @@ -903,6 +905,12 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event) { popupMenu->Append(IDM_LIST_INSTALLWAD, _("Install to Wii Menu")); } + if (selected_iso->GetPlatform() == GameListItem::GAMECUBE_DISC || + selected_iso->GetPlatform() == GameListItem::WII_DISC) + { + wxMenuItem* changeDiscItem = popupMenu->Append(IDM_LIST_CHANGEDISC, _("Change &Disc")); + changeDiscItem->Enable(Core::IsRunning()); + } PopupMenu(popupMenu); } @@ -1263,6 +1271,14 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) Update(); } +void CGameListCtrl::OnChangeDisc(wxCommandEvent& WXUNUSED(event)) +{ + const GameListItem *iso = GetSelectedISO(); + if (!iso || !Core::IsRunning()) + return; + DVDInterface::ChangeDisc(WxStrToStr(iso->GetFileName())); +} + void CGameListCtrl::OnSize(wxSizeEvent& event) { if (lastpos == event.GetSize()) diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h index 0b71003a08..03aa01c93f 100644 --- a/Source/Core/DolphinWX/GameListCtrl.h +++ b/Source/Core/DolphinWX/GameListCtrl.h @@ -104,6 +104,7 @@ private: void OnMultiCompressGCM(wxCommandEvent& event); void OnMultiDecompressGCM(wxCommandEvent& event); void OnInstallWAD(wxCommandEvent& event); + void OnChangeDisc(wxCommandEvent& event); void CompressSelection(bool _compress); void AutomaticColumnWidth(); diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 9a91b78be3..d51ee2c135 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -90,6 +90,7 @@ enum IDM_NETPLAY, IDM_RESTART, IDM_CHANGEDISC, + IDM_LIST_CHANGEDISC, IDM_PROPERTIES, IDM_GAMEWIKI, IDM_LOAD_WII_MENU, |