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

Small clean up to InfoWindow and fix for Summarize_Drives() 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3299 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid 2009-05-31 00:55:20 +00:00
parent 81354ea368
commit 71e895ddf7
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/DolphinWX.vcproj
View File

@ -1200,6 +1200,10 @@
RelativePath=".\src\ISOFile.h"
>
</File>
<File
RelativePath=".\Src\Summarize.h"
>
</File>
</Filter>
<File
RelativePath=".\src\main.cpp"

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

@ -21,6 +21,7 @@
#include "Core.h"
#include "ConfigManager.h"
#include "CDUtils.h"
#include "Summarize.h"//This holds all the summarize functions
BEGIN_EVENT_TABLE(wxInfoWindow, wxWindow)
EVT_SIZE( wxInfoWindow::OnEvent_Window_Resize)
@ -47,15 +48,15 @@ wxInfoWindow::~wxInfoWindow()
// On Disposal
}
#include "Summarize.h";//Just used this to keep stuff clean.
void wxInfoWindow::Init_ChildControls()
{
std::string Info;
Info = StringFromFormat("Dolphin Revision: %s", SVN_REV_STR);
Info.append(StringFromFormat(
"\n\n%s\n\n%s\n%s\n\n%s\n\n",
"\n\n%s\n%s\n%s\n\n%s\n\n",
Summarize_Drives().c_str(),
Summarize_CPU().c_str(),
Summarize_Plug().c_str(),

6
Source/Core/DolphinWX/Src/Summarize.h
View File

@ -109,15 +109,17 @@ std::string Summarize_CPU()
std::string Summarize_Drives()
{
char ** drives = cdio_get_devices();
std::string drive;
for (int i = 0; drives[i] != NULL && i < 24; i++)
{
return StringFromFormat(
"CD/DVD Drive%d: %s",
drive += StringFromFormat(
"CD/DVD Drive%d: %s\n",
i+1,
drives[i]
);
}
return drive;
}
#endif //__SUMMARIZE_H__