1 files changed, 88 insertions, 60 deletions

diff --git a/src/screens/UScreenPopup.pas b/src/screens/UScreenPopup.pas
index 7e4671d6..fdf4a69c 100644
--- a/src/screens/UScreenPopup.pas
+++ b/src/screens/UScreenPopup.pas
@@ -34,42 +34,61 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu,
   SDL,
+  SysUtils,
+  UMenu,
   UMusic,
   UFiles,
-  SysUtils,
   UThemes;
 
 type
+  TPopupCheckHandler = procedure(Value: boolean; Data: Pointer);
+
   TScreenPopupCheck = class(TMenu)
+    private
+      fHandler: TPopupCheckHandler;
+      fHandlerData: Pointer;
+
     public
-      Visible: boolean; //Whether the Menu should be Drawn
+      Visible: boolean; // whether the menu should be drawn
 
       constructor Create; override;
-      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
-      procedure onShow; override;
-      procedure ShowPopup(msg: string);
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      procedure OnShow; override;
+      procedure ShowPopup(const Msg: UTF8String; Handler: TPopupCheckHandler;
+          HandlerData: Pointer; DefaultValue: boolean = false);
       function Draw: boolean; override;
   end;
 
 type
-  TScreenPopupError = class(TMenu)
-{    private
-      CurMenu: byte; //Num of the cur. Shown Menu}
+  TScreenPopup = 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; CharCode: WideChar; PressedDown: boolean): boolean; override;
-      procedure onShow; override;
-      procedure onHide; override;
-      procedure ShowPopup(msg: string);
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      procedure OnShow; override;
+      procedure OnHide; override;
+      procedure ShowPopup(const Msg: UTF8String);
       function Draw: boolean; override;
   end;
 
+  TScreenPopupError = class(TScreenPopup)
+    public
+      constructor Create;
+  end;
+
+  TScreenPopupInfo = class(TScreenPopup)
+    public
+      constructor Create;
+  end;
+
 var
-//  ISelections: array of string;
+  //ISelections: array of string;
   SelectValue: integer;
 
 implementation
@@ -82,70 +101,57 @@ uses
   ULanguage,
   UParty,
   UPlaylist,
-  UDisplay;
+  UDisplay,
+  UUnicodeUtils;
 
-function TScreenPopupCheck.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
+{ TScreenPopupCheck }
+
+function TScreenPopupCheck.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
+var
+  Value: boolean;
 begin
   Result := true;
   if (PressedDown) then
   begin // Key Down
-    // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
-      'Q':
-        begin
-          Result := false;
-          Exit;
-        end;
-    end;
-
     // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
         begin
-          Display.CheckOK := false;
-          Display.NextScreenWithCheck := NIL;
+          Value := false;
           Visible := false;
           Result := false;
         end;
 
       SDLK_RETURN:
         begin
-          case Interaction of
-          0: begin
-               //Hack to Finish Singscreen correct on Exit with Q Shortcut
-               if (Display.NextScreenWithCheck = NIL) then
-               begin
-                 if (Display.CurrentScreen = @ScreenSing) then
-                   ScreenSing.Finish
-                 else if (Display.CurrentScreen = @ScreenSingModi) then
-                   ScreenSingModi.Finish;
-               end;
-
-               Display.CheckOK := true;
-             end;
-          1: begin
-               Display.CheckOK := false;
-               Display.NextScreenWithCheck := NIL;
-             end;
-          end;
+          Value := (Interaction = 0);
           Visible := false;
           Result := false;
         end;
 
-      SDLK_DOWN:    InteractNext;
-      SDLK_UP:      InteractPrev;
-
+      SDLK_DOWN:  InteractNext;
+      SDLK_UP:    InteractPrev;
+ 
       SDLK_RIGHT: InteractNext;
-      SDLK_LEFT: InteractPrev;
+      SDLK_LEFT:  InteractPrev;
     end;
   end;
+
+  if (not Result) then
+  begin
+    if (@fHandler <> nil) then
+      fHandler(Value, fHandlerData);
+  end;
 end;
 
 constructor TScreenPopupCheck.Create;
 begin
   inherited Create;
 
+  fHandler := nil;
+  fHandlerData := nil;
+
   AddText(Theme.CheckPopup.TextCheck);
   
   LoadFromTheme(Theme.CheckPopup);
@@ -163,18 +169,24 @@ end;
 
 function TScreenPopupCheck.Draw: boolean;
 begin
-  Draw:=inherited Draw;
+  Result := inherited Draw;
 end;
 
-procedure TScreenPopupCheck.onShow;
+procedure TScreenPopupCheck.OnShow;
 begin
   inherited;
 end;
 
-procedure TScreenPopupCheck.ShowPopup(msg: string);
+procedure TScreenPopupCheck.ShowPopup(const Msg: UTF8String; Handler: TPopupCheckHandler;
+    HandlerData: Pointer; DefaultValue: boolean);
 begin
-  Interaction := 0; //Reset Interaction
+  if (DefaultValue) then
+    Interaction := 0
+  else
+    Interaction := 1;
   Visible := true;  //Set Visible
+  fHandler := Handler;
+  fHandlerData := HandlerData;
 
   Text[0].Text := Language.Translate(msg);
 
@@ -187,9 +199,9 @@ begin
   Background.OnShow
 end;
 
-// error popup
+{ TScreenPopup }
 
-function TScreenPopupError.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
+function TScreenPopup.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
   if (PressedDown) then
@@ -223,7 +235,7 @@ begin
   end;
 end;
 
-constructor TScreenPopupError.Create;
+constructor TScreenPopup.Create;
 begin
   inherited Create;
 
@@ -238,22 +250,22 @@ begin
   Interaction := 0;
 end;
 
-function TScreenPopupError.Draw: boolean;
+function TScreenPopup.Draw: boolean;
 begin
   Draw := inherited Draw;
 end;
 
-procedure TScreenPopupError.onShow;
+procedure TScreenPopup.OnShow;
 begin
   inherited;
 
 end;
 
-procedure TScreenPopupError.onHide;
+procedure TScreenPopup.OnHide;
 begin
 end;
 
-procedure TScreenPopupError.ShowPopup(msg: string);
+procedure TScreenPopup.ShowPopup(const Msg: UTF8String);
 begin
   Interaction := 0; //Reset Interaction
   Visible := true;  //Set Visible
@@ -277,4 +289,20 @@ begin
   Button[0].Text[0].Text := 'OK';
 end;
 
+{ TScreenPopupError }
+
+constructor TScreenPopupError.Create;
+begin
+  inherited;
+  Text[1].Text := Language.Translate('MSG_ERROR_TITLE');
+end;
+
+{ TScreenPopupInfo }
+
+constructor TScreenPopupInfo.Create;
+begin
+  inherited;
+  Text[1].Text := Language.Translate('MSG_INFO_TITLE');
+end;
+
 end.