From 3dc26d2e5c5b360f844ea23c3f60ea4178f6f883 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 23 Jul 2009 14:42:01 +0000
Subject: merge with current trunk revision 1827

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1855 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/screens/UScreenSongJumpto.pas | 33 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'unicode/src/screens/UScreenSongJumpto.pas')

diff --git a/unicode/src/screens/UScreenSongJumpto.pas b/unicode/src/screens/UScreenSongJumpto.pas
index b6979f63..87b31106 100644
--- a/unicode/src/screens/UScreenSongJumpto.pas
+++ b/unicode/src/screens/UScreenSongJumpto.pas
@@ -47,24 +47,24 @@ type
   TScreenSongJumpto = class(TMenu)
     private
       //For ChangeMusic
-      fLastPlayed: Integer;
-      fVisible: Boolean;
+      fLastPlayed: integer;
+      fVisible: boolean;
       fSelectType: TSongFilter;
-      fVisSongs: Integer;
+      fVisSongs: integer;
 
       procedure SetTextFound(Count: Cardinal);
 
       //Visible //Whether the Menu should be Drawn
       //Whether the Menu should be Drawn
-      procedure SetVisible(Value: Boolean);
+      procedure SetVisible(Value: boolean);
     public
       constructor Create; override;
 
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       function Draw: boolean; override;
 
-      property Visible: Boolean read fVisible write SetVisible;
+      property Visible: boolean read fVisible write SetVisible;
   end;
 
 implementation
@@ -76,14 +76,15 @@ uses
   UTexture,
   ULanguage,
   UParty,
+  USongs,
   UScreenSong,
   ULog,
   UUnicodeUtils;
 
-function TScreenSongJumpto.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenSongJumpto.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     if (IsAlphaNumericChar(CharCode) or
@@ -100,7 +101,7 @@ begin
     case PressedKey of
       SDLK_BACKSPACE:
         begin
-          if (Interaction = 0) AND (Length(Button[0].Text[0].Text) > 0) then
+          if (Interaction = 0) and (Length(Button[0].Text[0].Text) > 0) then
           begin
             Button[0].Text[0].DeleteLastLetter();
             SetTextFound(CatSongs.SetFilter(Button[0].Text[0].Text, fSelectType));
@@ -110,9 +111,9 @@ begin
       SDLK_RETURN,
       SDLK_ESCAPE:
         begin
-          Visible := False;
+          Visible := false;
           AudioPlayback.PlaySound(SoundLib.Back);
-          if (fVisSongs = 0) AND (Length(Button[0].Text[0].Text) > 0) then
+          if (fVisSongs = 0) and (Length(Button[0].Text[0].Text) > 0) then
           begin
             ScreenSong.UnLoadDetailedCover;
             Button[0].Text[0].Text := '';
@@ -168,15 +169,14 @@ begin
   fSelectType := fltAll;
   AddSelectSlide(Theme.SongJumpto.SelectSlideType, PInteger(@fSelectType)^, Theme.SongJumpto.IType);
 
-
   Interaction := 0;
   fLastPlayed  := 0;
 end;
 
-procedure TScreenSongJumpto.SetVisible(Value: Boolean);
+procedure TScreenSongJumpto.SetVisible(Value: boolean);
 begin
 //If change from invisible to Visible then OnShow
-  if (fVisible = False) AND (Value = True) then
+  if (fVisible = false) and (Value = true) then
     OnShow;
 
   fVisible := Value;
@@ -197,7 +197,7 @@ begin
 
   //Select Input
   Interaction := 0;
-  Button[0].Text[0].Selected := True;
+  Button[0].Text[0].Selected := true;
 
   fLastPlayed := ScreenSong.Interaction;
 end;
@@ -207,7 +207,7 @@ begin
   Result := inherited Draw;
 end;
 
-procedure TScreenSongJumpto.SetTextFound(Count: Cardinal);
+procedure TScreenSongJumpto.SetTextFound(Count: cardinal);
 begin
   if (Count = 0) then
   begin
@@ -225,7 +225,6 @@ begin
     ScreenSong.ShowCatTLCustom(Format(Theme.SongJumpto.CatText, [Button[0].Text[0].Text]));
   end;
 
-
   //Set visSongs
   fVisSongs := Count;
 
-- 
cgit v1.2.3