Added Statistic Screens to C0de and to Theme

Moved some Translated Strings from UScreenPartyOptions to UTheme to use it with the Statistic Screens, too.
Fixed use of /n Tag istead of the correct \n

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@118 b956fd51-792f-4845-bead-9b4dfca2ff2c

4 files changed, 490 insertions, 8 deletions

diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index dd7f21c5..8d2d13b6 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -135,6 +135,12 @@ begin
           end;

         end;

 

+      SDLK_S:

+        begin

+          Music.PlayStart;

+          FadeTo(@ScreenStatMain);

+        end;

+

       SDLK_RETURN:

         begin

           if (Interaction = 0) and (Length(Songs.Song) >= 1) then begin

diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 1fd4da8f..fd7b5107 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -31,7 +31,6 @@ type
   end;

 

 var

-  ILevel: array[0..2] of String;

   IPlaylist: array[0..2] of String;

   IPlaylist2: array of String;

 const

@@ -185,12 +184,6 @@ var
   I:    integer;

 begin

   inherited Create;

-

-  //Fill ILevel

-  ILevel[0] := Language.Translate('SING_EASY');

-  ILevel[1] := Language.Translate('SING_MEDIUM');

-  ILevel[2] := Language.Translate('SING_HARD');

-

   //Fill IPlaylist

   IPlaylist[0] := Language.Translate('PARTY_PLAYLIST_ALL');

   IPlaylist[1] := Language.Translate('PARTY_PLAYLIST_CATEGORY');

@@ -210,7 +203,7 @@ begin
 

   AddBackground(Theme.PartyOptions.Background.Tex);

 

-  SelectLevel := AddSelectSlide (Theme.PartyOptions.SelectLevel, Ini.Difficulty, ILevel);

+  SelectLevel := AddSelectSlide (Theme.PartyOptions.SelectLevel, Ini.Difficulty, Theme.ILevel);

   SelectPlayList := AddSelectSlide (Theme.PartyOptions.SelectPlayList, PlayList, IPlaylist);

   SelectPlayList2 := AddSelectSlide (Theme.PartyOptions.SelectPlayList2, PlayList2, IPlaylist2);

   SelectRounds := AddSelectSlide (Theme.PartyOptions.SelectRounds, Rounds, IRounds);

diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas
new file mode 100644
index 00000000..dc4a0f1f
--- /dev/null
+++ b/Game/Code/Screens/UScreenStatDetail.pas
@@ -0,0 +1,254 @@
+unit UScreenStatDetail;

+

+interface

+

+uses

+  UMenu, SDL, SysUtils, UDisplay, UMusic, UIni, UThemes;

+

+type

+  TScreenStatDetail = class(TMenu)

+    public

+      Typ:  Byte;

+      Page: CardinaL;

+      Count: Byte;

+      Reversed: Boolean;

+

+      TotEntrys: Cardinal;

+      TotPages:  Cardinal;

+

+

+      constructor Create; override;

+      function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

+      procedure onShow; override;

+      procedure SetAnimationProgress(Progress: real); override;

+

+      procedure SetTitle;

+      Procedure SetPage(NewPage: Cardinal);

+  end;

+

+implementation

+

+{Stat Screens:

+  0 - Best Scores

+  1 - Best Singers

+  2 - Most sung Songs

+  3 - Most popular Band

+}

+

+uses UGraphic, UDataBase, ULanguage, math, ULog;

+

+function TScreenStatDetail.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;

+begin

+  Result := true;

+  If (PressedDown) Then

+  begin // Key Down

+    case PressedKey of

+      SDLK_Q:

+        begin

+          Result := false;

+        end;

+      SDLK_ESCAPE:

+        begin

+          Music.PlayBack;

+          FadeTo(@ScreenStatMain);

+        end;

+      SDLK_RETURN:

+        begin

+          if Interaction = 0 then begin

+            //Next Page

+            SetPage(Page+1);

+          end;

+

+          if Interaction = 1 then begin

+            //Previous Page

+            if (Page > 0) then

+              SetPage(Page-1);

+          end;

+

+          if Interaction = 2 then begin

+            //Reverse Order

+            Reversed := not Reversed;

+            SetPage(Page);

+          end;

+

+          if Interaction = 3 then begin

+            Music.PlayBack;

+            FadeTo(@ScreenStatMain);

+          end;

+        end;

+      SDLK_LEFT:

