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

* fixed a GUI displaying bug for post processing shaders when switching between plugins 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7069 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
gnick79 2011-02-05 02:13:33 +00:00
parent 40ac272691
commit f34aaf7471
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Languages/fr.po
View File

@ -669,7 +669,7 @@ msgstr "Audio"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:736
msgid "Audio Backend:" msgid "Audio Backend:"
msgstr "Interface audio:" msgstr "Interface audio :"
#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39
msgid "AudioCommon: Error opening AO device.\n" msgid "AudioCommon: Error opening AO device.\n"
@ -2301,7 +2301,7 @@ msgstr "Saut d'&image :"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:607
msgid "Framelimit:" msgid "Framelimit:"
msgstr "Image/s max:" msgstr "Image/s max :"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:403 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:403
msgid "Free Look" msgid "Free Look"

10
Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp
View File

@ -409,12 +409,12 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// - misc // - misc
{ {
wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5); wxGridSizer* const szr_misc = new wxGridSizer(2);
szr_misc->Add(new SettingCheckBox(page_advanced, _("Crop"), crop_tooltip, vconfig.bCrop)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Crop"), crop_tooltip, vconfig.bCrop), 0, wxBOTTOM, 5);
szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable OpenCL"), opencl_tooltip, vconfig.bEnableOpenCL)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable OpenCL"), opencl_tooltip, vconfig.bEnableOpenCL), 0, wxLEFT|wxBOTTOM, 5);
szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Display List Caching"), dlc_tooltip, vconfig.bDlistCachingEnable)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Display List Caching"), dlc_tooltip, vconfig.bDlistCachingEnable), 0, wxBOTTOM, 5);
szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Hotkeys"), hotkeys_tooltip, vconfig.bOSDHotKey)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Hotkeys"), hotkeys_tooltip, vconfig.bOSDHotKey), 0, wxLEFT|wxBOTTOM, 5);
// postproc shader // postproc shader
if (vconfig.backend_info.PPShaders.size()) if (vconfig.backend_info.PPShaders.size())

3
Source/Plugins/Plugin_VideoDX11/Src/main.cpp
View File

@ -158,6 +158,9 @@ void VideoBackend::ShowConfig(void *_hParent)
factory->Release(); factory->Release();
// Clear ppshaders string vector
g_Config.backend_info.PPShaders.clear();
VideoConfigDiag *const diag = new VideoConfigDiag((wxWindow*)_hParent, _trans("Direct3D11"), "gfx_dx11"); VideoConfigDiag *const diag = new VideoConfigDiag((wxWindow*)_hParent, _trans("Direct3D11"), "gfx_dx11");
diag->ShowModal(); diag->ShowModal();
diag->Destroy(); diag->Destroy();

6
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -138,8 +138,10 @@ void VideoBackend::ShowConfig(void* parent)
for (int i = 0; i < (int)adapter.aa_levels.size(); ++i) for (int i = 0; i < (int)adapter.aa_levels.size(); ++i)
g_Config.backend_info.AAModes.push_back(adapter.aa_levels[i].name); g_Config.backend_info.AAModes.push_back(adapter.aa_levels[i].name);
} }
// Clear ppshaders string vector
g_Config.backend_info.PPShaders.clear();
VideoConfigDiag *const diag = new VideoConfigDiag((wxWindow*)parent, _trans("Direct3D9"), "gfx_dx9"); VideoConfigDiag *const diag = new VideoConfigDiag((wxWindow*)parent, _trans("Direct3D9"), "gfx_dx9");
diag->ShowModal(); diag->ShowModal();
diag->Destroy(); diag->Destroy();