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

wxgui: Fix Linux. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1478 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-07-08 01:10:59 +00:00
parent 911f922001
commit 38d36b2e7c
7 changed files with 476 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pcsx2/Config.h
View File

@ -69,7 +69,7 @@ public:
void LoadSave( IniInterface& conf ); void LoadSave( IniInterface& conf );
}; };
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
struct FilenameOptions struct FilenameOptions
{ {
@ -113,7 +113,7 @@ public:
} Profiler; } Profiler;
struct struct
{ {
bool bool
EnableEE:1, EnableEE:1,
@ -132,7 +132,7 @@ public:
bool MultithreadGS; // Uses the multithreaded GS interface. bool MultithreadGS; // Uses the multithreaded GS interface.
bool closeOnEsc; // Closes the GS/Video port on escape (good for fullscreen activity) bool closeOnEsc; // Closes the GS/Video port on escape (good for fullscreen activity)
bool UseFramelimiter; bool UseFramelimiter;
int RegionMode; // 0=NTSC and 1=PAL int RegionMode; // 0=NTSC and 1=PAL
int CustomFps; int CustomFps;
int CustomFrameSkip; int CustomFrameSkip;
@ -153,7 +153,7 @@ public:
void LoadSave(); void LoadSave();
}; };
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
struct SpeedhackOptions struct SpeedhackOptions
{ {
@ -165,7 +165,7 @@ public:
void LoadSave( IniInterface& conf ); void LoadSave( IniInterface& conf );
}; };
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Helper functions for returning full pathnames of various Folders and files // Helper functions for returning full pathnames of various Folders and files
// //
@ -183,20 +183,27 @@ public:
public: public:
AppConfig() : Files( *this ) AppConfig() : Files( *this )
, Listbook_ImageSize( 32 )
, Toolbar_ImageSize( 32 )
{ {
} }
FullpathHelpers Files; FullpathHelpers Files;
wxPoint MainGuiPosition; wxPoint MainGuiPosition;
bool CdvdVerboseReads; // enables cdvd read activity verbosely dumped to the console bool CdvdVerboseReads; // enables cdvd read activity verbosely dumped to the console
// String value describing the desktop theme to use for pcsk2 (icons and background images) // String value describing the desktop theme to use for pcsk2 (icons and background images)
// The theme name is used to look up files in the themes folder (relative to the executable). // The theme name is used to look up files in the themes folder (relative to the executable).
wxString DeskTheme; wxString DeskTheme;
// Enables use of 64x64 toolbar icons; when false 32x32 icons are used instead. // Specifies the size of icons used in Listbooks; specifically the PCSX2 Properties dialog box.
bool Toolbar_UseLargeImages; // Realisic values range from 96x96 to 24x24.
int Listbook_ImageSize;
// Specifies the size of each toolbar icon, in pixels (any value >= 2 is valid, but realistically
// values should be between 64 and 16 for usability reasons)
int Toolbar_ImageSize;
// Enables display of toolbar text labels. // Enables display of toolbar text labels.
bool Toolbar_ShowLabels; bool Toolbar_ShowLabels;
@ -209,11 +216,11 @@ public:
FolderOptions Folders; FolderOptions Folders;
FilenameOptions BaseFilenames; FilenameOptions BaseFilenames;
McdSysOptions MemoryCards; McdSysOptions MemoryCards;
public: public:
void Load(); void Load();
void Save(); void Save();
protected: protected:
void LoadSave( IniInterface& ini ); void LoadSave( IniInterface& ini );
}; };

810
pcsx2/Linux/pcsx2.cbp
View File

