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

Some changes to InfoWindow. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3297 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid 2009-05-30 05:21:51 +00:00
parent ffa759f28a
commit 2159d5065d
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Source/Core/DolphinWX/Src/InfoWindow.cpp
View File

@ -50,14 +50,29 @@ wxInfoWindow::~wxInfoWindow()
std::string Summarize_Plug() std::string Summarize_Plug()
{ {
return StringFromFormat( return StringFromFormat(
"Plugin Information\n\n"
"Default GFX Plugin: %s\n" "Default GFX Plugin: %s\n"
"Default DSP Plugin: %s\n" "Default DSP Plugin: %s\n"
"Default PAD Plugin: %s\n" "Default PAD Plugin: %s\n"
"Default WiiMote Plugin: %s\n", "Default WiiMote Plugin: %s\n\n"
"Current GFX Plugin: %s\n"
"Current DSP Plugin: %s\n"
"Current PAD Plugin[0]: %s\n"
"Current PAD Plugin[1]: %s\n"
"Current PAD Plugin[2]: %s\n"
"Current PAD Plugin[3]: %s\n"
"Current WiiMote Plugin[0]: %s\n",
SConfig::GetInstance().m_DefaultGFXPlugin.c_str(), SConfig::GetInstance().m_DefaultGFXPlugin.c_str(),
SConfig::GetInstance().m_DefaultDSPPlugin.c_str(), SConfig::GetInstance().m_DefaultDSPPlugin.c_str(),
SConfig::GetInstance().m_DefaultPADPlugin.c_str(), SConfig::GetInstance().m_DefaultPADPlugin.c_str(),
SConfig::GetInstance().m_DefaultWiiMotePlugin.c_str() SConfig::GetInstance().m_DefaultWiiMotePlugin.c_str(),
Core::GetStartupParameter().m_strVideoPlugin.c_str(),
Core::GetStartupParameter().m_strDSPPlugin.c_str(),
Core::GetStartupParameter().m_strPadPlugin[0].c_str(),
Core::GetStartupParameter().m_strPadPlugin[1].c_str(),
Core::GetStartupParameter().m_strPadPlugin[2].c_str(),
Core::GetStartupParameter().m_strPadPlugin[3].c_str(),
Core::GetStartupParameter().m_strWiimotePlugin[0].c_str()
); );
} }
@ -82,27 +97,33 @@ std::string Summarize_Settings()
"Slot A: %d\n" "Slot A: %d\n"
"Slot B: %d\n" "Slot B: %d\n"
"Serial Port 1: %d\n" "Serial Port 1: %d\n"
"Widescreen: %s\n" "Run Compare Server: %s\n"
"Progressive Scan: %s\n", "Run Compare Client: %s\n"
Core::GetStartupParameter().bHLEBios?"true":"false", "TLB Hack: %s\n"
Core::GetStartupParameter().bUseJIT?"true":"false", "[Wii]Widescreen: %s\n"
Core::GetStartupParameter().bUseDualCore?"true":"false", "[Wii]Progressive Scan: %s\n",
Core::GetStartupParameter().bDSPThread?"true":"false", Core::GetStartupParameter().bHLEBios?"True":"False",
Core::GetStartupParameter().bSkipIdle?"true":"false", Core::GetStartupParameter().bUseJIT?"True":"False",
Core::GetStartupParameter().bLockThreads?"true":"false", Core::GetStartupParameter().bUseDualCore?"True":"False",
Core::GetStartupParameter().bUseDualCore?"true":"false", Core::GetStartupParameter().bDSPThread?"True":"False",
Core::GetStartupParameter().bSkipIdle?"True":"False",
Core::GetStartupParameter().bLockThreads?"True":"False",
Core::GetStartupParameter().bUseDualCore?"True":"False",
Core::GetStartupParameter().m_strDefaultGCM.c_str(), Core::GetStartupParameter().m_strDefaultGCM.c_str(),
Core::GetStartupParameter().m_strDVDRoot.c_str(), Core::GetStartupParameter().m_strDVDRoot.c_str(),
Core::GetStartupParameter().bOptimizeQuantizers?"true":"false", Core::GetStartupParameter().bOptimizeQuantizers?"True":"False",
Core::GetStartupParameter().bEnableCheats?"true":"false", Core::GetStartupParameter().bEnableCheats?"True":"False",
Core::GetStartupParameter().SelectedLanguage, //FIXME show language based on index Core::GetStartupParameter().SelectedLanguage, //FIXME show language based on index
SConfig::GetInstance().m_strMemoryCardA.c_str(), SConfig::GetInstance().m_strMemoryCardA.c_str(),
SConfig::GetInstance().m_strMemoryCardB.c_str(), SConfig::GetInstance().m_strMemoryCardB.c_str(),
SConfig::GetInstance().m_EXIDevice[0], //FIXME SConfig::GetInstance().m_EXIDevice[0], //FIXME
SConfig::GetInstance().m_EXIDevice[1], //FIXME SConfig::GetInstance().m_EXIDevice[1], //FIXME
SConfig::GetInstance().m_EXIDevice[2], //FIXME SConfig::GetInstance().m_EXIDevice[2], //FIXME
Core::GetStartupParameter().bWidescreen?"true":"false", Core::GetStartupParameter().bRunCompareServer?"True":"False",
Core::GetStartupParameter().bProgressiveScan?"true":"false" Core::GetStartupParameter().bRunCompareClient?"True":"False",
Core::GetStartupParameter().iTLBHack?"True":"False",
Core::GetStartupParameter().bWidescreen?"True":"False",
Core::GetStartupParameter().bProgressiveScan?"True":"False"
); );
} }
@ -119,11 +140,12 @@ void wxInfoWindow::Init_ChildControls()
Info.append(StringFromFormat("\nCD/DVD Drive%d: %s", i+1, drives[i])); Info.append(StringFromFormat("\nCD/DVD Drive%d: %s", i+1, drives[i]));
} }
Info.append(StringFromFormat( Info.append(StringFromFormat(
"\n\nPlugin Information\n\n%s\n%s\n" "\n\nProcessor Information:\n%s\n"
"Processor Information:\n%s\n", "\n%s\n\n%s\n",
cpu_info.Summarize().c_str(),
Summarize_Plug().c_str(), Summarize_Plug().c_str(),
Summarize_Settings().c_str(), Summarize_Settings().c_str()
cpu_info.Summarize().c_str())); ));
// Main Notebook // Main Notebook
m_Notebook_Main = new wxNotebook(this, ID_NOTEBOOK_MAIN, wxDefaultPosition, wxDefaultSize); m_Notebook_Main = new wxNotebook(this, ID_NOTEBOOK_MAIN, wxDefaultPosition, wxDefaultSize);