+      begin

+          InteractPrev;

+      end;

+      SDLK_RIGHT:

+      begin

+          InteractNext;

+      end;

+      SDLK_UP:

+      begin

+          InteractPrev;

+      end;

+      SDLK_DOWN:

+      begin

+          InteractNext;

+      end;

+    end;

+  end;

+end;

+

+constructor TScreenStatDetail.Create;

+var

+  I:    integer;

+begin

+  inherited Create;

+

+  AddBackground(Theme.StatDetail.Background.Tex);

+

+  AddButton(Theme.StatDetail.ButtonNext);

+  if (Length(Button[0].Text)=0) then

+    AddButtonText(14, 20, Language.Translate('STAT_NEXT'));

+

+  AddButton(Theme.StatDetail.ButtonPrev);

+  if (Length(Button[1].Text)=0) then

+    AddButtonText(14, 20, Language.Translate('STAT_PREV'));

+

+  AddButton(Theme.StatDetail.ButtonReverse);

+  if (Length(Button[2].Text)=0) then

+    AddButtonText(14, 20, Language.Translate('STAT_REVERSE'));

+

+  AddButton(Theme.StatDetail.ButtonExit);

+  if (Length(Button[3].Text)=0) then

+    AddButtonText(14, 20, Theme.Options.Description[7]);

+

+  for I := 0 to High(Theme.StatDetail.TextList) do

+    AddText(Theme.StatDetail.TextList[I]);

+

+  Count := Length(Theme.StatDetail.TextList);

+

+  AddText(Theme.StatDetail.TextDescription);

+  AddText(Theme.StatDetail.TextPage);

+

+  for I := 0 to High(Theme.StatDetail.Static) do

+    AddStatic(Theme.StatDetail.Static[I]);

+

+  for I := 0 to High(Theme.StatDetail.Text) do

+    AddText(Theme.StatDetail.Text[I]);

+

+

+

+  Interaction := 0;

+  Typ := 0;

+end;

+

+procedure TScreenStatDetail.onShow;

+begin

+  //Set Tot Entrys and PAges

+  TotEntrys := DataBase.GetTotalEntrys(Typ);

+  TotPages := Ceil(TotEntrys / Count);

+  //Show correct Title

+  SetTitle;

+  //Show First Page

+  Reversed := False;

+  SetPage(0);

+end;

+

+procedure TScreenStatDetail.SetTitle;

+begin

+  //Set Title

+  Case Reversed of

+    True: Text[Count].Text := Theme.StatDetail.DescriptionR[Typ];

+    False: Text[Count].Text := Theme.StatDetail.Description[Typ];

+  end;

+end;

+

+Procedure TScreenStatDetail.SetPage(NewPage: Cardinal);

+var

+  Result: AStatResult;

+  I: Integer;

+  FormatStr: String;

+  PerPage: Byte;

+begin

+  SetLength(Result, Count);

+  if (Database.GetStats(Result, Typ, Count, NewPage, Reversed)) then

+  begin

+    Page := NewPage;

+

+    FormatStr := Theme.StatDetail.FormatStr[Typ];

+

+    //refresh Texts

+    For I := 0 to Count-1 do

+    begin

+      try

+        case Typ of

+          0:begin //Best Scores

+            //Set Texts

+            if (Result[I].Score>0) then

+              Text[I].Text := Format(FormatStr, [Result[I].Singer,

+                                                Result[I].Score,

+                                                Theme.ILevel[Result[I].Difficulty],

+                                                Result[I].SongArtist,

+                                                Result[I].SongTitle])

+            else

+              Text[I].Text := '';

+          end;

+

+          1:begin //Best Singers

+            //Set Texts

+            if (Result[I].AverageScore>0) then

+              Text[I].Text := Format(FormatStr, [Result[I].Player,

+                                                Result[I].AverageScore])

+            else

+              Text[I].Text := '';

+          end;

+

+          2:begin //Popular Songs

+            //Set Texts

+            if (Result[I].Artist<>'') then

+              Text[I].Text := Format(FormatStr, [Result[I].Artist,

+                                                 Result[I].Title,

+                                                Result[I].TimesSung])

+            else

+              Text[I].Text := '';

+          end;

+

+          3:begin //Popular Bands

+            //Set Texts

+            if (Result[I].ArtistName<>'') then

