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

Replaced generalized instances of GCM with ISO 

Renamed various commands to refer to ISO instead of GCM for consistency,
as the commands are used for both Wii and GameCube files.

CompressGCM --> CompressISO
DeleteGCM --> DeleteISO
MultiCompressGCM --> MultiCompressISO
MultiDecompressGCM --> MultiDecompressISO
SetDefaultGCM --> SetDefaultISO

Fixed COMPRESSISO

Fixed missing "COMPRESSISO"

Fixed more COMPRESSISO

Final fix for COMPRESSISO
This commit is contained in:
Steven Vascellaro 2014-09-28 19:05:27 -04:00
parent 431fb4d82a
commit b956be20e3
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -198,11 +198,11 @@ BEGIN_EVENT_TABLE(CGameListCtrl, wxListCtrl)
EVT_MENU(IDM_OPENCONTAININGFOLDER, CGameListCtrl::OnOpenContainingFolder) EVT_MENU(IDM_OPENCONTAININGFOLDER, CGameListCtrl::OnOpenContainingFolder)
EVT_MENU(IDM_OPENSAVEFOLDER, CGameListCtrl::OnOpenSaveFolder) EVT_MENU(IDM_OPENSAVEFOLDER, CGameListCtrl::OnOpenSaveFolder)
EVT_MENU(IDM_EXPORTSAVE, CGameListCtrl::OnExportSave) EVT_MENU(IDM_EXPORTSAVE, CGameListCtrl::OnExportSave)
EVT_MENU(IDM_SETDEFAULTGCM, CGameListCtrl::OnSetDefaultGCM) EVT_MENU(IDM_SETDEFAULTISO, CGameListCtrl::OnSetDefaultISO)
EVT_MENU(IDM_COMPRESSGCM, CGameListCtrl::OnCompressGCM) EVT_MENU(IDM_COMPRESSISO, CGameListCtrl::OnCompressISO)
EVT_MENU(IDM_MULTICOMPRESSGCM, CGameListCtrl::OnMultiCompressGCM) EVT_MENU(IDM_MULTICOMPRESSISO, CGameListCtrl::OnMultiCompressISO)
EVT_MENU(IDM_MULTIDECOMPRESSGCM, CGameListCtrl::OnMultiDecompressGCM) EVT_MENU(IDM_MULTIDECOMPRESSISO, CGameListCtrl::OnMultiDecompressISO)
EVT_MENU(IDM_DELETEGCM, CGameListCtrl::OnDeleteGCM) EVT_MENU(IDM_DELETEISO, CGameListCtrl::OnDeleteISO)
EVT_MENU(IDM_LIST_CHANGEDISC, CGameListCtrl::OnChangeDisc) EVT_MENU(IDM_LIST_CHANGEDISC, CGameListCtrl::OnChangeDisc)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -873,23 +873,23 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
popupMenu->Append(IDM_EXPORTSAVE, _("Export Wii save (Experimental)")); popupMenu->Append(IDM_EXPORTSAVE, _("Export Wii save (Experimental)"));
} }
popupMenu->Append(IDM_OPENCONTAININGFOLDER, _("Open &containing folder")); popupMenu->Append(IDM_OPENCONTAININGFOLDER, _("Open &containing folder"));
popupMenu->AppendCheckItem(IDM_SETDEFAULTGCM, _("Set as &default ISO")); popupMenu->AppendCheckItem(IDM_SETDEFAULTISO, _("Set as &default ISO"));
// First we have to decide a starting value when we append it // First we have to decide a starting value when we append it
if (selected_iso->GetFileName() == SConfig::GetInstance(). if (selected_iso->GetFileName() == SConfig::GetInstance().
m_LocalCoreStartupParameter.m_strDefaultGCM) m_LocalCoreStartupParameter.m_strDefaultGCM)
popupMenu->FindItem(IDM_SETDEFAULTGCM)->Check(); popupMenu->FindItem(IDM_SETDEFAULTISO)->Check();
popupMenu->AppendSeparator(); popupMenu->AppendSeparator();
popupMenu->Append(IDM_DELETEGCM, _("&Delete ISO...")); popupMenu->Append(IDM_DELETEISO, _("&Delete ISO..."));
if (selected_iso->GetPlatform() != GameListItem::WII_WAD) if (selected_iso->GetPlatform() != GameListItem::WII_WAD)
{ {
if (selected_iso->IsCompressed()) if (selected_iso->IsCompressed())
popupMenu->Append(IDM_COMPRESSGCM, _("Decompress ISO...")); popupMenu->Append(IDM_COMPRESSISO, _("Decompress ISO..."));
else if (selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".ciso" && else if (selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".ciso" &&
selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".wbfs") selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".wbfs")
popupMenu->Append(IDM_COMPRESSGCM, _("Compress ISO...")); popupMenu->Append(IDM_COMPRESSISO, _("Compress ISO..."));
} }
else else
{ {
@ -908,10 +908,10 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
else if (GetSelectedItemCount() > 1) else if (GetSelectedItemCount() > 1)
{ {
wxMenu* popupMenu = new wxMenu; wxMenu* popupMenu = new wxMenu;
popupMenu->Append(IDM_DELETEGCM, _("&Delete selected ISOs...")); popupMenu->Append(IDM_DELETEISO, _("&Delete selected ISOs..."));
popupMenu->AppendSeparator(); popupMenu->AppendSeparator();
popupMenu->Append(IDM_MULTICOMPRESSGCM, _("Compress selected ISOs...")); popupMenu->Append(IDM_MULTICOMPRESSISO, _("Compress selected ISOs..."));
popupMenu->Append(IDM_MULTIDECOMPRESSGCM, _("Decompress selected ISOs...")); popupMenu->Append(IDM_MULTIDECOMPRESSISO, _("Decompress selected ISOs..."));
PopupMenu(popupMenu); PopupMenu(popupMenu);
} }
} }
@ -984,7 +984,7 @@ void CGameListCtrl::OnExportSave(wxCommandEvent& WXUNUSED (event))
} }
// Save this file as the default file // Save this file as the default file
void CGameListCtrl::OnSetDefaultGCM(wxCommandEvent& event) void CGameListCtrl::OnSetDefaultISO(wxCommandEvent& event)
{ {
const GameListItem *iso = GetSelectedISO(); const GameListItem *iso = GetSelectedISO();
if (!iso) return; if (!iso) return;
@ -1004,7 +1004,7 @@ void CGameListCtrl::OnSetDefaultGCM(wxCommandEvent& event)
} }
} }
void CGameListCtrl::OnDeleteGCM(wxCommandEvent& WXUNUSED (event)) void CGameListCtrl::OnDeleteISO(wxCommandEvent& WXUNUSED (event))
{ {
if (GetSelectedItemCount() == 1) if (GetSelectedItemCount() == 1)
{ {
@ -1066,12 +1066,12 @@ void CGameListCtrl::MultiCompressCB(const std::string& text, float percent, void
((wxProgressDialog*)arg)->Update((int)(percent*1000), textString); ((wxProgressDialog*)arg)->Update((int)(percent*1000), textString);
} }
void CGameListCtrl::OnMultiCompressGCM(wxCommandEvent& /*event*/) void CGameListCtrl::OnMultiCompressISO(wxCommandEvent& /*event*/)
{ {
CompressSelection(true); CompressSelection(true);
} }
void CGameListCtrl::OnMultiDecompressGCM(wxCommandEvent& /*event*/) void CGameListCtrl::OnMultiDecompressISO(wxCommandEvent& /*event*/)
{ {
CompressSelection(false); CompressSelection(false);
} }
@ -1172,7 +1172,7 @@ void CGameListCtrl::CompressCB(const std::string& text, float percent, void* arg
Update((int)(percent*1000), StrToWxStr(text)); Update((int)(percent*1000), StrToWxStr(text));
} }
void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) void CGameListCtrl::OnCompressISO(wxCommandEvent& WXUNUSED (event))
{ {
const GameListItem *iso = GetSelectedISO(); const GameListItem *iso = GetSelectedISO();
if (!iso) if (!iso)

10
Source/Core/DolphinWX/GameListCtrl.h
View File

@ -98,11 +98,11 @@ private:
void OnOpenContainingFolder(wxCommandEvent& event); void OnOpenContainingFolder(wxCommandEvent& event);
void OnOpenSaveFolder(wxCommandEvent& event); void OnOpenSaveFolder(wxCommandEvent& event);
void OnExportSave(wxCommandEvent& event); void OnExportSave(wxCommandEvent& event);
void OnSetDefaultGCM(wxCommandEvent& event); void OnSetDefaultISO(wxCommandEvent& event);
void OnDeleteGCM(wxCommandEvent& event); void OnDeleteISO(wxCommandEvent& event);
void OnCompressGCM(wxCommandEvent& event); void OnCompressISO(wxCommandEvent& event);
void OnMultiCompressGCM(wxCommandEvent& event); void OnMultiCompressISO(wxCommandEvent& event);
void OnMultiDecompressGCM(wxCommandEvent& event); void OnMultiDecompressISO(wxCommandEvent& event);
void OnInstallWAD(wxCommandEvent& event); void OnInstallWAD(wxCommandEvent& event);
void OnChangeDisc(wxCommandEvent& event); void OnChangeDisc(wxCommandEvent& event);

10
Source/Core/DolphinWX/Globals.h
View File

@ -253,11 +253,11 @@ enum
IDM_EXPORTSAVE, IDM_EXPORTSAVE,
IDM_IMPORTSAVE, IDM_IMPORTSAVE,
IDM_EXPORTALLSAVE, IDM_EXPORTALLSAVE,
IDM_SETDEFAULTGCM, IDM_SETDEFAULTISO,
IDM_DELETEGCM, IDM_DELETEISO,
IDM_COMPRESSGCM, IDM_COMPRESSISO,
IDM_MULTICOMPRESSGCM, IDM_MULTICOMPRESSISO,
IDM_MULTIDECOMPRESSGCM, IDM_MULTIDECOMPRESSISO,
IDM_UPDATEDISASMDIALOG, IDM_UPDATEDISASMDIALOG,
IDM_UPDATEGUI, IDM_UPDATEGUI,
IDM_UPDATESTATUSBAR, IDM_UPDATESTATUSBAR,