diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h index 06172741e3..d422c03224 100644 --- a/pcsx2/gui/App.h +++ b/pcsx2/gui/App.h @@ -276,6 +276,7 @@ struct AppImageIds Plugins, Speedhacks, Gamefixes, + MemoryCard, Video, Cpu; @@ -283,7 +284,8 @@ struct AppImageIds { Paths = Plugins = Speedhacks = Gamefixes = - Video = Cpu = -1; + Video = Cpu = + MemoryCard = -1; } } Config; diff --git a/pcsx2/gui/AppRes.cpp b/pcsx2/gui/AppRes.cpp index f36f9882d1..bc6d061e57 100644 --- a/pcsx2/gui/AppRes.cpp +++ b/pcsx2/gui/AppRes.cpp @@ -28,6 +28,7 @@ #include "Resources/ConfigIcon_Gamefixes.h" #include "Resources/ConfigIcon_Paths.h" #include "Resources/ConfigIcon_Plugins.h" +#include "Resources/ConfigIcon_MemoryCard.h" #include "Resources/AppIcon16.h" #include "Resources/AppIcon32.h" @@ -168,6 +169,7 @@ wxImageList& Pcsx2App::GetImgList_Config() FancyLoadMacro( Plugins ); FancyLoadMacro( Gamefixes ); FancyLoadMacro( Speedhacks ); + FancyLoadMacro( MemoryCard ); FancyLoadMacro( Video ); FancyLoadMacro( Cpu ); } diff --git a/pcsx2/gui/Dialogs/SysConfigDialog.cpp b/pcsx2/gui/Dialogs/SysConfigDialog.cpp index c7c659b341..a3d1be51da 100644 --- a/pcsx2/gui/Dialogs/SysConfigDialog.cpp +++ b/pcsx2/gui/Dialogs/SysConfigDialog.cpp @@ -34,6 +34,7 @@ Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent) const AppImageIds::ConfigIds& cfgid( wxGetApp().GetImgId().Config ); + AddPage ( wxLt("MemoryCards"), cfgid.MemoryCard ); AddPage ( wxLt("EE/IOP"), cfgid.Cpu ); AddPage ( wxLt("VUs"), cfgid.Cpu ); AddPage ( wxLt("GS"), cfgid.Video ); diff --git a/pcsx2/gui/Panels/ConfigurationPanels.h b/pcsx2/gui/Panels/ConfigurationPanels.h index da9c773ccd..8de3ecfa38 100644 --- a/pcsx2/gui/Panels/ConfigurationPanels.h +++ b/pcsx2/gui/Panels/ConfigurationPanels.h @@ -256,8 +256,9 @@ namespace Panels void OnOpenWindowSettings( wxCommandEvent& evt ); }; - ////////////////////////////////////////////////////////////////////////////////////////// - // + // -------------------------------------------------------------------------------------- + // SpeedHacksPanel + // -------------------------------------------------------------------------------------- class SpeedHacksPanel : public BaseApplicableConfigPanel { protected: @@ -297,15 +298,31 @@ namespace Panels void VUCycleRate_Scroll(wxScrollEvent &event); }; - ////////////////////////////////////////////////////////////////////////////////////////// - // - class GameFixesPanel: public BaseApplicableConfigPanel + // -------------------------------------------------------------------------------------- + // GameFixesPanel + // -------------------------------------------------------------------------------------- + class GameFixesPanel : public BaseApplicableConfigPanel { protected: pxCheckBox* m_checkbox[NUM_OF_GAME_FIXES]; public: GameFixesPanel( wxWindow* parent ); + virtual ~GameFixesPanel() throw() { } + void Apply(); + void AppStatusEvent_OnSettingsApplied(); + }; + + // -------------------------------------------------------------------------------------- + // MemoryCardsPanel + // -------------------------------------------------------------------------------------- + class MemoryCardsPanel : public BaseApplicableConfigPanel + { + protected: + + public: + MemoryCardsPanel( wxWindow* parent ); + virtual ~MemoryCardsPanel() throw() { } void Apply(); void AppStatusEvent_OnSettingsApplied(); }; diff --git a/pcsx2/gui/Panels/MemoryCardsPanel.cpp b/pcsx2/gui/Panels/MemoryCardsPanel.cpp new file mode 100644 index 0000000000..68e39809e4 --- /dev/null +++ b/pcsx2/gui/Panels/MemoryCardsPanel.cpp @@ -0,0 +1,31 @@ +/* PCSX2 - PS2 Emulator for PCs + * Copyright (C) 2002-2009 PCSX2 Dev Team + * + * PCSX2 is free software: you can redistribute it and/or modify it under the terms + * of the GNU Lesser General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with PCSX2. + * If not, see . + */ + +#include "PrecompiledHeader.h" +#include "ConfigurationPanels.h" + +Panels::MemoryCardsPanel::MemoryCardsPanel( wxWindow* parent ) + : BaseApplicableConfigPanel( parent ) +{ + AppStatusEvent_OnSettingsApplied(); +} + +void Panels::MemoryCardsPanel::Apply() +{ +} + +void Panels::MemoryCardsPanel::AppStatusEvent_OnSettingsApplied() +{ +} diff --git a/pcsx2/gui/Resources/ConfigIcon_MemoryCard.png b/pcsx2/gui/Resources/ConfigIcon_MemoryCard.png new file mode 100644 index 0000000000..fc54c88a68 Binary files /dev/null and b/pcsx2/gui/Resources/ConfigIcon_MemoryCard.png differ diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj index 23f2872797..a2b9f9b337 100644 --- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj +++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj @@ -2225,6 +2225,40 @@ /> + + + + + + + + + + + @@ -2431,46 +2465,6 @@ RelativePath=".\..\wxResources.rc" > - - - - - - - - - - - - - - - - - - - - + +