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:
parent
81354ea368
commit
71e895ddf7
|
@ -1200,6 +1200,10 @@
|
|||
RelativePath=".\src\ISOFile.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Src\Summarize.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath=".\src\main.cpp"
|
||||
|
|
|
@ -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(),
|
||||
|
|
|
@ -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",
|
||||
i+1,
|
||||
drives[i]
|
||||
);
|
||||
drive += StringFromFormat(
|
||||
"CD/DVD Drive%d: %s\n",
|
||||
i+1,
|
||||
drives[i]
|
||||
);
|
||||
}
|
||||
return drive;
|
||||
}
|
||||
|
||||
#endif //__SUMMARIZE_H__
|
Loading…
Reference in New Issue