@ -1,398 +1,412 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file> <CodeBlocks_project_file>
<FileVersion major="1" minor="6" /> <FileVersion major="1" minor="6" />
<Project> <Project>
<Option title="pcsx2" /> <Option title="pcsx2" />
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2-dbg" prefix_auto="1" extension_auto="1" /> <Option output="$(SvnRootDir)/bin/pcsx2-dbg" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" /> <Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/debug" /> <Option object_output="./.objs/debug" />
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEBUG" /> <Add option="-DPCSX2_DEBUG" />
</Compiler> </Compiler>
<ResourceCompiler> <ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
<Add library="$(SvnRootDir)/deps/debug/zlib.a" /> <Add library="$(SvnRootDir)/deps/debug/zlib.a" />
<Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/debug/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/debug/libUtilities.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Devel"> <Target title="Devel">
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2-dev" prefix_auto="1" extension_auto="1" /> <Option output="$(SvnRootDir)/bin/pcsx2-dev" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" /> <Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/devel" /> <Option object_output="./.objs/devel" />
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-W" /> <Add option="-W" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
</Compiler> </Compiler>
<ResourceCompiler> <ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
<Add library="$(SvnRootDir)/deps/devel/zlib.a" /> <Add library="$(SvnRootDir)/deps/devel/zlib.a" />
<Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/devel/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/devel/libUtilities.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2" prefix_auto="1" extension_auto="1" /> <Option output="$(SvnRootDir)/bin/pcsx2" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" /> <Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/release" /> <Option object_output="./.objs/release" />
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
</Compiler> </Compiler>
<ResourceCompiler> <ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --libs`" />
<Add library="$(SvnRootDir)/deps/release/zlib.a" /> <Add library="$(SvnRootDir)/deps/release/zlib.a" />
<Add library="$(SvnRootDir)/deps/release/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/release/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/release/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/release/libUtilities.a" />
</Linker> </Linker>
</Target> </Target>
<Environment> <Environment>
<Variable name="SvnRootDir" value="../../" /> <Variable name="SvnRootDir" value="../../" />
<Variable name="ProjectRootDir" value='&quot;$(SvnRootDir)/pcsx2/&quot;' /> <Variable name="ProjectRootDir" value='&quot;$(SvnRootDir)/pcsx2/&quot;' />
<Variable name="CommonDir" value='&quot;$(SvnRootDir)/common/&quot;' /> <Variable name="CommonDir" value='&quot;$(SvnRootDir)/common/&quot;' />
</Environment> </Environment>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=athlon" /> <Add option="-march=athlon" />
<Add option="-march=pentium4" /> <Add option="-march=pentium4" />
<Add option="-march=i686" /> <Add option="-march=i686" />
<Add option="-march=i586" /> <Add option="-march=i586" />
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />
<Add option="-Wunused-variable" /> <Add option="-Wunused-variable" />
<Add option="-fno-guess-branch-probability" /> <Add option="-fno-guess-branch-probability" />
<Add option="-fno-dse" /> <Add option="-fno-dse" />
<Add option="-fno-tree-dse" /> <Add option="-fno-tree-dse" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-DWX_PRECOMP" /> <Add option="-DWX_PRECOMP" />
<Add directory="$(SvnRootDir)/common/include/" /> <Add directory="$(SvnRootDir)/common/include/" />
<Add directory="$(SvnRootDir)/3rdparty/" /> <Add directory="$(SvnRootDir)/3rdparty/" />
<Add directory="$(ProjectRootDir)" /> <Add directory="$(ProjectRootDir)" />
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
<Add directory="$(ProjectRootDir)/x86" /> <Add directory="$(ProjectRootDir)/x86" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-Xlinker -zmuldefs" /> <Add option="-Xlinker -zmuldefs" />
</Linker> </Linker>
<Unit filename="../../common/include/Pcsx2Config.h" /> <Unit filename="../../common/include/Pcsx2Config.h" />
<Unit filename="../../common/include/Pcsx2Defs.h" /> <Unit filename="../../common/include/Pcsx2Defs.h" />
<Unit filename="../../common/include/Pcsx2Types.h" /> <Unit filename="../../common/include/Pcsx2Types.h" />
<Unit filename="../CDVD/CDVD.cpp" /> <Unit filename="../CDVD/CDVD.cpp" />
<Unit filename="../CDVD/CDVD.h" /> <Unit filename="../CDVD/CDVD.h" />
<Unit filename="../CDVD/CDVD_internal.h" /> <Unit filename="../CDVD/CDVD_internal.h" />
<Unit filename="../CDVD/CDVDiso.cpp" /> <Unit filename="../CDVD/CDVDiso.cpp" />
<Unit filename="../CDVD/CDVDiso.h" /> <Unit filename="../CDVD/CDVDiso.h" />
<Unit filename="../CDVD/CDVDisodrv.cpp" /> <Unit filename="../CDVD/CDVDisodrv.cpp" />
<Unit filename="../CDVD/CDVDisodrv.h" /> <Unit filename="../CDVD/CDVDisodrv.h" />
<Unit filename="../CDVD/CDVDlib.h" /> <Unit filename="../CDVD/CDVDlib.h" />
<Unit filename="../CDVD/CdRom.cpp" /> <Unit filename="../CDVD/CdRom.cpp" />
<Unit filename="../CDVD/CdRom.h" /> <Unit filename="../CDVD/CdRom.h" />
<Unit filename="../CDVD/Makefile.am" /> <Unit filename="../CDVD/Makefile.am" />
<Unit filename="../COP0.cpp" /> <Unit filename="../COP0.cpp" />
<Unit filename="../COP2.cpp" /> <Unit filename="../COP2.cpp" />
<Unit filename="../Cache.cpp" /> <Unit filename="../Cache.cpp" />
<Unit filename="../Cache.h" /> <Unit filename="../Cache.h" />
<Unit filename="../Common.h" /> <Unit filename="../Common.h" />
<Unit filename="../Config.h" /> <Unit filename="../Config.h" />
<Unit filename="../Counters.cpp" /> <Unit filename="../Counters.cpp" />
<Unit filename="../Counters.h" /> <Unit filename="../Counters.h" />
<Unit filename="../DebugTools/Debug.h" /> <Unit filename="../DebugTools/Debug.h" />
<Unit filename="../DebugTools/DisASM.h" /> <Unit filename="../DebugTools/DisASM.h" />
<Unit filename="../DebugTools/DisR3000A.cpp" /> <Unit filename="../DebugTools/DisR3000A.cpp" />
<Unit filename="../DebugTools/DisR5900.cpp" /> <Unit filename="../DebugTools/DisR5900.cpp" />
<Unit filename="../DebugTools/DisR5900asm.cpp" /> <Unit filename="../DebugTools/DisR5900asm.cpp" />
<Unit filename="../DebugTools/DisVU0Micro.cpp" /> <Unit filename="../DebugTools/DisVU0Micro.cpp" />
<Unit filename="../DebugTools/DisVU1Micro.cpp" /> <Unit filename="../DebugTools/DisVU1Micro.cpp" />
<Unit filename="../DebugTools/DisVUmicro.h" /> <Unit filename="../DebugTools/DisVUmicro.h" />
<Unit filename="../DebugTools/DisVUops.h" /> <Unit filename="../DebugTools/DisVUops.h" />
<Unit filename="../Docs/ChangeLog.txt" /> <Unit filename="../Docs/ChangeLog.txt" />
<Unit filename="../Docs/License.txt" /> <Unit filename="../Docs/License.txt" />
<Unit filename="../Docs/PS2Edefs.txt" /> <Unit filename="../Docs/PS2Edefs.txt" />
<Unit filename="../Docs/RemoteDebugging.txt" /> <Unit filename="../Docs/RemoteDebugging.txt" />
<Unit filename="../Docs/devblog.txt" /> <Unit filename="../Docs/devblog.txt" />
<Unit filename="../Docs/readme 0.9.4.txt" /> <Unit filename="../Docs/readme 0.9.4.txt" />
<Unit filename="../Docs/readme Playground.txt" /> <Unit filename="../Docs/readme Playground.txt" />
<Unit filename="../Dump.cpp" /> <Unit filename="../Dump.cpp" />
<Unit filename="../Dump.h" /> <Unit filename="../Dump.h" />
<Unit filename="../Elfheader.cpp" /> <Unit filename="../Elfheader.cpp" />
<Unit filename="../Elfheader.h" /> <Unit filename="../Elfheader.h" />
<Unit filename="../FPU.cpp" /> <Unit filename="../FPU.cpp" />
<Unit filename="../FiFo.cpp" /> <Unit filename="../FiFo.cpp" />
<Unit filename="../GS.cpp" /> <Unit filename="../GS.cpp" />
<Unit filename="../GS.h" /> <Unit filename="../GS.h" />
<Unit filename="../Gif.cpp" /> <Unit filename="../Gif.cpp" />
<Unit filename="../HashMap.h" /> <Unit filename="../HashMap.h" />
<Unit filename="../HostGui.h" /> <Unit filename="../HostGui.h" />
<Unit filename="../Hw.cpp" /> <Unit filename="../Hw.cpp" />
<Unit filename="../Hw.h" /> <Unit filename="../Hw.h" />
<Unit filename="../HwRead.cpp" /> <Unit filename="../HwRead.cpp" />
<Unit filename="../HwWrite.cpp" /> <Unit filename="../HwWrite.cpp" />
<Unit filename="../IPU/IPU.cpp" /> <Unit filename="../IPU/IPU.cpp" />
<Unit filename="../IPU/IPU.h" /> <Unit filename="../IPU/IPU.h" />
<Unit filename="../IPU/acoroutine.S" /> <Unit filename="../IPU/acoroutine.S" />
<Unit filename="../IPU/coroutine.cpp" /> <Unit filename="../IPU/coroutine.cpp" />
<Unit filename="../IPU/coroutine.h" /> <Unit filename="../IPU/coroutine.h" />
<Unit filename="../IPU/mpeg2lib/Idct.cpp" /> <Unit filename="../IPU/mpeg2lib/Idct.cpp" />
<Unit filename="../IPU/mpeg2lib/Mpeg.cpp" /> <Unit filename="../IPU/mpeg2lib/Mpeg.cpp" />
<Unit filename="../IPU/mpeg2lib/Mpeg.h" /> <Unit filename="../IPU/mpeg2lib/Mpeg.h" />
<Unit filename="../IPU/mpeg2lib/Vlc.h" /> <Unit filename="../IPU/mpeg2lib/Vlc.h" />
<Unit filename="../IPU/yuv2rgb.cpp" /> <Unit filename="../IPU/yuv2rgb.cpp" />
<Unit filename="../IPU/yuv2rgb.h" /> <Unit filename="../IPU/yuv2rgb.h" />
<Unit filename="../Interpreter.cpp" /> <Unit filename="../Interpreter.cpp" />
<Unit filename="../IopBios.cpp" /> <Unit filename="../IopBios.cpp" />
<Unit filename="../IopBios.h" /> <Unit filename="../IopBios.h" />
<Unit filename="../IopBios2.h" /> <Unit filename="../IopBios2.h" />
<Unit filename="../IopCommon.h" /> <Unit filename="../IopCommon.h" />
<Unit filename="../IopCounters.cpp" /> <Unit filename="../IopCounters.cpp" />
<Unit filename="../IopCounters.h" /> <Unit filename="../IopCounters.h" />
<Unit filename="../IopDma.cpp" /> <Unit filename="../IopDma.cpp" />
<Unit filename="../IopDma.h" /> <Unit filename="../IopDma.h" />
<Unit filename="../IopHw.cpp" /> <Unit filename="../IopHw.cpp" />
<Unit filename="../IopHw.h" /> <Unit filename="../IopHw.h" />
<Unit filename="../IopMem.cpp" /> <Unit filename="../IopMem.cpp" />
<Unit filename="../IopMem.h" /> <Unit filename="../IopMem.h" />
<Unit filename="../IopSio2.cpp" /> <Unit filename="../IopSio2.cpp" />
<Unit filename="../IopSio2.h" /> <Unit filename="../IopSio2.h" />
<Unit filename="../Linux/HostGui.cpp" /> <Unit filename="../Linux/HostGui.cpp" />
<Unit filename="../MMI.cpp" /> <Unit filename="../MMI.cpp" />
<Unit filename="../MTGS.cpp" /> <Unit filename="../MTGS.cpp" />
<Unit filename="../Memory.cpp" /> <Unit filename="../Memory.cpp" />
<Unit filename="../Memory.h" /> <Unit filename="../Memory.h" />
<Unit filename="../MemoryCard.cpp" /> <Unit filename="../MemoryCard.cpp" />
<Unit filename="../MemoryCard.h" /> <Unit filename="../MemoryCard.h" />
<Unit filename="../Misc.cpp" /> <Unit filename="../Misc.cpp" />
<Unit filename="../Misc.h" /> <Unit filename="../Misc.h" />
<Unit filename="../NakedAsm.h" /> <Unit filename="../NakedAsm.h" />
<Unit filename="../gui/AboutBoxDialog.cpp" /> <Unit filename="../Patch.cpp" />
<Unit filename="../gui/AboutBoxDialog.h" /> <Unit filename="../Patch.h" />
<Unit filename="../gui/AdvancedDialog.cpp" /> <Unit filename="../PathUtils.cpp" />
<Unit filename="../gui/AdvancedDialog.h" /> <Unit filename="../Paths.h" />
<Unit filename="../gui/App.h" /> <Unit filename="../Plugins.cpp" />
<Unit filename="../gui/AppConfig.cpp" /> <Unit filename="../Plugins.h" />
<Unit filename="../gui/CheckedStaticBox.cpp" /> <Unit filename="../PrecompiledHeader.h" />
<Unit filename="../gui/CheckedStaticBox.h" /> <Unit filename="../R3000A.cpp" />
<Unit filename="../gui/ConsoleLogger.cpp" /> <Unit filename="../R3000A.h" />
<Unit filename="../gui/GameFixesDialog.cpp" /> <Unit filename="../R3000AInterpreter.cpp" />
<Unit filename="../gui/GameFixesDialog.h" /> <Unit filename="../R3000AOpcodeTables.cpp" />
<Unit filename="../gui/HostGui.cpp" /> <Unit filename="../R5900.cpp" />
<Unit filename="../gui/IniInterface.cpp" /> <Unit filename="../R5900.h" />
<Unit filename="../gui/IniInterface.h" /> <Unit filename="../R5900Exceptions.h" />
<Unit filename="../gui/LogOptionsDialog.cpp" /> <Unit filename="../R5900OpcodeImpl.cpp" />
<Unit filename="../gui/LogOptionsDialog.h" /> <Unit filename="../R5900OpcodeTables.cpp" />
<Unit filename="../gui/MainFrame.cpp" /> <Unit filename="../R5900OpcodeTables.h" />
<Unit filename="../gui/MainFrame.h" /> <Unit filename="../RecoverySystem.cpp" />
<Unit filename="../gui/SpeedHacksDialog.cpp" /> <Unit filename="../SPR.cpp" />
<Unit filename="../gui/SpeedHacksDialog.h" /> <Unit filename="../SPR.h" />
<Unit filename="../gui/main.cpp" /> <Unit filename="../SafeArray.h" />
<Unit filename="../gui/wxHelpers.cpp" /> <Unit filename="../SamplProf.h" />
<Unit filename="../gui/wxHelpers.h" /> <Unit filename="../SaveState.cpp" />
<Unit filename="../Patch.cpp" /> <Unit filename="../SaveState.h" />
<Unit filename="../Patch.h" /> <Unit filename="../Saveslots.cpp" />
<Unit filename="../PathUtils.cpp" /> <Unit filename="../Sif.cpp" />
<Unit filename="../Paths.h" /> <Unit filename="../Sif.h" />
<Unit filename="../Plugins.cpp" /> <Unit filename="../Sifcmd.h" />
<Unit filename="../Plugins.h" /> <Unit filename="../Sio.cpp" />
<Unit filename="../PrecompiledHeader.h" /> <Unit filename="../Sio.h" />
<Unit filename="../R3000A.cpp" /> <Unit filename="../SourceLog.cpp" />
<Unit filename="../R3000A.h" /> <Unit filename="../Stats.cpp" />
<Unit filename="../R3000AInterpreter.cpp" /> <Unit filename="../Stats.h" />
<Unit filename="../R3000AOpcodeTables.cpp" /> <Unit filename="../StringUtils.h" />
<Unit filename="../R5900.cpp" /> <Unit filename="../System.cpp" />
<Unit filename="../R5900.h" /> <Unit filename="../System.h" />
<Unit filename="../R5900Exceptions.h" /> <Unit filename="../Threading.h" />
<Unit filename="../R5900OpcodeImpl.cpp" /> <Unit filename="../Utilities/AsciiFile.h" />
<Unit filename="../R5900OpcodeTables.cpp" /> <Unit filename="../Utilities/FileUtils.cpp" />
<Unit filename="../R5900OpcodeTables.h" /> <Unit filename="../Utilities/folderdesc.txt" />
<Unit filename="../RecoverySystem.cpp" /> <Unit filename="../VU.h" />
<Unit filename="../gui/Resources/AppIcon.h" /> <Unit filename="../VU0.cpp" />
<Unit filename="../gui/Resources/BackgroundLogo.h" /> <Unit filename="../VU0micro.cpp" />
<Unit filename="../gui/Resources/EmbeddedImage.h" /> <Unit filename="../VU0microInterp.cpp" />
<Unit filename="../gui/Resources/ps2_silver.h" /> <Unit filename="../VU1micro.cpp" />
<Unit filename="../SPR.cpp" /> <Unit filename="../VU1microInterp.cpp" />
<Unit filename="../SPR.h" /> <Unit filename="../VUflags.cpp" />
<Unit filename="../SafeArray.h" /> <Unit filename="../VUflags.h" />
<Unit filename="../SamplProf.h" /> <Unit filename="../VUmicro.h" />
<Unit filename="../SaveState.cpp" /> <Unit filename="../VUmicroMem.cpp" />
<Unit filename="../SaveState.h" /> <Unit filename="../VUops.cpp" />
<Unit filename="../Saveslots.cpp" /> <Unit filename="../VUops.h" />
<Unit filename="../Sif.cpp" /> <Unit filename="../Vif.cpp" />
<Unit filename="../Sif.h" /> <Unit filename="../Vif.h" />
<Unit filename="../Sifcmd.h" /> <Unit filename="../VifDma.cpp" />
<Unit filename="../Sio.cpp" /> <Unit filename="../VifDma.h" />
<Unit filename="../Sio.h" /> <Unit filename="../gui/AboutBoxDialog.cpp" />
<Unit filename="../SourceLog.cpp" /> <Unit filename="../gui/AboutBoxDialog.h" />
<Unit filename="../Stats.cpp" /> <Unit filename="../gui/AdvancedDialog.cpp" />
<Unit filename="../Stats.h" /> <Unit filename="../gui/AdvancedDialog.h" />
<Unit filename="../StringUtils.h" /> <Unit filename="../gui/App.h" />
<Unit filename="../System.cpp" /> <Unit filename="../gui/AppConfig.cpp" />
<Unit filename="../System.h" /> <Unit filename="../gui/CheckedStaticBox.cpp" />
<Unit filename="../Threading.h" /> <Unit filename="../gui/CheckedStaticBox.h" />
<Unit filename="../Utilities/AsciiFile.h" /> <Unit filename="../gui/ConsoleLogger.cpp" />
<Unit filename="../Utilities/FileUtils.cpp" /> <Unit filename="../gui/Dialogs/ConfigurationDialog.cpp" />
<Unit filename="../Utilities/folderdesc.txt" /> <Unit filename="../gui/Dialogs/ConfigurationDialog.h" />
<Unit filename="../VU.h" /> <Unit filename="../gui/GameFixesDialog.h" />
<Unit filename="../VU0.cpp" /> <Unit filename="../gui/HostGui.cpp" />
<Unit filename="../VU0micro.cpp" /> <Unit filename="../gui/IniInterface.cpp" />
<Unit filename="../VU0microInterp.cpp" /> <Unit filename="../gui/IniInterface.h" />
<Unit filename="../VU1micro.cpp" /> <Unit filename="../gui/LogOptionsDialog.cpp" />
<Unit filename="../VU1microInterp.cpp" /> <Unit filename="../gui/LogOptionsDialog.h" />
<Unit filename="../VUflags.cpp" /> <Unit filename="../gui/MainFrame.cpp" />
<Unit filename="../VUflags.h" /> <Unit filename="../gui/MainFrame.h" />
<Unit filename="../VUmicro.h" /> <Unit filename="../gui/Panels/AudioPanel.cpp" />
<Unit filename="../VUmicroMem.cpp" /> <Unit filename="../gui/Panels/ConfigurationPanels.h" />
<Unit filename="../VUops.cpp" /> <Unit filename="../gui/Panels/CpuPanel.cpp" />
<Unit filename="../VUops.h" /> <Unit filename="../gui/Panels/GameFixesPanel.cpp" />
<Unit filename="../Vif.cpp" /> <Unit filename="../gui/Panels/PathsPanel.cpp" />
<Unit filename="../Vif.h" /> <Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
<Unit filename="../VifDma.cpp" /> <Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
<Unit filename="../VifDma.h" /> <Unit filename="../gui/Panels/VideoPanel.cpp" />
<Unit filename="../pcsxAbout.bmp" /> <Unit filename="../gui/Resources/AppIcon.h" />
<Unit filename="../ps2/Iop/IopHwRead.cpp" /> <Unit filename="../gui/Resources/BackgroundLogo.h" />
<Unit filename="../ps2/Iop/IopHwWrite.cpp" /> <Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
<Unit filename="../ps2/Iop/IopHw_Internal.h" /> <Unit filename="../gui/Resources/ConfigIcon_Gamefixes.h" />
<Unit filename="../tinyxml/tinystr.cpp" /> <Unit filename="../gui/Resources/ConfigIcon_Paths.h" />
<Unit filename="../tinyxml/tinystr.h" /> <Unit filename="../gui/Resources/ConfigIcon_Plugins.h" />
<Unit filename="../tinyxml/tinyxml.cpp" /> <Unit filename="../gui/Resources/ConfigIcon_Speedhacks.h" />
<Unit filename="../tinyxml/tinyxml.h" /> <Unit filename="../gui/Resources/ConfigIcon_Video.h" />
<Unit filename="../tinyxml/tinyxmlerror.cpp" /> <Unit filename="../gui/Resources/EmbeddedImage.h" />
<Unit filename="../tinyxml/tinyxmlparser.cpp" /> <Unit filename="../gui/Resources/ps2_silver.h" />
<Unit filename="../vtlb.cpp" /> <Unit filename="../gui/SpeedHacksDialog.h" />
<Unit filename="../vtlb.h" /> <Unit filename="../gui/main.cpp" />
<Unit filename="../x86/BaseblockEx.cpp" /> <Unit filename="../gui/wxHelpers.cpp" />
<Unit filename="../x86/BaseblockEx.h" /> <Unit filename="../gui/wxHelpers.h" />
<Unit filename="../x86/aR3000A.S" /> <Unit filename="../pcsxAbout.bmp" />
<Unit filename="../x86/aVUzerorec.S" /> <Unit filename="../ps2/Iop/IopHwRead.cpp" />
<Unit filename="../x86/aVif.S" /> <Unit filename="../ps2/Iop/IopHwWrite.cpp" />
<Unit filename="../x86/iCOP0.cpp" /> <Unit filename="../ps2/Iop/IopHw_Internal.h" />
<Unit filename="../x86/iCOP0.h" /> <Unit filename="../tinyxml/tinystr.cpp" />
<Unit filename="../x86/iCOP2.cpp" /> <Unit filename="../tinyxml/tinystr.h" />
<Unit filename="../x86/iCore.cpp" /> <Unit filename="../tinyxml/tinyxml.cpp" />
<Unit filename="../x86/iCore.h" /> <Unit filename="../tinyxml/tinyxml.h" />
<Unit filename="../x86/iFPU.cpp" /> <Unit filename="../tinyxml/tinyxmlerror.cpp" />
<Unit filename="../x86/iFPU.h" /> <Unit filename="../tinyxml/tinyxmlparser.cpp" />
<Unit filename="../x86/iFPUd.cpp" /> <Unit filename="../vtlb.cpp" />
<Unit filename="../x86/iMMI.cpp" /> <Unit filename="../vtlb.h" />
<Unit filename="../x86/iMMI.h" /> <Unit filename="../x86/BaseblockEx.cpp" />
<Unit filename="../x86/iMisc.cpp" /> <Unit filename="../x86/BaseblockEx.h" />
<Unit filename="../x86/iR3000A.cpp" /> <Unit filename="../x86/aR3000A.S" />
<Unit filename="../x86/iR3000A.h" /> <Unit filename="../x86/aVUzerorec.S" />
<Unit filename="../x86/iR3000Atables.cpp" /> <Unit filename="../x86/aVif.S" />
<Unit filename="../x86/iR5900.h" /> <Unit filename="../x86/iCOP0.cpp" />
<Unit filename="../x86/iR5900Arit.h" /> <Unit filename="../x86/iCOP0.h" />
<Unit filename="../x86/iR5900AritImm.h" /> <Unit filename="../x86/iCOP2.cpp" />
<Unit filename="../x86/iR5900Branch.h" /> <Unit filename="../x86/iCore.cpp" />
<Unit filename="../x86/iR5900Jump.h" /> <Unit filename="../x86/iCore.h" />
<Unit filename="../x86/iR5900LoadStore.h" /> <Unit filename="../x86/iFPU.cpp" />
<Unit filename="../x86/iR5900Misc.cpp" /> <Unit filename="../x86/iFPU.h" />
<Unit filename="../x86/iR5900Move.h" /> <Unit filename="../x86/iFPUd.cpp" />
<Unit filename="../x86/iR5900MultDiv.h" /> <Unit filename="../x86/iMMI.cpp" />
<Unit filename="../x86/iR5900Shift.h" /> <Unit filename="../x86/iMMI.h" />
<Unit filename="../x86/iVU0micro.cpp" /> <Unit filename="../x86/iMisc.cpp" />
<Unit filename="../x86/iVU1micro.cpp" /> <Unit filename="../x86/iR3000A.cpp" />
<Unit filename="../x86/iVUmicro.h" /> <Unit filename="../x86/iR3000A.h" />
<Unit filename="../x86/iVUops.h" /> <Unit filename="../x86/iR3000Atables.cpp" />
<Unit filename="../x86/iVUzerorec.h" /> <Unit filename="../x86/iR5900.h" />
<Unit filename="../x86/iVif.cpp" /> <Unit filename="../x86/iR5900Arit.h" />
<Unit filename="../x86/ir5900tables.cpp" /> <Unit filename="../x86/iR5900AritImm.h" />
<Unit filename="../x86/ix86-32/aR5900-32.S" /> <Unit filename="../x86/iR5900Branch.h" />
<Unit filename="../x86/ix86-32/iCore-32.cpp" /> <Unit filename="../x86/iR5900Jump.h" />
<Unit filename="../x86/ix86-32/iR5900-32.cpp" /> <Unit filename="../x86/iR5900LoadStore.h" />
<Unit filename="../x86/ix86-32/iR5900Arit.cpp" /> <Unit filename="../x86/iR5900Misc.cpp" />
<Unit filename="../x86/ix86-32/iR5900AritImm.cpp" /> <Unit filename="../x86/iR5900Move.h" />
<Unit filename="../x86/ix86-32/iR5900Branch.cpp" /> <Unit filename="../x86/iR5900MultDiv.h" />
<Unit filename="../x86/ix86-32/iR5900Jump.cpp" /> <Unit filename="../x86/iR5900Shift.h" />
<Unit filename="../x86/ix86-32/iR5900LoadStore.cpp" /> <Unit filename="../x86/iVU0micro.cpp" />
<Unit filename="../x86/ix86-32/iR5900Move.cpp" /> <Unit filename="../x86/iVU1micro.cpp" />
<Unit filename="../x86/ix86-32/iR5900MultDiv.cpp" /> <Unit filename="../x86/iVUmicro.h" />
<Unit filename="../x86/ix86-32/iR5900Shift.cpp" /> <Unit filename="../x86/iVUops.h" />
<Unit filename="../x86/ix86-32/iR5900Templates.cpp" /> <Unit filename="../x86/iVUzerorec.h" />
<Unit filename="../x86/ix86-32/recVTLB.cpp" /> <Unit filename="../x86/iVif.cpp" />
<Unit filename="../x86/ix86/implement/dwshift.h" /> <Unit filename="../x86/ir5900tables.cpp" />
<Unit filename="../x86/ix86/implement/group1.h" /> <Unit filename="../x86/ix86-32/aR5900-32.S" />
<Unit filename="../x86/ix86/implement/group2.h" /> <Unit filename="../x86/ix86-32/iCore-32.cpp" />
<Unit filename="../x86/ix86/implement/group3.h" /> <Unit filename="../x86/ix86-32/iR5900-32.cpp" />
<Unit filename="../x86/ix86/implement/incdec.h" /> <Unit filename="../x86/ix86-32/iR5900Arit.cpp" />
<Unit filename="../x86/ix86/implement/jmpcall.h" /> <Unit filename="../x86/ix86-32/iR5900AritImm.cpp" />
<Unit filename="../x86/ix86/implement/movs.h" /> <Unit filename="../x86/ix86-32/iR5900Branch.cpp" />
<Unit filename="../x86/ix86/implement/test.h" /> <Unit filename="../x86/ix86-32/iR5900Jump.cpp" />
<Unit filename="../x86/ix86/implement/xchg.h" /> <Unit filename="../x86/ix86-32/iR5900LoadStore.cpp" />
<Unit filename="../x86/ix86/implement/xmm/arithmetic.h" /> <Unit filename="../x86/ix86-32/iR5900Move.cpp" />
<Unit filename="../x86/ix86/implement/xmm/basehelpers.h" /> <Unit filename="../x86/ix86-32/iR5900MultDiv.cpp" />
<Unit filename="../x86/ix86/implement/xmm/comparisons.h" /> <Unit filename="../x86/ix86-32/iR5900Shift.cpp" />
<Unit filename="../x86/ix86/implement/xmm/moremovs.h" /> <Unit filename="../x86/ix86-32/iR5900Templates.cpp" />
<Unit filename="../x86/ix86/implement/xmm/shufflepack.h" /> <Unit filename="../x86/ix86-32/recVTLB.cpp" />
<Unit filename="../x86/ix86/ix86.h" /> <Unit filename="../x86/ix86/implement/dwshift.h" />
<Unit filename="../x86/ix86/ix86_inlines.inl" /> <Unit filename="../x86/ix86/implement/group1.h" />
<Unit filename="../x86/ix86/ix86_instructions.h" /> <Unit filename="../x86/ix86/implement/group2.h" />
<Unit filename="../x86/ix86/ix86_internal.h" /> <Unit filename="../x86/ix86/implement/group3.h" />
<Unit filename="../x86/ix86/ix86_legacy_instructions.h" /> <Unit filename="../x86/ix86/implement/incdec.h" />
<Unit filename="../x86/ix86/ix86_legacy_internal.h" /> <Unit filename="../x86/ix86/implement/jmpcall.h" />
<Unit filename="../x86/ix86/ix86_legacy_types.h" /> <Unit filename="../x86/ix86/implement/movs.h" />
<Unit filename="../x86/ix86/ix86_sse_helpers.h" /> <Unit filename="../x86/ix86/implement/test.h" />
<Unit filename="../x86/ix86/ix86_types.h" /> <Unit filename="../x86/ix86/implement/xchg.h" />
<Unit filename="../x86/ix86/ix86_writers.inl" /> <Unit filename="../x86/ix86/implement/xmm/arithmetic.h" />
<Unit filename="../x86/microVU.cpp" /> <Unit filename="../x86/ix86/implement/xmm/basehelpers.h" />
<Unit filename="../x86/microVU.h" /> <Unit filename="../x86/ix86/implement/xmm/comparisons.h" />
<Unit filename="../x86/microVU_Alloc.h" /> <Unit filename="../x86/ix86/implement/xmm/moremovs.h" />
<Unit filename="../x86/microVU_Alloc.inl" /> <Unit filename="../x86/ix86/implement/xmm/shufflepack.h" />
<Unit filename="../x86/microVU_Analyze.inl" /> <Unit filename="../x86/ix86/ix86.h" />
<Unit filename="../x86/microVU_Compile.inl" /> <Unit filename="../x86/ix86/ix86_inlines.inl" />
<Unit filename="../x86/microVU_Execute.inl" /> <Unit filename="../x86/ix86/ix86_instructions.h" />
<Unit filename="../x86/microVU_Flags.inl" /> <Unit filename="../x86/ix86/ix86_internal.h" />
<Unit filename="../x86/microVU_IR.h" /> <Unit filename="../x86/ix86/ix86_legacy_instructions.h" />
<Unit filename="../x86/microVU_Log.inl" /> <Unit filename="../x86/ix86/ix86_legacy_internal.h" />
<Unit filename="../x86/microVU_Lower.inl" /> <Unit filename="../x86/ix86/ix86_legacy_types.h" />
<Unit filename="../x86/microVU_Misc.h" /> <Unit filename="../x86/ix86/ix86_sse_helpers.h" />
<Unit filename="../x86/microVU_Misc.inl" /> <Unit filename="../x86/ix86/ix86_types.h" />
<Unit filename="../x86/microVU_Tables.inl" /> <Unit filename="../x86/ix86/ix86_writers.inl" />
<Unit filename="../x86/microVU_Upper.inl" /> <Unit filename="../x86/microVU.cpp" />
<Unit filename="../x86/sVU_Debug.h" /> <Unit filename="../x86/microVU.h" />
<Unit filename="../x86/sVU_Lower.cpp" /> <Unit filename="../x86/microVU_Alloc.h" />
<Unit filename="../x86/sVU_Micro.cpp" /> <Unit filename="../x86/microVU_Alloc.inl" />
<Unit filename="../x86/sVU_Micro.h" /> <Unit filename="../x86/microVU_Analyze.inl" />
<Unit filename="../x86/sVU_Upper.cpp" /> <Unit filename="../x86/microVU_Compile.inl" />
<Unit filename="../x86/sVU_zerorec.cpp" /> <Unit filename="../x86/microVU_Execute.inl" />
<Unit filename="../x86/sVU_zerorec.h" /> <Unit filename="../x86/microVU_Flags.inl" />
<Unit filename="../xmlpatchloader.cpp" /> <Unit filename="../x86/microVU_IR.h" />
<Extensions> <Unit filename="../x86/microVU_Log.inl" />
<envvars /> <Unit filename="../x86/microVU_Lower.inl" />
<code_completion> <Unit filename="../x86/microVU_Misc.h" />
<search_path add="/usr/include/wx-2.8" /> <Unit filename="../x86/microVU_Misc.inl" />
</code_completion> <Unit filename="../x86/microVU_Tables.inl" />
<lib_finder disable_auto="1" /> <Unit filename="../x86/microVU_Upper.inl" />
<debugger /> <Unit filename="../x86/sVU_Debug.h" />
</Extensions> <Unit filename="../x86/sVU_Lower.cpp" />
</Project> <Unit filename="../x86/sVU_Micro.cpp" />
</CodeBlocks_project_file> <Unit filename="../x86/sVU_Micro.h" />
<Unit filename="../x86/sVU_Upper.cpp" />
<Unit filename="../x86/sVU_zerorec.cpp" />
<Unit filename="../x86/sVU_zerorec.h" />
<Unit filename="../xmlpatchloader.cpp" />
<Extensions>
<envvars />
<code_completion>
<search_path add="/usr/include/wx-2.8" />
</code_completion>
<lib_finder disable_auto="1" />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>

20
pcsx2/gui/App.h
View File

@ -20,7 +20,7 @@
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/fileconf.h> #include <wx/fileconf.h>
#include <wx/imaglist.h>
#include "System.h" #include "System.h"
class MainEmuFrame; class MainEmuFrame;
@ -65,7 +65,7 @@ protected:
virtual void DoClose(); virtual void DoClose();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
void OnMoveAround( wxMoveEvent& evt ); void OnMoveAround( wxMoveEvent& evt );
void OnResize( wxSizeEvent& evt ); void OnResize( wxSizeEvent& evt );
}; };
@ -78,8 +78,8 @@ struct AppImageIds
Speedhacks, Speedhacks,
Gamefixes, Gamefixes,
Video; Video;
ConfigIds() : ConfigIds() :
Paths( -1 ) Paths( -1 )
, Speedhacks( -1 ) , Speedhacks( -1 )
, Gamefixes( -1 ) , Gamefixes( -1 )
@ -87,7 +87,7 @@ struct AppImageIds
{ {
} }
} Config; } Config;
struct ToolbarIds struct ToolbarIds
{ {
int Settings, int Settings,
@ -96,8 +96,8 @@ struct AppImageIds
PluginVideo, PluginVideo,
PluginAudio, PluginAudio,
PluginPad; PluginPad;
ToolbarIds() : ToolbarIds() :
Settings( -1 ) Settings( -1 )
, Play( -1 ) , Play( -1 )
, PluginVideo( -1 ) , PluginVideo( -1 )
@ -119,7 +119,7 @@ protected:
wxImageList m_ConfigImages; wxImageList m_ConfigImages;
bool m_ConfigImagesAreLoaded; bool m_ConfigImagesAreLoaded;
wxImageList* m_ToolbarImages; // dynamic (pointer) to allow for large/small redefinition. wxImageList* m_ToolbarImages; // dynamic (pointer) to allow for large/small redefinition.
AppImageIds m_ImageId; AppImageIds m_ImageId;
@ -136,7 +136,7 @@ public:
const wxBitmap& GetLogoBitmap(); const wxBitmap& GetLogoBitmap();
wxImageList& GetImgList_Config(); wxImageList& GetImgList_Config();
wxImageList& GetImgList_Toolbars(); wxImageList& GetImgList_Toolbars();
const AppImageIds& GetImgId() const { return m_ImageId; } const AppImageIds& GetImgId() const { return m_ImageId; }
MainEmuFrame& GetMainFrame() const MainEmuFrame& GetMainFrame() const
@ -147,7 +147,7 @@ public:
ConsoleLogFrame* GetConsoleFrame() const { return m_ConsoleFrame; } ConsoleLogFrame* GetConsoleFrame() const { return m_ConsoleFrame; }
void SetConsoleFrame( ConsoleLogFrame& frame ) { m_ConsoleFrame = &frame; } void SetConsoleFrame( ConsoleLogFrame& frame ) { m_ConsoleFrame = &frame; }
bool TryOpenConfigCwd(); bool TryOpenConfigCwd();
}; };

9
pcsx2/gui/AppConfig.cpp
View File

@ -82,7 +82,7 @@ namespace PathDefs
{ {
return AppRoot + Plugins; return AppRoot + Plugins;
} }
wxDirName GetThemes() wxDirName GetThemes()
{ {
return AppRoot + Themes; return AppRoot + Themes;
@ -166,7 +166,10 @@ wxString AppConfig::FullpathHelpers::Bios() const { return Path::Combine( m_conf
wxString AppConfig::FullpathHelpers::Mcd( uint mcdidx ) const { return Path::Combine( m_conf.Folders.MemoryCards, m_conf.MemoryCards.Mcd[mcdidx].Filename ); } wxString AppConfig::FullpathHelpers::Mcd( uint mcdidx ) const { return Path::Combine( m_conf.Folders.MemoryCards, m_conf.MemoryCards.Mcd[mcdidx].Filename ); }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#define IniEntry( varname, defval ) ini.Entry( L#varname, varname, defval ) // GCC Note: wxT() macro is required when using string token pasting. For some reason L generates
// syntax errors. >_<
//
#define IniEntry( varname, defval ) ini.Entry( wxT(#varname), varname, defval )
void AppConfig::LoadSave( IniInterface& ini ) void AppConfig::LoadSave( IniInterface& ini )
{ {
@ -212,7 +215,7 @@ void AppConfig::ConsoleLogOptions::LoadSave( IniInterface& ini )
void AppConfig::SpeedhackOptions::LoadSave( IniInterface& ini ) void AppConfig::SpeedhackOptions::LoadSave( IniInterface& ini )
{ {
ini.SetPath( L"Speedhacks" ); ini.SetPath( L"Speedhacks" );
ini.SetPath( L".." ); ini.SetPath( L".." );
} }

8
pcsx2/gui/Dialogs/ConfigurationDialog.cpp
View File

@ -34,8 +34,14 @@ using namespace Panels;
Dialogs::ConfigurationDialog::ConfigurationDialog( wxWindow* parent, int id ) : Dialogs::ConfigurationDialog::ConfigurationDialog( wxWindow* parent, int id ) :
wxDialogWithHelpers( parent, id, _T("PCSX2 Configuration"), true ) wxDialogWithHelpers( parent, id, _T("PCSX2 Configuration"), true )
{ {
#if defined(__WXMAC__) || defined(__WXMSW__)
int orient = wxBK_TOP;
#else
int orient = wxBK_LEFT;
#endif
wxBoxSizer& mainSizer = *new wxBoxSizer( wxVERTICAL ); wxBoxSizer& mainSizer = *new wxBoxSizer( wxVERTICAL );
wxListbook& Notebook = *new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_TOP ); wxListbook& Notebook = *new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, orient );
Notebook.SetImageList( &wxGetApp().GetImgList_Config() ); Notebook.SetImageList( &wxGetApp().GetImgList_Config() );

3
pcsx2/gui/Dialogs/ConfigurationDialog.h
View File

@ -20,7 +20,6 @@
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/imaglist.h>
#include <wx/propdlg.h> #include <wx/propdlg.h>
#include "wxHelpers.h" #include "wxHelpers.h"
@ -37,4 +36,4 @@ namespace Dialogs
public: public:
}; };
} }

34
pcsx2/gui/main.cpp
View File

@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "IniInterface.h" #include "IniInterface.h"
#include "MainFrame.h" #include "MainFrame.h"
@ -111,7 +111,7 @@ bool Pcsx2App::OnInit()
// been installed or configured. The first place we look is in our program's working // been installed or configured. The first place we look is in our program's working
// directory. If the ini there exist, and is *not* empty, then we'll use it. Otherwise // directory. If the ini there exist, and is *not* empty, then we'll use it. Otherwise
// we fall back on the ini file in the user's Documents folder. // we fall back on the ini file in the user's Documents folder.
if( !TryOpenConfigCwd() ) if( !TryOpenConfigCwd() )
{ {
PathDefs::GetDocuments().Mkdir(); PathDefs::GetDocuments().Mkdir();
@ -180,12 +180,12 @@ const wxImage& LoadImageAny(
} }
base.SetExt( L"bmp" ); base.SetExt( L"bmp" );
if( base.FileExists() ) if( base.FileExists() )
{ {
if( dest.LoadFile( base.GetFullPath() ) ) return dest; if( dest.LoadFile( base.GetFullPath() ) ) return dest;
} }
} }
return dest = onFail.Get(); return dest = onFail.Get();
} }
@ -209,7 +209,7 @@ const wxBitmap& Pcsx2App::GetLogoBitmap()
// loading theme from zipfile. // loading theme from zipfile.
//wxFileInputStream stream( zipped.ToString() ) //wxFileInputStream stream( zipped.ToString() )
//wxZipInputStream zstream( stream ); //wxZipInputStream zstream( stream );
Console::Error( "Loading themes from zipfile is not supported yet.\nFalling back on default theme." ); Console::Error( "Loading themes from zipfile is not supported yet.\nFalling back on default theme." );
} }
@ -218,7 +218,8 @@ const wxBitmap& Pcsx2App::GetLogoBitmap()
} }
wxImage img; wxImage img;
LoadImageAny( img, useTheme, mess, L"BackgroundLogo", EmbeddedImage<png_BackgroundLogo>() ); EmbeddedImage<png_BackgroundLogo> temp; // because gcc can't allow non-const temporaries.
LoadImageAny( img, useTheme, mess, L"BackgroundLogo", temp );
m_Bitmap_Logo = new wxBitmap( img ); m_Bitmap_Logo = new wxBitmap( img );
return *m_Bitmap_Logo; return *m_Bitmap_Logo;
@ -245,20 +246,23 @@ wxImageList& Pcsx2App::GetImgList_Config()
} }
wxImage img; wxImage img;
int width, height;
m_ConfigImages.GetSize( 0, width, height ); // GCC Specific: wxT() macro is required when using string token pasting. For some reason L
// generates syntax errors. >_<
#undef FancyLoadMacro #undef FancyLoadMacro
#define FancyLoadMacro( name ) \ #define FancyLoadMacro( name ) \
{ \
EmbeddedImage<png_ConfigIcon_##name> temp( g_Conf.Listbook_ImageSize, g_Conf.Listbook_ImageSize ); \
m_ImageId.Config.name = m_ConfigImages.Add( LoadImageAny( \ m_ImageId.Config.name = m_ConfigImages.Add( LoadImageAny( \
img, useTheme, mess, L"ConfigIcon_" L#name, EmbeddedImage<png_ConfigIcon_##name>( width, height ) ) \ img, useTheme, mess, L"ConfigIcon_" wxT(#name), temp ) \
); ); \
}
FancyLoadMacro( Paths ); FancyLoadMacro( Paths );
FancyLoadMacro( Gamefixes ); FancyLoadMacro( Gamefixes );
FancyLoadMacro( Speedhacks ); FancyLoadMacro( Speedhacks );
FancyLoadMacro( Video ); FancyLoadMacro( Video );
} }
m_ConfigImagesAreLoaded = true; m_ConfigImagesAreLoaded = true;
return m_ConfigImages; return m_ConfigImages;
@ -269,7 +273,7 @@ wxImageList& Pcsx2App::GetImgList_Toolbars()
{ {
if( m_ToolbarImages == NULL ) if( m_ToolbarImages == NULL )
{ {
const int imgSize = g_Conf.Toolbar_UseLargeImages ? 64 : 32; const int imgSize = g_Conf.Toolbar_ImageSize ? 64 : 32;
m_ToolbarImages = new wxImageList( imgSize, imgSize ); m_ToolbarImages = new wxImageList( imgSize, imgSize );
wxFileName mess; wxFileName mess;
bool useTheme = (g_Conf.DeskTheme != L"default"); bool useTheme = (g_Conf.DeskTheme != L"default");
@ -283,7 +287,11 @@ wxImageList& Pcsx2App::GetImgList_Toolbars()
wxImage img; wxImage img;
#undef FancyLoadMacro #undef FancyLoadMacro
#define FancyLoadMacro( name ) \ #define FancyLoadMacro( name ) \
m_ImageId.Toolbars.name = m_ConfigImages.Add( LoadImageAny64( img, useTheme, g_Conf.Toolbar_UseLargeImages, mess, L"ToolbarIcon64" L#name, EmbeddedImage<png_ToolbarIcon64_##name>() ) ); { \
EmbeddedImage<png_ToolbarIcon_##name> temp( imgSize, imgSize ); \
m_ImageId.Toolbars.name = m_ConfigImages.Add( LoadImageAny( img, useTheme, mess, L"ToolbarIcon" wxT(#name), temp ) ); \
}
} }
return *m_ToolbarImages; return *m_ToolbarImages;
} }