From 22427f89bc25522327f5378ec1b25a8f82200993 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 28 Jul 2009 08:27:45 +0000 Subject: [PATCH] Njoy can now be build with wxUSE_UNICODE 1 on windows move all static ini paths to Common git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3896 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/CommonPaths.h | 35 ++++++++++++++++--- Source/Core/Core/Src/ConfigManager.cpp | 2 +- .../Core/DebuggerWX/Src/BreakpointWindow.cpp | 8 ++--- Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp | 8 ++--- Source/Plugins/Plugin_DSP_LLE/Src/Config.cpp | 10 ++---- .../Plugin_PadSimple/Src/PadSimple.cpp | 6 ++-- Source/Plugins/Plugin_VideoDX9/Src/Config.cpp | 6 ++-- Source/Plugins/Plugin_VideoOGL/Src/Config.cpp | 8 ++--- Source/Plugins/Plugin_Wiimote/Src/Config.cpp | 14 ++++---- .../Plugin_Wiimote/Src/ConfigRecording.cpp | 10 +++--- Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp | 2 +- Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp | 6 ++-- .../Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp | 10 +++--- .../Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 30 ++++++++-------- .../Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp | 7 ++-- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h | 12 +++---- 16 files changed, 96 insertions(+), 78 deletions(-) diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 12b521c02d..acba16ccd4 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -82,11 +82,24 @@ #define WII_SYS_DIR "Wii" // Filenames -#define DOLPHIN_CONFIG "Dolphin.ini" -#define DEBUGGER_CONFIG "Debugger.ini" -#define LOGGER_CONFIG "Logger.ini" -#define TOTALDB "totaldb.dsy" -#define MAIN_LOG "dolphin.log" +#define DOLPHIN_CONFIG "Dolphin.ini" +#define DEBUGGER_CONFIG "Debugger.ini" +#define BREAKPOINT_CONFIG "BreakPoints.ini" +#define MEMCHECKS_CONFIG "MemoryChecks.ini" +#define LOGGER_CONFIG "Logger.ini" + +#define DX9_CONFIG "gfx_dx9.ini" +#define OPENGL_CONFIG "gfx_opengl.ini" +#define DSPHLE_CONFIG "DSP.ini" +#define DSPLLE_CONFIG "DSPLLE.ini" +#define NJOY_CONFIG "nJoy.ini" +#define PSIMPLE_CONFIG "pad.ini" +#define WM_CONFIG "Wiimote.ini" +#define WM_IR_CONFIG "IR Pointer.ini" +#define WM_MOVEMENT_CONFIG "WiimoteMovement.ini" + +#define TOTALDB "totaldb.dsy" +#define MAIN_LOG "dolphin.log" #define DEFAULT_GFX_PLUGIN PLUGIN_PREFIX "Plugin_VideoOGL" PLUGIN_SUFFIX #define DEFAULT_DSP_PLUGIN PLUGIN_PREFIX "Plugin_DSP_HLE" PLUGIN_SUFFIX @@ -154,6 +167,18 @@ #define CONFIG_FILE FULL_CONFIG_DIR DOLPHIN_CONFIG #define DEBUGGER_CONFIG_FILE FULL_CONFIG_DIR DEBUGGER_CONFIG #define LOGGER_CONFIG_FILE FULL_CONFIG_DIR LOGGER_CONFIG +#define BREAKPOINT_CONFIG_FILE FULL_GAMECONFIG_DIR BREAKPOINT_CONFIG +#define MEMCHECKS_CONFIG_FILE FULL_GAMECONFIG_DIR MEMCHECKS_CONFIG + +#define DX9_CONFIG_FILE FULL_CONFIG_DIR DX9_CONFIG +#define OPENGL_CONFIG_FILE FULL_CONFIG_DIR OPENGL_CONFIG +#define DSPHLE_CONFIG_FILE FULL_CONFIG_DIR DSPHLE_CONFIG +#define DSPLLE_CONFIG_FILE FULL_CONFIG_DIR DSPLLE_CONFIG +#define NJOY_CONFIG_FILE FULL_CONFIG_DIR NJOY_CONFIG +#define PSIMPLE_CONFIG_FILE FULL_CONFIG_DIR PSIMPLE_CONFIG +#define WM_CONFIG_FILE FULL_CONFIG_DIR WM_CONFIG +#define WM_IR_CONFIG_FILE FULL_CONFIG_DIR WM_IR_CONFIG +#define WM_MOVEMENT_CONFIG_FILE FULL_CONFIG_DIR WM_MOVEMENT_CONFIG #define TOTALDB_FILE FULL_SYSDATA_DIR TOTALDB #define MAINRAM_DUMP_FILE FULL_DUMP_DIR RAM_DUMP diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 35de9e4465..4ee17b37da 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -258,7 +258,7 @@ void SConfig::LoadSettingsHLE() { IniFile ini; // - ini.Load(FULL_CONFIG_DIR "DSP.ini"); + ini.Load(DSPHLE_CONFIG_FILE); ini.Get("Config", "EnableRE0AudioFix", &m_EnableRE0Fix, false); // RE0 Hack } diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp index dd895119b4..11170ff6f8 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp +++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp @@ -226,7 +226,7 @@ CBreakPointWindow::OnAddBreakPointMany(wxCommandEvent& event) { // load ini IniFile ini; - std::string filename = std::string(FULL_GAMECONFIG_DIR "BreakPoints.ini"); + std::string filename = std::string(BREAKPOINT_CONFIG_FILE); if (ini.Load(filename.c_str())) // check if there is any file there { @@ -252,7 +252,7 @@ CBreakPointWindow::OnAddBreakPointMany(wxCommandEvent& event) } else { - wxMessageBox(_T("You have no GameIni/BreakPoints.ini file")); + wxMessageBox(_T("You have no "BREAKPOINT_CONFIG_FILE " file")); } } @@ -275,7 +275,7 @@ CBreakPointWindow::OnAddMemoryCheckMany(wxCommandEvent& event) { // load ini IniFile ini; - std::string filename = std::string(FULL_GAMECONFIG_DIR "MemoryChecks.ini"); + std::string filename = std::string(MEMCHECKS_CONFIG_FILE); if (ini.Load(filename.c_str())) { @@ -354,7 +354,7 @@ CBreakPointWindow::OnAddMemoryCheckMany(wxCommandEvent& event) } else { - wxMessageBox(_T("You have no " FULL_GAMECONFIG_DIR "MemoryChecks.ini file")); + wxMessageBox(_T("You have no " MEMCHECKS_CONFIG_FILE " file")); } } // ================= diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp index 9fa9bb8f94..10a67b9789 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp @@ -31,10 +31,8 @@ CConfig::CConfig() void CConfig::Load() { // first load defaults - std::string temp; - IniFile file; - file.Load(FULL_CONFIG_DIR "DSP.ini"); + file.Load(DSPHLE_CONFIG_FILE); file.Get("Config", "EnableHLEAudio", &m_EnableHLEAudio, true); // Sound Settings file.Get("Config", "EnableRE0AudioFix", &m_EnableRE0Fix, false); // RE0 Hack ac_Config.Load(file); @@ -43,12 +41,12 @@ void CConfig::Load() void CConfig::Save() { IniFile file; - file.Load(FULL_CONFIG_DIR "DSP.ini"); + file.Load(DSPHLE_CONFIG_FILE); file.Set("Config", "EnableHLEAudio", m_EnableHLEAudio); // Sound Settings file.Set("Config", "EnableRE0AudioFix", m_EnableRE0Fix); // RE0 Hack ac_Config.Set(file); - file.Save(FULL_CONFIG_DIR "DSP.ini"); + file.Save(DSPHLE_CONFIG_FILE); } void CConfig::GameIniLoad() { diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/Config.cpp index 53c3f74507..de2ad03d7d 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/Config.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/Config.cpp @@ -20,8 +20,6 @@ #include "Config.h" #include "AudioCommon.h" -#define LLE_CONFIG_FILE "DSPLLE.ini" - CConfig g_Config; CConfig::CConfig() @@ -32,18 +30,16 @@ CConfig::CConfig() void CConfig::Load() { // first load defaults - std::string temp; - IniFile file; - file.Load(FULL_CONFIG_DIR LLE_CONFIG_FILE); + file.Load(DSPLLE_CONFIG_FILE); ac_Config.Load(file); } void CConfig::Save() { IniFile file; - file.Load(FULL_CONFIG_DIR LLE_CONFIG_FILE); + file.Load(DSPLLE_CONFIG_FILE); ac_Config.Set(file); - file.Save(FULL_CONFIG_DIR LLE_CONFIG_FILE); + file.Save(DSPLLE_CONFIG_FILE); } diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index 6d0e03d5fa..954b9d3022 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -911,7 +911,7 @@ void LoadConfig() }; #endif IniFile file; - file.Load(FULL_CONFIG_DIR "pad.ini"); + file.Load(PSIMPLE_CONFIG_FILE); for(int i = 0; i < 4; i++) { @@ -946,7 +946,7 @@ void LoadConfig() void SaveConfig() { IniFile file; - file.Load(FULL_CONFIG_DIR "pad.ini"); + file.Load(PSIMPLE_CONFIG_FILE); for(int i = 0; i < 4; i++) { @@ -969,5 +969,5 @@ void SaveConfig() file.Set(SectionName, controlNames[x], pad[i].keyForControl[x]); } } - file.Save(FULL_CONFIG_DIR "pad.ini"); + file.Save(PSIMPLE_CONFIG_FILE); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Config.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Config.cpp index d614870fc6..c380740cb8 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Config.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Config.cpp @@ -27,7 +27,7 @@ Config::Config() void Config::Load() { IniFile iniFile; - iniFile.Load(FULL_CONFIG_DIR "gfx_dx9.ini"); + iniFile.Load(DX9_CONFIG_FILE); iniFile.Get("Hardware", "Adapter", &iAdapter, 0); iniFile.Get("Hardware", "WindowedRes", &iWindowedRes, 0); iniFile.Get("Hardware", "FullscreenRes", &iFSResolution, 0); @@ -57,7 +57,7 @@ void Config::Load() void Config::Save() { IniFile iniFile; - iniFile.Load(FULL_CONFIG_DIR "gfx_dx9.ini"); + iniFile.Load(DX9_CONFIG_FILE); iniFile.Set("Hardware", "Adapter", iAdapter); iniFile.Set("Hardware", "WindowedRes", iWindowedRes); iniFile.Set("Hardware", "FullscreenRes", iFSResolution); @@ -79,5 +79,5 @@ void Config::Save() iniFile.Set("Enhancements", "ForceFiltering", bForceFiltering); iniFile.Set("Enhancements", "ForceMaxAniso", bForceMaxAniso); - iniFile.Save(FULL_CONFIG_DIR "gfx_dx9.ini"); + iniFile.Save(DX9_CONFIG_FILE); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp index 0055ac0f17..82d1837ed2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp @@ -31,7 +31,7 @@ void Config::Load() { std::string temp; IniFile iniFile; - iniFile.Load(FULL_CONFIG_DIR "gfx_opengl.ini"); + iniFile.Load(OPENGL_CONFIG_FILE); // get resolution iniFile.Get("Hardware", "WindowedRes", &temp, "640x480"); @@ -83,7 +83,7 @@ void Config::Load() iniFile.Get("Hacks", "ProjectionHack", &iPhackvalue, 0); // Load common settings - iniFile.Load(FULL_CONFIG_DIR "Dolphin.ini"); + iniFile.Load(CONFIG_FILE); bool bTmp; iniFile.Get("Interface", "UsePanicHandlers", &bTmp, true); SetEnableAlert(bTmp); @@ -129,7 +129,7 @@ void Config::GameIniLoad() void Config::Save() { IniFile iniFile; - iniFile.Load(FULL_CONFIG_DIR "gfx_opengl.ini"); + iniFile.Load(OPENGL_CONFIG_FILE); iniFile.Set("Hardware", "WindowedRes", iInternalRes); iniFile.Set("Hardware", "FullscreenRes", iFSResolution); iniFile.Set("Hardware", "Fullscreen", bFullscreen); @@ -175,5 +175,5 @@ void Config::Save() iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToRAM); iniFile.Set("Hacks", "ProjectionHack", iPhackvalue); - iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini"); + iniFile.Save(OPENGL_CONFIG_FILE); } diff --git a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp index 4d80df4ca5..7923d9f356 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp @@ -216,7 +216,7 @@ void Config::Load(bool ChangePad) { std::string temp; IniFile iniFile; - iniFile.Load(FULL_CONFIG_DIR "Wiimote.ini"); + iniFile.Load(WM_CONFIG_FILE); // General iniFile.Get("Settings", "SidewaysDPad", &bSidewaysDPad, false); @@ -296,7 +296,7 @@ void Config::Load(bool ChangePad) iniFile.Get(joySectionName.c_str(), "PitchInvert", &WiiMoteEmu::PadMapping[i].bPitchInvert, false); } // Load the IR cursor settings if it's avaliable for the GameId, if not load the default settings - iniFile.Load(FULL_CONFIG_DIR "IR Pointer.ini"); + iniFile.Load(WM_IR_CONFIG_FILE); char TmpSection[32]; sprintf(TmpSection, "%s", g_ISOId ? Hex2Ascii(g_ISOId).c_str() : "Default"); iniFile.Get(TmpSection, "IRLeft", &iIRLeft, LEFT); @@ -307,7 +307,7 @@ void Config::Load(bool ChangePad) // Load a few screen settings to. If these are added to the DirectX plugin it's probably // better to place them in the main Dolphin.ini file - iniFile.Load(FULL_CONFIG_DIR "gfx_opengl.ini"); + iniFile.Load(OPENGL_CONFIG_FILE); iniFile.Get("Settings", "KeepAR_4_3", &bKeepAR43, false); iniFile.Get("Settings", "KeepAR_16_9", &bKeepAR169, false); iniFile.Get("Settings", "Crop", &bCrop, false); @@ -318,7 +318,7 @@ void Config::Load(bool ChangePad) void Config::Save(int Slot) { IniFile iniFile; - iniFile.Load(FULL_CONFIG_DIR "Wiimote.ini"); + iniFile.Load(WM_CONFIG_FILE); iniFile.Set("Settings", "SidewaysDPad", bSidewaysDPad); iniFile.Set("Settings", "ExtensionConnected", iExtensionConnected); @@ -395,17 +395,17 @@ void Config::Save(int Slot) iniFile.Set(joySectionName.c_str(), "PitchInvert", WiiMoteEmu::PadMapping[i].bPitchInvert); } - iniFile.Save(FULL_CONFIG_DIR "Wiimote.ini"); + iniFile.Save(WM_CONFIG_FILE); // Save the IR cursor settings if it's avaliable for the GameId, if not save the default settings - iniFile.Load(FULL_CONFIG_DIR "IR Pointer.ini"); + iniFile.Load(WM_IR_CONFIG_FILE); char TmpSection[32]; sprintf(TmpSection, "%s", g_ISOId ? Hex2Ascii(g_ISOId).c_str() : "Default"); iniFile.Set(TmpSection, "IRLeft", iIRLeft); iniFile.Set(TmpSection, "IRTop", iIRTop); iniFile.Set(TmpSection, "IRWidth", iIRWidth); iniFile.Set(TmpSection, "IRHeight", iIRHeight); - iniFile.Save(FULL_CONFIG_DIR "IR Pointer.ini"); + iniFile.Save(WM_IR_CONFIG_FILE); //INFO_LOG(CONSOLE, "Save()\n"); } \ No newline at end of file diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp index 44e3f3e2db..4c3b313371 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp @@ -32,7 +32,7 @@ void WiimoteRecordingConfigDialog::LoadFile() INFO_LOG(CONSOLE, "LoadFile()\n"); IniFile file; - file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini"); + file.Load(WM_MOVEMENT_CONFIG_FILE); for (int i = 1; i < (RECORDING_ROWS + 1); i++) { @@ -75,7 +75,7 @@ void WiimoteRecordingConfigDialog::SaveFile() INFO_LOG(CONSOLE, "SaveFile\n"); IniFile file; - file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini"); + file.Load(WM_MOVEMENT_CONFIG_FILE); for(int i = 1; i < (RECORDING_ROWS + 1); i++) { @@ -107,7 +107,7 @@ void WiimoteRecordingConfigDialog::SaveFile() file.Set(SaveName.c_str(), "PlaybackSpeed", m_RecordPlayBackSpeed[i]->GetSelection()); } - file.Save(FULL_CONFIG_DIR "WiimoteMovement.ini"); + file.Save(WM_MOVEMENT_CONFIG_FILE); INFO_LOG(CONSOLE, "SaveFile()\n"); } @@ -338,7 +338,7 @@ void WiimoteRecordingConfigDialog::CreateGUIControlsRecording() void WiimoteRecordingConfigDialog::ConvertToString() { IniFile file; - file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini"); + file.Load(WM_MOVEMENT_CONFIG_FILE); std::string TmpStr = "", TmpIR = "", TmpTime = ""; for (int i = 0; i < (int)m_vRecording.size(); i++) @@ -402,7 +402,7 @@ void WiimoteRecordingConfigDialog::ConvertToString() m_RecordPlayBackSpeed[m_iRecordTo]->SetSelection(3); } - file.Save(FULL_CONFIG_DIR "WiimoteMovement.ini"); + file.Save(WM_MOVEMENT_CONFIG_FILE); INFO_LOG(CONSOLE, "Save recording to WiimoteMovement.ini\n"); } diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp index e88b45caa5..ef159db970 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp @@ -186,7 +186,7 @@ void LoadRecordedMovements() INFO_LOG(WII_IPC_WIIMOTE, "LoadRecordedMovements()\n"); IniFile file; - file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini"); + file.Load(WM_MOVEMENT_CONFIG_FILE); for(int i = 0; i < RECORDING_ROWS; i++) { diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp index 2933e26fc2..521fcd4e2f 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp @@ -102,7 +102,7 @@ void Config::Save(int Slot) // Load ini file IniFile file; - file.Load(FULL_CONFIG_DIR "nJoy.ini"); + file.Load(NJOY_CONFIG_FILE); // ================================================================== // Global settings @@ -189,7 +189,7 @@ void Config::Save(int Slot) INFO_LOG(CONSOLE, "%i: Save: %i\n", 0, PadMapping[0].halfpress); - file.Save(FULL_CONFIG_DIR "nJoy.ini"); + file.Save(NJOY_CONFIG_FILE); } // Load settings from file @@ -201,7 +201,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID) // Load file IniFile file; - file.Load(FULL_CONFIG_DIR "nJoy.ini"); + file.Load(NJOY_CONFIG_FILE); bool Tmp; // Tmp storage // ================================================================== diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp index e2542c61df..f6e296467e 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp @@ -63,12 +63,12 @@ void AboutBox::CreateGUIControls() SetFont(f); #endif - m_thankyoutext = new wxStaticText(this, ID_THANKYOU, wxT(THANKYOU), wxPoint(18,196), wxDefaultSize, 0, wxT(THANKYOU)); + m_thankyoutext = new wxStaticText(this, ID_THANKYOU, THANKYOU, wxPoint(18,196), wxDefaultSize, 0, wxEmptyString); m_thankyoutext->Wrap(167); - m_specialthanks = new wxStaticText(this, ID_SPECIALTHANKS, wxT("F|RES and ector."), wxPoint(18,153), wxDefaultSize, 0, wxT("F|RES and ector.")); - m_pluginversion = new wxStaticText(this, ID_PLUGINVERSION, wxT("nJoy v"INPUT_VERSION" by Falcon4ever\n" "Release: "RELDAY"/"RELMONTH"/"RELYEAR"\n" "www.multigesture.net"), wxPoint(18,80), wxDefaultSize, 0, wxT("nJoy v"INPUT_VERSION" by Falcon4ever\n" "Release: "RELDAY"/"RELMONTH"/"RELYEAR"\n" "www.multigesture.net")); - m_OK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(116,343), wxSize(75,25), 0, wxDefaultValidator, wxT("OK")); - m_version = new wxStaticText(this, ID_STATUSV, wxT("PUBLIC RELEASE"), wxPoint(14,349), wxDefaultSize, 0, wxT("PUBLIC RELEASE")); + m_specialthanks = new wxStaticText(this, ID_SPECIALTHANKS, wxT("F|RES and ector."), wxPoint(18,153), wxDefaultSize, 0, wxEmptyString); + m_pluginversion = new wxStaticText(this, ID_PLUGINVERSION, PLUGIN_VER_STR, wxPoint(18,80), wxDefaultSize, 0, wxEmptyString); + m_OK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(116,343), wxSize(75,25), 0, wxDefaultValidator, wxEmptyString); + m_version = new wxStaticText(this, ID_STATUSV, wxT("PUBLIC RELEASE"), wxPoint(14,349), wxDefaultSize, 0, wxEmptyString); m_thankyougroup = new wxStaticBox(this, IDG_THANKYOU, wxT("Greetings to:"), wxPoint(10,180), wxSize(180,160)); m_specialthanksgroup = new wxStaticBox(this, IDG_SPECIALTHANKS, wxT("Special thanks to:"), wxPoint(10,135), wxSize(180,39)); m_pluginversiongroup = new wxStaticBox(this, IDG_PLUGINVERSION, wxT("Plugin info:"), wxPoint(10,61), wxSize(180,68)); diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index b0e2416016..e45146c5a2 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -232,7 +232,7 @@ void PADConfigDialognJoy::LogMsg(const char* format, ...) std::string StrTmp = buffer; //StrTmp += Common::Timer::GetTimeFormatted(); - if(m_TCDebugging) m_TCDebugging->AppendText(StrTmp.c_str()); + if(m_TCDebugging) m_TCDebugging->AppendText(wxString::FromAscii(StrTmp.c_str())); } #endif } @@ -347,7 +347,7 @@ void PADConfigDialognJoy::ToBlank(bool ToBlank) #ifndef _WIN32 if(!strcmp(GetButtonText(i, j).ToAscii(), "-1")) SetButtonText(i, "", j); #else - if(GetButtonText(i, j) == "-1") SetButtonText(i, "", j); + if(GetButtonText(i, j) == wxT("-1")) SetButtonText(i, "", j); #endif } else @@ -571,9 +571,9 @@ void PADConfigDialognJoy::CreateGUIControls() INFO_LOG(CONSOLE, "CreateGUIControls()\n"); #ifndef _DEBUG - SetTitle(wxT("Configure: nJoy v"INPUT_VERSION" Input Plugin")); + SetTitle(wxT("Configure: nJoy v")wxT(INPUT_VERSION)wxT(" Input Plugin")); #else - SetTitle(wxT("Configure: nJoy v"INPUT_VERSION" (Debug) Input Plugin")); + SetTitle(wxT("Configure: nJoy v")wxT(INPUT_VERSION)wxT(" (Debug) Input Plugin")); #endif SetIcon(wxNullIcon); @@ -844,10 +844,10 @@ void PADConfigDialognJoy::CreateGUIControls() m_TriggerType[i]->SetToolTip(wxT( "Select XInput if you want the triggers to work with the XBox 360 pad." )); - m_CBSaveByID[i]->SetToolTip(wxString::Format(wxT( - "Map these settings to the selected controller device instead of to the" - "\nselected slot (1, 2, 3 or 4). This may be a more convenient way" - "\nto save your settings if you have multiple controllers.") + m_CBSaveByID[i]->SetToolTip(wxString::Format( + wxT("Map these settings to the selected controller device instead of to the") + wxT("\nselected slot (1, 2, 3 or 4). This may be a more convenient way") + wxT("\nto save your settings if you have multiple controllers.") , i+1 )); @@ -923,9 +923,9 @@ void PADConfigDialognJoy::CreateGUIControls() m_CBS_to_C[i] = new wxCheckBox(m_Controller[i], IDCB_MAINSTICK_S_TO_C, wxT("Diagonal")); m_CBS_to_CC[i] = new wxCheckBox(m_Controller[i], IDCB_CSTICK_S_TO_C, wxT("Diagonal")); wxString CBS_to_CToolTip = - wxT("This will convert a square stick radius to a circle stick radius similar to the octagonal area that the original GameCube pad produce." - " To produce a smooth circle in the 'Out' window you have to manually set" - " your diagonal values from the 'In' window in the drop down menu."); + wxT("This will convert a square stick radius to a circle stick radius similar to the octagonal area that the original GameCube pad produce.") + wxT(" To produce a smooth circle in the 'Out' window you have to manually set") + wxT(" your diagonal values from the 'In' window in the drop down menu."); m_CBS_to_C[i]->SetToolTip(CBS_to_CToolTip); m_CBS_to_CC[i]->SetToolTip(CBS_to_CToolTip); @@ -960,10 +960,10 @@ void PADConfigDialognJoy::CreateGUIControls() // Tool tips m_CBCheckFocus[i]->SetToolTip(wxT( "Allow gamepad input even when Dolphin is not in focus. Out of focus keyboard input is never allowed.")); - m_AdvancedMapFilter[i]->SetToolTip(wxT( - "This will allow you to map a digital axis to the main stick or the C-stick. If you don't have" - " any analog triggers that will be automatically set when the trigger filter is off." - )); + m_AdvancedMapFilter[i]->SetToolTip( + wxT("This will allow you to map a digital axis to the main stick or the C-stick. If you don't have") + wxT(" any analog triggers that will be automatically set when the trigger filter is off.") + ); // Populate sizers diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp index a03e8b3c52..913a086bd6 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp @@ -425,9 +425,9 @@ void PADConfigDialognJoy::DoGetButtons(int GetId) if(g_Config.bSaveByID) SetButtonTextAll(GetId, "-1"); else SetButtonText(GetId, "-1"); // Notify the user - wxMessageBox(wxString::Format(wxT( - "You selected a key with a to low key code (%i), please" - " select another key with a higher key code."), pressed) + wxMessageBox(wxString::Format( + wxT("You selected a key with a to low key code (%i), please") + wxT(" select another key with a higher key code."), pressed) , wxT("Notice"), wxICON_INFORMATION); } // ======================== Process results @@ -439,4 +439,3 @@ void PADConfigDialognJoy::DoGetButtons(int GetId) m_JoyButtonHalfpress[0]->GetValue().c_str(), m_JoyButtonHalfpress[1]->GetValue().c_str(), m_JoyButtonHalfpress[2]->GetValue().c_str(), m_JoyButtonHalfpress[3]->GetValue().c_str() );*/ } -/////////////////////////////////////////////////////////// Configure button mapping diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h index 76fb4ef58d..841c33245f 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h @@ -83,12 +83,12 @@ // ŻŻŻŻŻŻŻŻŻŻ #define INPUT_VERSION "0.3" -#define INPUT_STATE "PUBLIC RELEASE" -#define RELDAY "21" -#define RELMONTH "07" -#define RELYEAR "2008" -#define THANKYOU "`plot`, Absolute0, Aprentice, Bositman, Brice, ChaosCode, CKemu, CoDeX, Dave2001, dn, drk||Raziel, Florin, Gent, Gigaherz, Hacktarux, JegHegy, Linker, Linuzappz, Martin64, Muad, Knuckles, Raziel, Refraction, Rudy_x, Shadowprince, Snake785, Saqib, vEX, yaz0r, Zilmar, Zenogais and ZeZu." - +#define INPUT_STATE wxT("PUBLIC RELEASE") +#define RELDAY wxT("21") +#define RELMONTH wxT("07") +#define RELYEAR wxT("2008") +#define THANKYOU wxT("`plot`, Absolute0, Aprentice, Bositman, Brice, ChaosCode, CKemu, CoDeX, Dave2001, dn, drk||Raziel, Florin, Gent, Gigaherz, Hacktarux, JegHegy, Linker, Linuzappz, Martin64, Muad, Knuckles, Raziel, Refraction, Rudy_x, Shadowprince, Snake785, Saqib, vEX, yaz0r, Zilmar, Zenogais and ZeZu.") +#define PLUGIN_VER_STR wxT("nJoy v")wxT(INPUT_VERSION)wxT(" by Falcon4ever\nRelease: ") RELDAY wxT("/") RELMONTH wxT("/") RELYEAR wxT("\nwww.multigesture.net") ////////////////////////////////////////////////////////////////////////////////////////// // Input vector. Todo: Save the configured keys here instead of in joystick