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

CDVD plugin submenu: now only enabled when "Plugin" is selected. 

Hopefully allow less initial confusion (the CDVD plugin is not used by default and it will mostly stay that way, so disabled unless chosen).
Note: the Iso selector sub menu is always enabled because even when the Plugin is selected as source, selecting an ISO via the selector switches to the internal Iso reader.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4578 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
avihal@gmail.com 2011-04-16 09:35:42 +00:00
parent 0783f31f84
commit 8858a5c57c
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/gui/MainFrame.cpp
View File

@ -65,6 +65,8 @@ void MainEmuFrame::UpdateIsoSrcSelection()
sMenuBar.Check( cdsrc, true );
m_statusbar.SetStatusText( CDVD_SourceLabels[g_Conf->CdvdSource], 1 );
m_menuCDVD.Enable( GetPluginMenuId_Settings(PluginId_CDVD), cdsrc == MenuId_Src_Plugin );
//sMenuBar.SetLabel( MenuId_Src_Iso, wxsFormat( L"%s -> %s", _("Iso"),
// exists ? Path::GetFilename(g_Conf->CurrentIso).c_str() : _("Empty") ) );
}
@ -289,7 +291,7 @@ void MainEmuFrame::AppStatusEvent_OnSettingsApplied()
ApplySettings();
}
static int GetPluginMenuId_Settings( PluginsEnum_t pid )
int GetPluginMenuId_Settings( PluginsEnum_t pid )
{
return MenuId_PluginBase_Settings + ((int)pid * PluginMenuId_Interval);
}

2
pcsx2/gui/MainFrame.h
View File

@ -144,6 +144,7 @@ public:
void UpdateIsoSrcSelection();
void RemoveCdvdMenu();
void EnableMenuItem( int id, bool enable );
int GetCdvdPluginSubmenuItemId();
bool Destroy();
@ -222,3 +223,4 @@ protected:
friend class Pcsx2App;
};
extern int GetPluginMenuId_Settings( PluginsEnum_t pid );

9
pcsx2/gui/MainMenuClicks.cpp
View File

@ -168,6 +168,8 @@ wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, co
core_control.AllowResume();
}
GetMainFrame().EnableMenuItem( GetMainFrame().GetCdvdPluginSubmenuItemId(), g_Conf->CdvdSource == CDVDsrc_Plugin );
return result;
}
@ -215,6 +217,8 @@ wxWindowID SwapOrReset_CdvdSrc( wxWindow* owner, CDVD_SourceType newsrc )
sApp.SysExecute( g_Conf->CdvdSource );
}
GetMainFrame().EnableMenuItem( GetMainFrame().GetCdvdPluginSubmenuItemId(), g_Conf->CdvdSource == CDVDsrc_Plugin );
return result;
}
@ -349,6 +353,11 @@ void MainEmuFrame::_DoBootCdvd()
sApp.SysExecute( g_Conf->CdvdSource );
}
int MainEmuFrame::GetCdvdPluginSubmenuItemId()
{
return GetPluginMenuId_Settings(PluginId_CDVD);
}
void MainEmuFrame::Menu_CdvdSource_Click( wxCommandEvent &event )
{
CDVD_SourceType newsrc = CDVDsrc_NoDisc;