aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens
diff options
context:
space:
mode:
authorb1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-03 00:19:52 +0000
committerb1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-03 00:19:52 +0000
commit5bf0ebf274fef28811ab952338bd261bd1dd0fa8 (patch)
treef6271ebd739455d74a7e6e4abd535c7ad3413b33 /Game/Code/Screens
parent28b809432bd8064400bbc9a52a4e354debf86bb6 (diff)
downloadusdx-5bf0ebf274fef28811ab952338bd261bd1dd0fa8.tar.gz
usdx-5bf0ebf274fef28811ab952338bd261bd1dd0fa8.tar.xz
usdx-5bf0ebf274fef28811ab952338bd261bd1dd0fa8.zip
added "popups" to ask for confirmation when leaving party mode or game or to display messages (like minor errors)
still ugly, needs some theme work git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@157 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens')
-rw-r--r--Game/Code/Screens/UScreenMain.pas10
-rw-r--r--Game/Code/Screens/UScreenPartyNewRound.pas2
-rw-r--r--Game/Code/Screens/UScreenPopup.pas204
3 files changed, 181 insertions, 35 deletions
diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index 78c98218..f339fa04 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -55,7 +55,9 @@ begin
SDLK_ESCAPE :
begin
- Result := False;
+ //popup hack
+ CheckFadeTo(NIL,'MSG_QUIT_USDX');
+// Result := False;
end;
SDLK_C:
@@ -116,7 +118,7 @@ begin
Music.PlayStart;
FadeTo(@ScreenStatMain);
end;
-
+
//Editor
if Interaction = 3 then begin
Music.PlayStart;
@@ -131,7 +133,9 @@ begin
//Exit
if Interaction = 5 then begin
- Result := false;
+ //popup hack
+ CheckFadeTo(NIL,'MSG_QUIT_USDX');
+// Result := false;
end;
end;
// Up and Down could be done at the same time,
diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas
index 22f76218..894e96d2 100644
--- a/Game/Code/Screens/UScreenPartyNewRound.pas
+++ b/Game/Code/Screens/UScreenPartyNewRound.pas
@@ -86,7 +86,7 @@ begin
SDLK_ESCAPE :
begin
Music.PlayBack;
- FadeTo(@ScreenMain);
+ CheckFadeTo(@ScreenMain,'MSG_END_PARTY');
end;
SDLK_RETURN:
diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index 41279197..25f647a2 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -3,10 +3,10 @@ unit UScreenPopup;
interface
uses
- UMenu, SDL, UMusic, UPliki, SysUtils, UThemes, dialogs, Messages;
+ UMenu, SDL, UMusic, UPliki, SysUtils, UThemes;
type
- TScreenPopup = class(TMenu)
+ TScreenPopupCheck = class(TMenu)
private
CurMenu: Byte; //Num of the cur. Shown Menu
public
@@ -15,24 +15,35 @@ type
constructor Create; override;
function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;
procedure onShow; override;
- procedure ShowPopup(sPopup: Byte);
+ procedure ShowPopup(msg: String);
function Draw: boolean; override;
end;
-const
- PU_Error = 1;
+type
+ TScreenPopupError = class(TMenu)
+ private
+ CurMenu: Byte; //Num of the cur. Shown Menu
+ public
+ Visible: Boolean; //Whether the Menu should be Drawn
+ constructor Create; override;
+ function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;
+ procedure onShow; override;
+ procedure onHide; override;
+ procedure ShowPopup(msg: array of String);
+ function Draw: boolean; override;
+ end;
var
- ISelections: Array of String;
+// ISelections: Array of String;
SelectValue: Integer;
implementation
-uses UGraphic, UMain, UIni, UTexture, ULanguage, UParty, UPlaylist;
+uses UGraphic, UMain, UIni, UTexture, ULanguage, UParty, UPlaylist, UDisplay;
-function TScreenPopup.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
+function TScreenPopupCheck.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
function IsVisible: Boolean;
begin
Result := True;
@@ -81,6 +92,15 @@ begin
SDLK_RETURN:
begin
+ case Interaction of
+ 0: begin
+ Display.CheckOK:=True;
+ end;
+ 1: begin
+ Display.CheckOK:=False;
+ Display.NextScreenWithCheck:=NIL;
+ end;
+ end;
Visible:=False;
Result := false;
end;
@@ -100,13 +120,11 @@ begin
end;
end;
-constructor TScreenPopup.Create;
+constructor TScreenPopupCheck.Create;
var
I: integer;
begin
inherited Create;
- SetLength(ISelections, 1);
- ISelections[0] := 'Dummy';
AddBackground(Theme.CheckPopup.Background.Tex);
@@ -129,37 +147,161 @@ begin
Interaction := 0;
end;
-function TScreenPopup.Draw: boolean;
+function TScreenPopupCheck.Draw: boolean;
begin
inherited Draw;
end;
-procedure TScreenPopup.onShow;
+procedure TScreenPopupCheck.onShow;
begin
end;
-procedure TScreenPopup.ShowPopup(sPopup: Byte);
+procedure TScreenPopupCheck.ShowPopup(msg: String);
begin
Interaction := 0; //Reset Interaction
Visible := True; //Set Visible
- Case sPopup of
- PU_Error:
- begin
- Text[0].Text := 'Wirklich beenden?';{Language.Translate('SONG_MENU_NAME_MAIN');}
-
- Button[0].Visible := True;
- Button[1].Visible := True;
-// Button[2].Visible := True;
-// Button[3].Visible := True;
-// SelectsS[0].Visible := False;
-
- Button[0].Text[0].Text := 'JA';
- Button[1].Text[0].Text := 'NEIN';
-// Button[2].Text[0].Text := Language.Translate('SONG_MENU_PLAYLIST_ADD');
-// Button[3].Text[0].Text := Language.Translate('SONG_MENU_EDIT');
- end;
+
+ Text[0].Text := Language.Translate(msg);
+
+ Button[0].Visible := True;
+ Button[1].Visible := True;
+
+ Button[0].Text[0].Text := Language.Translate('SONG_MENU_YES');
+ Button[1].Text[0].Text := Language.Translate('SONG_MENU_NO');
+end;
+
+// error popup
+
+function TScreenPopupError.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;
+ function IsVisible: Boolean;
+ begin
+ Result := True;
+ if (Interactions[Interaction].Typ = 0) then
+ begin
+ Result := Button[Interactions[Interaction].Num].Visible;
+ end
+ else if (Interactions[Interaction].Typ = 1) then
+ begin
+ //Result := Selects[Interactions[Interaction].Num].Visible;
+ end
+ else if (Interactions[Interaction].Typ = 3) then
+ begin
+ Result := SelectsS[Interactions[Interaction].Num].Visible;
+ end;
+ end;
+
+ Procedure SelectNext;
+ begin
+ repeat
+ InteractNext;
+ until IsVisible;
+ end;
+
+ Procedure SelectPrev;
+ begin
+ repeat
+ InteractPrev;
+ until IsVisible;
end;
+begin
+ Result := true;
+ If (PressedDown) Then
+ begin // Key Down
+
+ case PressedKey of
+ SDLK_Q:
+ begin
+ Result := false;
+ end;
+
+ SDLK_ESCAPE :
+ begin
+ Result := false;
+ end;
+
+ SDLK_RETURN:
+ begin
+ Visible:=False;
+ Result := false;
+ end;
+
+ SDLK_DOWN: SelectNext;
+ SDLK_UP: SelectPrev;
+
+ SDLK_RIGHT: SelectNext;
+ SDLK_LEFT: SelectPrev;
+ end;
+ end
+ else // Key Up
+ case PressedKey of
+ SDLK_RETURN :
+ begin
+ end;
+ end;
+end;
+
+constructor TScreenPopupError.Create;
+var
+ I: integer;
+begin
+ inherited Create;
+
+ AddBackground(Theme.CheckPopup.Background.Tex);
+
+ AddButton(Theme.ErrorPopup.Button1);
+ if (Length(Button[0].Text) = 0) then
+ AddButtonText(14, 20, 'Button 1');
+
+ AddText(Theme.ErrorPopup.TextError);
+
+ for I := 0 to High(Theme.ErrorPopup.Static) do
+ AddStatic(Theme.ErrorPopup.Static[I]);
+
+ for I := 0 to High(Theme.ErrorPopup.Text) do
+ AddText(Theme.ErrorPopup.Text[I]);
+
+ Interaction := 0;
+end;
+
+function TScreenPopupError.Draw: boolean;
+begin
+ inherited Draw;
+end;
+
+procedure TScreenPopupError.onShow;
+begin
+
+end;
+
+procedure TScreenPopupError.onHide;
+var i: integer;
+begin
+ for i:=0 to high(Text) do
+ Text[i].Text:='';
+end;
+
+procedure TScreenPopupError.ShowPopup(msg: array of String);
+var i: integer;
+begin
+ Interaction := 0; //Reset Interaction
+ Visible := True; //Set Visible
+
+ //dirty hack... Text[0] is invisible for some strange reason
+ for i:=1 to high(Text) do
+ if i-1 <= high(msg) then
+ begin
+ Text[i].Visible:=True;
+ Text[i].Text := msg[i-1];
+ end
+ else
+ begin
+ Text[i].Visible:=False;
+ end;
+
+ Button[0].Visible := True;
+
+ Button[0].Text[0].Text := 'OK';
end;
-end. \ No newline at end of file
+end.