From 678cc132f942ff4d84a803550eedf96acc543bca Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 23 May 2010 09:07:15 +0000
Subject: update to trunk rev. 2391

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2401 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 cmake/src/screens/UScreenStatMain.pas | 42 ++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'cmake/src/screens/UScreenStatMain.pas')

diff --git a/cmake/src/screens/UScreenStatMain.pas b/cmake/src/screens/UScreenStatMain.pas
index 2fd91288..204f40cd 100644
--- a/cmake/src/screens/UScreenStatMain.pas
+++ b/cmake/src/screens/UScreenStatMain.pas
@@ -47,14 +47,14 @@ type
     private
       //Some Stat Value that don't need to be calculated 2 times
       SongsWithVid: cardinal;
-      function FormatOverviewIntro(FormatStr: string): string;
-      function FormatSongOverview(FormatStr: string): string;
-      function FormatPlayerOverview(FormatStr: string): string;
+      function FormatOverviewIntro(FormatStr: UTF8String): UTF8String;
+      function FormatSongOverview(FormatStr: UTF8String): UTF8String;
+      function FormatPlayerOverview(FormatStr: UTF8String): UTF8String;
     public
       TextOverview:    integer;
       constructor Create; override;
-      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
-      procedure onShow; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      procedure OnShow; override;
       procedure SetAnimationProgress(Progress: real); override;
 
       procedure SetOverview;
@@ -70,21 +70,17 @@ uses
   ULanguage,
   UCommon,
   Classes,
-  {$IFDEF win32}
-  windows,
-  {$ELSE}
-  sysconst,
-  {$ENDIF}
-  ULog;
-
-function TScreenStatMain.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
+  ULog,
+  UUnicodeUtils;
+
+function TScreenStatMain.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
   if (PressedDown) then
   begin // Key Down
     // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
-      'Q':
+    case UCS4UpperCase(CharCode) of
+      Ord('Q'):
         begin
           Result := false;
           Exit;
@@ -170,11 +166,11 @@ begin
   //Set Songs with Vid
   SongsWithVid := 0;
   for I := 0 to Songs.SongList.Count -1 do
-    if (TSong(Songs.SongList[I]).Video <> '') then
+    if (TSong(Songs.SongList[I]).Video.IsSet) then
       Inc(SongsWithVid);
 end;
 
-procedure TScreenStatMain.onShow;
+procedure TScreenStatMain.OnShow;
 begin
   inherited;
 
@@ -182,7 +178,7 @@ begin
   SetOverview;
 end;
 
-function TScreenStatMain.FormatOverviewIntro(FormatStr: string): string;
+function TScreenStatMain.FormatOverviewIntro(FormatStr: UTF8String): UTF8String;
 var
   Year, Month, Day: word;
 begin
@@ -203,10 +199,10 @@ begin
   end;
 end;
 
-function TScreenStatMain.FormatSongOverview(FormatStr: string): string;
+function TScreenStatMain.FormatSongOverview(FormatStr: UTF8String): UTF8String;
 var
   CntSongs, CntSungSongs, CntVidSongs: integer;
-  MostPopSongArtist, MostPopSongTitle: string;
+  MostPopSongArtist, MostPopSongTitle: UTF8String;
   StatList: TList;
   MostSungSong: TStatResultMostSungSong;
 begin
@@ -247,12 +243,12 @@ begin
   end;
 end;
 
-function TScreenStatMain.FormatPlayerOverview(FormatStr: string): string;
+function TScreenStatMain.FormatPlayerOverview(FormatStr: UTF8String): UTF8String;
 var
   CntPlayers: integer;
   BestScoreStat:    TStatResultBestScores;
   BestSingerStat:   TStatResultBestSingers;
-  BestPlayer, BestScorePlayer: string;
+  BestPlayer, BestScorePlayer: UTF8String;
   BestPlayerScore, BestScore: integer;
   SingerStats, ScoreStats: TList;
 begin
@@ -307,7 +303,7 @@ end;
 
 procedure TScreenStatMain.SetOverview;
 var
-  Overview: string;
+  Overview: UTF8String;
 begin
   // Format overview
   Overview := FormatOverviewIntro(Language.Translate('STAT_OVERVIEW_INTRO')) + '\n \n' + 
-- 
cgit v1.2.3