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

GUI cleanups 

1. "backup save-states" removed from the MCD manager and added to the system menu (checkbox) just below "Save State".
2. removed multitap 1/2 from the config menu (now only available on MCD manager - this setting doesn't affect pads anyway).
3. Following rama's advice, vsync and auto-vsync are now both forced to off for all presets (and grayed-out when using presets).


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4405 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
avihal@gmail.com 2011-03-08 03:37:44 +00:00
parent fe88ee4102
commit 92977728c1
8 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/gui/App.h
View File

@ -91,7 +91,7 @@ enum MenuIdentifiers
MenuId_Boot_CDVD,
MenuId_Boot_CDVD2,
MenuId_Boot_ELF,
MenuId_Boot_Recent, // Menu populated with recent source bootings
//MenuId_Boot_Recent, // Menu populated with recent source bootings
MenuId_Sys_SuspendResume, // suspends/resumes active emulation, retains plugin states
@ -99,6 +99,7 @@ enum MenuIdentifiers
MenuId_Sys_Shutdown, // Closes virtual machine, shuts down plugins, wipes states.
MenuId_Sys_LoadStates, // Opens load states submenu
MenuId_Sys_SaveStates, // Opens save states submenu
MenuId_EnableBackupStates, // Checkbox to enable/disables savestates backup
MenuId_EnablePatches,
MenuId_EnableCheats,
MenuId_EnableHostFs,
@ -130,8 +131,8 @@ enum MenuIdentifiers
MenuId_Config_DEV9,
MenuId_Config_Patches,
MenuId_Config_Multitap0Toggle,
MenuId_Config_Multitap1Toggle,
//MenuId_Config_Multitap0Toggle,
//MenuId_Config_Multitap1Toggle,
// Plugin Sections
// ---------------

6
pcsx2/gui/AppConfig.cpp
View File

@ -832,9 +832,9 @@ bool AppConfig::IsOkApplyPreset(int n)
EmuOptions.EnablePatches = true;
EmuOptions.GS = default_Pcsx2Config.GS;
EmuOptions.GS.FrameLimitEnable = original_GS.FrameLimitEnable; //Frame limiter, vsync and ,managed-vsync are not modified by presets
EmuOptions.GS.VsyncEnable = original_GS.VsyncEnable;
EmuOptions.GS.ManagedVsync = original_GS.ManagedVsync;
EmuOptions.GS.FrameLimitEnable = original_GS.FrameLimitEnable; //Frame limiter is not modified by presets
//EmuOptions.GS.VsyncEnable = original_GS.VsyncEnable;
//EmuOptions.GS.ManagedVsync = original_GS.ManagedVsync;
EmuOptions.Cpu = default_Pcsx2Config.Cpu;
EmuOptions.Gamefixes = default_Pcsx2Config.Gamefixes;

13
pcsx2/gui/Dialogs/McdConfigDialog.cpp
View File

@ -44,7 +44,7 @@ Panels::McdConfigPanel_Toggles::McdConfigPanel_Toggles(wxWindow *parent)
)
);
m_check_SavestateBackup = new pxCheckBox( this, pxsFmt(_("Backup existing Savestate when creating a new one")) );
//m_check_SavestateBackup = new pxCheckBox( this, pxsFmt(_("Backup existing Savestate when creating a new one")) );
for( uint i=0; i<2; ++i )
{
@ -60,11 +60,12 @@ Panels::McdConfigPanel_Toggles::McdConfigPanel_Toggles(wxWindow *parent)
for( uint i=0; i<2; ++i )
*this += m_check_Multitap[i];
*this += 4;
//*this += 4;
*this += m_check_SavestateBackup;
//*this += m_check_SavestateBackup;
*this += 4;
*this += new wxStaticLine( this ) | StdExpand();
*this += m_check_Ejection;
}
@ -74,7 +75,7 @@ void Panels::McdConfigPanel_Toggles::Apply()
g_Conf->EmuOptions.MultitapPort0_Enabled = m_check_Multitap[0]->GetValue();
g_Conf->EmuOptions.MultitapPort1_Enabled = m_check_Multitap[1]->GetValue();
g_Conf->EmuOptions.BackupSavestate = m_check_SavestateBackup->GetValue();
//g_Conf->EmuOptions.BackupSavestate = m_check_SavestateBackup->GetValue();
g_Conf->EmuOptions.McdEnableEjection = m_check_Ejection->GetValue();
}
@ -83,7 +84,7 @@ void Panels::McdConfigPanel_Toggles::AppStatusEvent_OnSettingsApplied()
m_check_Multitap[0] ->SetValue( g_Conf->EmuOptions.MultitapPort0_Enabled );
m_check_Multitap[1] ->SetValue( g_Conf->EmuOptions.MultitapPort1_Enabled );
m_check_SavestateBackup ->SetValue( g_Conf->EmuOptions.BackupSavestate );
//m_check_SavestateBackup ->SetValue( g_Conf->EmuOptions.BackupSavestate );
m_check_Ejection ->SetValue( g_Conf->EmuOptions.McdEnableEjection );
}
@ -105,7 +106,7 @@ Dialogs::McdConfigDialog::McdConfigDialog( wxWindow* parent )
*this += m_panel_mcdlist | StdExpand();
//*this += StdPadding;
*this += new wxStaticLine( this ) | StdExpand();
//*this += new wxStaticLine( this ) | StdExpand();
*this += StdPadding;
*this += new McdConfigPanel_Toggles( this ) | StdExpand();