+              Text[I].Text := Format(FormatStr, [Result[I].ArtistName,

+                                                Result[I].TimesSungtot])

+            else

+              Text[I].Text := '';

+          end;

+        end;

+      except

+        on E: EConvertError do

+          Log.LogError('Error Parsing FormatString in UScreenStatDetail: ' + E.Message);

+      end;

+    end;

+

+    if (Page + 1 = TotPages) AND (TotEntrys Mod Count <> 0) then

+      PerPage := (TotEntrys Mod Count)

+    else

+      PerPage := Count;

+

+    Text[Count+1].Text := Format(Theme.StatDetail.PageStr, [Page + 1,

+                                                            TotPages,

+                                                            PerPage,

+                                                            TotEntrys]);

+

+    //Show correct Title

+    SetTitle;

+

+  end;

+

+end;

+

+

+procedure TScreenStatDetail.SetAnimationProgress(Progress: real);

+var I: Integer;

+begin

+  For I := 0 to high(Button) do

+    Button[I].Texture.ScaleW := Progress;

+end;

+

+end.

diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas
new file mode 100644
index 00000000..337ed745
--- /dev/null
+++ b/Game/Code/Screens/UScreenStatMain.pas
@@ -0,0 +1,229 @@
+unit UScreenStatMain;

+

+interface

+

+uses

+  UMenu, SDL, SysUtils, UDisplay, UMusic, UIni, UThemes;

+

+type

+  TScreenStatMain = class(TMenu)

+    private

+      //Some Stat Value that don't need to be calculated 2 times

+      SongswithVid: Cardinal;

+    public

+      TextOverview:    integer;

+      constructor Create; override;

+      function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

+      procedure onShow; override;

+      procedure SetAnimationProgress(Progress: real); override;

+

+      procedure SetOverview;

+  end;

+

+implementation

+

+uses UGraphic, UDataBase, USongs, ULanguage, windows, ULog;

+

+function TScreenStatMain.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;

+begin

+  Result := true;

+  If (PressedDown) Then

+  begin // Key Down

+    case PressedKey of

+      SDLK_Q:

+        begin

+          Result := false;

+        end;

+      SDLK_ESCAPE:

+        begin

+          Ini.Save;

+          Music.PlayBack;

+          FadeTo(@ScreenMain);

+        end;

+      SDLK_RETURN:

+        begin

+          //Exit Button Pressed

+          if Interaction = 4 then begin

+            Music.PlayBack;

+            FadeTo(@ScreenMain);

+          end

+          else //One of the Stats Buttons Pressed

+          begin

+            Music.PlayBack;

+            ScreenStatDetail.Typ := Interaction;

+            FadeTo(@ScreenStatDetail);

+          end;

+        end;

+      SDLK_LEFT:

+      begin

+          InteractPrev;

+      end;

+      SDLK_RIGHT:

+      begin

+          InteractNext;

+      end;

+      SDLK_UP:

+      begin

+          InteractPrev;

+      end;

+      SDLK_DOWN:

+      begin

+          InteractNext;

+      end;

+    end;

+  end;

+end;

+

+constructor TScreenStatMain.Create;

+var

+  I:    integer;

+begin

+  inherited Create;

+

+  AddBackground(Theme.StatMain.Background.Tex);

+

+  AddButton(Theme.StatMain.ButtonScores);

+  if (Length(Button[0].Text)=0) then

+    AddButtonText(14, 20, Theme.StatDetail.Description[0]);

+

+  AddButton(Theme.StatMain.ButtonSingers);

+  if (Length(Button[1].Text)=0) then

+    AddButtonText(14, 20, Theme.StatDetail.Description[1]);

+

+  AddButton(Theme.StatMain.ButtonSongs);

+  if (Length(Button[2].Text)=0) then

+    AddButtonText(14, 20, Theme.StatDetail.Description[2]);

+

+  AddButton(Theme.StatMain.ButtonBands);

+  if (Length(Button[3].Text)=0) then

+    AddButtonText(14, 20, Theme.StatDetail.Description[3]);

+

+  AddButton(Theme.StatMain.ButtonExit);

+  if (Length(Button[4].Text)=0) then

+    AddButtonText(14, 20, Theme.Options.Description[4]);

+

+  TextOverview := AddText(Theme.StatMain.TextOverview);

+

+  for I := 0 to High(Theme.StatMain.Static) do

+    AddStatic(Theme.StatMain.Static[I]);

