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

Quick placebo for Memory Cards (empty panel and icon). Will fill it all in later. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2512 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-01-24 14:29:10 +00:00
parent 541ef9956e
commit 0d92ee6d0d
7 changed files with 97 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/gui/App.h
View File

@ -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;

2
pcsx2/gui/AppRes.cpp
View File

@ -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 );
}

1
pcsx2/gui/Dialogs/SysConfigDialog.cpp
View File

@ -34,6 +34,7 @@ Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent)
const AppImageIds::ConfigIds& cfgid( wxGetApp().GetImgId().Config );
AddPage<MemoryCardsPanel> ( wxLt("MemoryCards"), cfgid.MemoryCard );
AddPage<CpuPanelEE> ( wxLt("EE/IOP"), cfgid.Cpu );
AddPage<CpuPanelVU> ( wxLt("VUs"), cfgid.Cpu );
AddPage<VideoPanel> ( wxLt("GS"), cfgid.Video );

27
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -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();
};

31
pcsx2/gui/Panels/MemoryCardsPanel.cpp Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "ConfigurationPanels.h"
Panels::MemoryCardsPanel::MemoryCardsPanel( wxWindow* parent )
: BaseApplicableConfigPanel( parent )
{
AppStatusEvent_OnSettingsApplied();
}
void Panels::MemoryCardsPanel::Apply()
{
}
void Panels::MemoryCardsPanel::AppStatusEvent_OnSettingsApplied()
{
}

BIN
pcsx2/gui/Resources/ConfigIcon_MemoryCard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

78
pcsx2/windows/VCprojects/pcsx2_2008.vcproj
View File

@ -2225,6 +2225,40 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_MemoryCard.png"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description=""
CommandLine="&quot;$(InputDir)\bin2cpp.cmd&quot; $(InputFileName)&#x0D;&#x0A;"
Outputs="&quot;$(InputDir)\$(InputName).h"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Compiling Bitmap Resource..."
CommandLine="&quot;$(InputDir)\bin2cpp.cmd&quot; $(InputFileName)&#x0D;&#x0A;"
Outputs="&quot;$(InputDir)\$(InputName).h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Compiling Bitmap Resource..."
CommandLine="&quot;$(InputDir)\bin2cpp.cmd&quot; $(InputFileName)&#x0D;&#x0A;"
Outputs="&quot;$(InputDir)\$(InputName).h"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_Paths.png"
>
@ -2431,46 +2465,6 @@
RelativePath=".\..\wxResources.rc"
>
</File>
<Filter
Name="Include"
>
<File
RelativePath="..\..\gui\Resources\AppIcon.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\BackgroundLogo.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_Cpu.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_Gamefixes.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_Paths.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_Plugins.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_Speedhacks.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\ConfigIcon_Video.h"
>
</File>
<File
RelativePath="..\..\gui\Resources\Dualshock.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Panels"
@ -2511,6 +2505,10 @@
RelativePath="..\..\gui\Panels\LogOptionsPanels.h"
>
</File>
<File
RelativePath="..\..\gui\Panels\MemoryCardsPanel.cpp"
>
</File>
<File
RelativePath="..\..\gui\Panels\MiscPanelStuff.cpp"
>