19
pcsx2/gui/MainFrame.cpp
View File

@ -183,8 +183,8 @@ void MainEmuFrame::ConnectMenus()
ConnectMenu( MenuId_Config_Language, Menu_Language_Click );
ConnectMenu( MenuId_Config_ResetAll, Menu_ResetAllSettings_Click );
ConnectMenu( MenuId_Config_Multitap0Toggle, Menu_MultitapToggle_Click );
ConnectMenu( MenuId_Config_Multitap1Toggle, Menu_MultitapToggle_Click );
// ConnectMenu( MenuId_Config_Multitap0Toggle, Menu_MultitapToggle_Click );
// ConnectMenu( MenuId_Config_Multitap1Toggle, Menu_MultitapToggle_Click );
ConnectMenu( MenuId_Video_WindowSettings, Menu_WindowSettings_Click );
ConnectMenu( MenuId_Video_CoreSettings, Menu_GSSettings_Click );
@ -200,6 +200,7 @@ void MainEmuFrame::ConnectMenus()
ConnectMenu( MenuId_Boot_CDVD2, Menu_BootCdvd2_Click );
ConnectMenu( MenuId_Boot_ELF, Menu_OpenELF_Click );
ConnectMenu( MenuId_IsoBrowse, Menu_IsoBrowse_Click );
ConnectMenu( MenuId_EnableBackupStates, Menu_EnableBackupStates_Click );
ConnectMenu( MenuId_EnablePatches, Menu_EnablePatches_Click );
ConnectMenu( MenuId_EnableCheats, Menu_EnableCheats_Click );
ConnectMenu( MenuId_EnableHostFs, Menu_EnableHostFs_Click );
@ -401,6 +402,9 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menuSys.Append(MenuId_Sys_LoadStates, _("Load state"), &m_LoadStatesSubmenu);
m_menuSys.Append(MenuId_Sys_SaveStates, _("Save state"), &m_SaveStatesSubmenu);
m_menuSys.Append(MenuId_EnableBackupStates, _("Backup before save"),
wxEmptyString, wxITEM_CHECK);
m_menuSys.AppendSeparator();
m_menuSys.Append(MenuId_EnablePatches, _("Enable Patches"),
@ -458,9 +462,9 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menuConfig.AppendSeparator();
m_menuConfig.Append(MenuId_Config_Patches, _("Patches (unimplemented)"), wxEmptyString);
m_menuConfig.AppendSeparator();
m_menuConfig.Append(MenuId_Config_Multitap0Toggle, _("Multitap 1"), wxEmptyString, wxITEM_CHECK );
m_menuConfig.Append(MenuId_Config_Multitap1Toggle, _("Multitap 2"), wxEmptyString, wxITEM_CHECK );
// m_menuConfig.AppendSeparator();
// m_menuConfig.Append(MenuId_Config_Multitap0Toggle, _("Multitap 1"), wxEmptyString, wxITEM_CHECK );
// m_menuConfig.Append(MenuId_Config_Multitap1Toggle, _("Multitap 2"), wxEmptyString, wxITEM_CHECK );
m_menuConfig.AppendSeparator();
m_menuConfig.Append(MenuId_Config_ResetAll, _("Clear all settings..."),
@ -649,6 +653,7 @@ void MainEmuFrame::ApplyConfigToGui(AppConfig& configToApply, int flags)
if ( !(flags & AppConfig::APPLY_FLAG_FROM_PRESET) )
{//these should not be affected by presets
menubar.Check( MenuId_EnableBackupStates, configToApply.EmuOptions.BackupSavestate );
menubar.Check( MenuId_EnableCheats, configToApply.EmuOptions.EnableCheats );
menubar.Check( MenuId_EnableHostFs, configToApply.EmuOptions.HostFs );
menubar.Check( MenuId_CDVD_Info, configToApply.EmuOptions.CdvdVerboseReads );
@ -656,8 +661,8 @@ void MainEmuFrame::ApplyConfigToGui(AppConfig& configToApply, int flags)
menubar.Check( MenuId_Console_Stdio, configToApply.EmuOptions.ConsoleToStdio );
#endif
menubar.Check( MenuId_Config_Multitap0Toggle, configToApply.EmuOptions.MultitapPort0_Enabled );
menubar.Check( MenuId_Config_Multitap1Toggle, configToApply.EmuOptions.MultitapPort1_Enabled );
// menubar.Check( MenuId_Config_Multitap0Toggle, configToApply.EmuOptions.MultitapPort0_Enabled );
// menubar.Check( MenuId_Config_Multitap1Toggle, configToApply.EmuOptions.MultitapPort1_Enabled );
}
UpdateIsoSrcSelection(); //shouldn't be affected by presets but updates from g_Conf anyway and not from configToApply, so no problem here.

3
pcsx2/gui/MainFrame.h
View File

@ -174,6 +174,7 @@ protected:
void Menu_ResetAllSettings_Click(wxCommandEvent &event);
void Menu_IsoBrowse_Click(wxCommandEvent &event);
void Menu_EnableBackupStates_Click(wxCommandEvent &event);
void Menu_EnablePatches_Click(wxCommandEvent &event);
void Menu_EnableCheats_Click(wxCommandEvent &event);
void Menu_EnableHostFs_Click(wxCommandEvent &event);
@ -194,7 +195,7 @@ protected:
void Menu_ConfigPlugin_Click(wxCommandEvent &event);
void Menu_MultitapToggle_Click(wxCommandEvent &event);
//void Menu_MultitapToggle_Click(wxCommandEvent &event);
void Menu_Debug_Open_Click(wxCommandEvent &event);
void Menu_Debug_MemoryDump_Click(wxCommandEvent &event);

14
pcsx2/gui/MainMenuClicks.cpp
View File

@ -395,6 +395,7 @@ void MainEmuFrame::Menu_IsoBrowse_Click( wxCommandEvent &event )
AppSaveSettings(); // save the new iso selection; update menus!
}
/*//now only available at the memory card manager.
void MainEmuFrame::Menu_MultitapToggle_Click( wxCommandEvent& )
{
g_Conf->EmuOptions.MultitapPort0_Enabled = GetMenuBar()->IsChecked( MenuId_Config_Multitap0Toggle );
@ -404,6 +405,19 @@ void MainEmuFrame::Menu_MultitapToggle_Click( wxCommandEvent& )
//evt.Skip();
}
*/
void MainEmuFrame::Menu_EnableBackupStates_Click( wxCommandEvent& )
{
g_Conf->EmuOptions.BackupSavestate = GetMenuBar()->IsChecked( MenuId_EnableBackupStates );
//without the next line, after toggling this menu-checkbox, the change only applies from the 2nd save and onwards
// (1st save after the toggle keeps the old pre-toggle value)..
// wonder what that means for all the other menu checkboxes which only use AppSaveSettings... (avih)
AppApplySettings();
AppSaveSettings();
}
void MainEmuFrame::Menu_EnablePatches_Click( wxCommandEvent& )
{

13
pcsx2/gui/Panels/GSWindowPanel.cpp
View File

@ -133,8 +133,8 @@ void Panels::GSWindowSettingsPanel::ApplyConfigToGui( AppConfig& configToApply,
{
const AppConfig::GSWindowOptions& conf( configToApply.GSWindow );
if( !(flags & AppConfig::APPLY_FLAG_FROM_PRESET) ) //Presets don't control any value at this config panel
{
if( !(flags & AppConfig::APPLY_FLAG_FROM_PRESET) )
{//Presets don't control these values
m_check_CloseGS ->SetValue( conf.CloseOnEsc );
m_check_Fullscreen ->SetValue( conf.DefaultToFullscreen );
m_check_HideMouse ->SetValue( conf.AlwaysHideMouse );
@ -142,14 +142,17 @@ void Panels::GSWindowSettingsPanel::ApplyConfigToGui( AppConfig& configToApply,
m_combo_AspectRatio ->SetSelection( (int)conf.AspectRatio );
m_check_VsyncEnable ->SetValue( configToApply.EmuOptions.GS.VsyncEnable );
m_check_ManagedVsync->SetValue( configToApply.EmuOptions.GS.ManagedVsync );
m_check_DclickFullscreen ->SetValue ( conf.IsToggleFullscreenOnDoubleClick );
m_text_WindowWidth ->ChangeValue( wxsFormat( L"%d", conf.WindowSize.GetWidth() ) );
m_text_WindowHeight ->ChangeValue( wxsFormat( L"%d", conf.WindowSize.GetHeight() ) );
}
m_check_VsyncEnable->SetValue( configToApply.EmuOptions.GS.VsyncEnable );
m_check_VsyncEnable->Enable ( !configToApply.EnablePresets );//grayed-out when presets are enabled
m_check_ManagedVsync->SetValue( configToApply.EmuOptions.GS.ManagedVsync );
m_check_ManagedVsync->Enable ( !configToApply.EnablePresets );//grayed-out when presets are enabled
}
void Panels::GSWindowSettingsPanel::Apply()

5
pcsx2/gui/Panels/MemoryCardPanels.h
View File

@ -228,7 +228,9 @@ namespace Panels
protected:
pxCheckBox* m_check_Multitap[2];
pxCheckBox* m_check_Ejection;
pxCheckBox* m_check_SavestateBackup;
//moved to the system menu, just below "Save State"
//pxCheckBox* m_check_SavestateBackup;
public:
McdConfigPanel_Toggles( wxWindow* parent );
@ -242,5 +244,6 @@ namespace Panels
};
//avih: is the first one used??
extern bool EnumerateMemoryCard( McdListItem& dest, const wxFileName& filename );
//extern bool EnumerateMemoryCard( SimpleMcdItem& dest, const wxFileName& filename );