+

+  for I := 0 to High(Theme.StatMain.Text) do

+    AddText(Theme.StatMain.Text[I]);

+

+  Interaction := 0;

+

+  SongswithVid := 0;

+  For I := 0 to high(Songs.Song) do

+    if (Songs.Song[I].Video <> '') AND FileExists(Songs.Song[I].Path + Songs.Song[I].Video) then

+      Inc(SongswithVid);

+end;

+

+procedure TScreenStatMain.onShow;

+begin

+  //Set Overview Text:

+  SetOverview;

+end;

+

+procedure TScreenStatMain.SetOverview;

+var

+  Overview, Formatstr: String;

+  I: Integer;

+  //Some Vars to Save Attributes to

+  A1, A2, A3: Integer;

+  A4, A5: String;

+  Result1, Result2: AStatResult;

+  ResetTime: TSystemTime;

+  function GetFileCreation(Filename: String): TSystemTime;

+  var

+    FindData: TWin32FindData;

+    Handle: THandle;

+  begin

+    Handle := FindFirstFile(PChar(Filename), FindData);

+    if Handle <> INVALID_HANDLE_VALUE then

+    begin

+      FileTimeToSystemTime(FindData.ftCreationTime, Result);

+      Windows.FindClose(Handle);

+    end;

+  end;

+begin

+  //Song Overview

+

+  //Introduction

+  Formatstr := Language.Translate ('STAT_OVERVIEW_INTRO');

+  {Format:

+    %0:d Ultrastar Version

+    %1:d Day of Reset (A1)

+    %2:d Month of Reset (A2)

+    %3:d Year of Reset (A3)}

+

+  ResetTime := GetFileCreation(Database.Filename);

+

+  A1 := ResetTime.wDay;

+  A2 := ResetTime.wMonth;

+  A3 := ResetTime.wYear;

+  try

+    Overview := Format(Formatstr, [Language.Translate('US_VERSION'), A1, A2, A3]);

+  except

+    on E: EConvertError do

+      Log.LogError('Error Parsing FormatString "STAT_OVERVIEW_INTRO": ' + E.Message);

+  end;

+

+  Formatstr := Language.Translate ('STAT_OVERVIEW_SONG');

+  {Format:

+    %0:d Count Songs (A1)

+    %1:d Count of Sung Songs (A2)

+    %2:d Count of UnSung Songs

+    %3:d Count of Songs with Video (A3)

+    %4:s Name of the most popular Song}

+  A1 := Length(CatSongs.Song);

+  A2 := Database.GetTotalEntrys(2);

+

+  A3 := SongswithVid;

+

+  SetLength(Result1, 1);

+  Database.GetStats(Result1, 2, 1, 0, False);

+  A4 := Result1[0].Artist;

+  A5 := Result1[0].Title;

+

+  try

+    Overview := Overview + '\n \n' + Format(Formatstr, [A1, A2, A1-A2, A3, A4, A5]);

+  except

+    on E: EConvertError do

+      Log.LogError('Error Parsing FormatString "STAT_OVERVIEW_SONG": ' + E.Message);

+  end;

+

+  //Player Overview

+  Formatstr := Language.Translate ('STAT_OVERVIEW_PLAYER');

+  {Format:

+    %0:d Count Players (A1)

+    %1:s Best Player (Result)

+    %2:d Best Players Score

+    %3:s Best Score Player (Result2)

+    %4:d Best Score}

+  A1 := Database.GetTotalEntrys(1);

+

+  SetLength(Result1, 1);

+  Database.GetStats(Result1, 1, 1, 0, False);

+

+  SetLength(Result2, 1);

+  Database.GetStats(Result2, 0, 1, 0, False);

+

+  try

+    Overview := Overview + '\n \n' + Format(Formatstr, [A1, Result1[0].Player, Result1[0].AverageScore, Result2[0].Singer, Result2[0].Score]);

+  except

+    on E: EConvertError do

+      Log.LogError('Error Parsing FormatString "STAT_OVERVIEW_PLAYER": ' + E.Message);

+  end;

+

+  Text[0].Text := Overview;

+end;

+

+

+procedure TScreenStatMain.SetAnimationProgress(Progress: real);

+var I: Integer;

+begin

+  For I := 0 to high(Button) do

+    Button[I].Texture.ScaleW := Progress;

+end;

+

+end.
\ No newline at end of file