finished a todo, allowing some more strings to be themed

This commit is contained in:
AJ Kelly
2011-02-09 13:06:03 -06:00
parent 9bee942eef
commit 4ae6dce8da
2 changed files with 9 additions and 5 deletions
+3
View File
@@ -1387,6 +1387,9 @@ Off=Off
[ScreenOptionsMemoryCard] [ScreenOptionsMemoryCard]
Error mounting card: %s=Error mounting card: %s Error mounting card: %s=Error mounting card: %s
(no label)=(no label)
size ???=size ???
%dMB=%dMB
[ScreenOptionsService] [ScreenOptionsService]
HeaderText=Options HeaderText=Options
+6 -5
View File
@@ -9,7 +9,6 @@
#include "LocalizedString.h" #include "LocalizedString.h"
#include "OptionRowHandler.h" #include "OptionRowHandler.h"
REGISTER_SCREEN_CLASS( ScreenOptionsMemoryCard ); REGISTER_SCREEN_CLASS( ScreenOptionsMemoryCard );
void ScreenOptionsMemoryCard::Init() void ScreenOptionsMemoryCard::Init()
@@ -42,22 +41,24 @@ bool ScreenOptionsMemoryCard::UpdateCurrentUsbStorageDevices()
return aOldDevices != m_CurrentUsbStorageDevices; return aOldDevices != m_CurrentUsbStorageDevices;
} }
static LocalizedString NO_LABEL ("ScreenOptionsMemoryCard", "(no label)" );
static LocalizedString SIZE_UNKNOWN ("ScreenOptionsMemoryCard", "size ???" );
static LocalizedString VOLUME_SIZE ("ScreenOptionsMemoryCard", "%dMB" );
void ScreenOptionsMemoryCard::CreateMenu() void ScreenOptionsMemoryCard::CreateMenu()
{ {
vector<OptionRowHandler*> vHands; vector<OptionRowHandler*> vHands;
FOREACH_CONST( UsbStorageDevice, m_CurrentUsbStorageDevices, iter ) FOREACH_CONST( UsbStorageDevice, m_CurrentUsbStorageDevices, iter )
{ {
// TODO: Make these strings themable
vector<RString> vs; vector<RString> vs;
if( iter->sVolumeLabel.empty() ) if( iter->sVolumeLabel.empty() )
vs.push_back( "(no label)" ); vs.push_back( NO_LABEL );
else else
vs.push_back( iter->sVolumeLabel ); vs.push_back( iter->sVolumeLabel );
if( iter->iVolumeSizeMB == 0 ) if( iter->iVolumeSizeMB == 0 )
vs.push_back( "size ???" ); vs.push_back( SIZE_UNKNOWN );
else else
vs.push_back( ssprintf("%dMB",iter->iVolumeSizeMB) ); vs.push_back( ssprintf(VOLUME_SIZE,iter->iVolumeSizeMB) );
vHands.push_back( OptionRowHandlerUtil::MakeNull() ); vHands.push_back( OptionRowHandlerUtil::MakeNull() );