1 files changed, 47 insertions, 18 deletions
diff --git a/Lua/src/screens/UScreenOptionsGame.pas b/Lua/src/screens/UScreenOptionsGame.pas
index e634419b..caeaad6e 100644
--- a/Lua/src/screens/UScreenOptionsGame.pas
+++ b/Lua/src/screens/UScreenOptionsGame.pas
@@ -34,30 +34,40 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, UIni, UThemes, USongs;
+  SDL,
+  UMenu,
+  UDisplay,
+  UMusic,
+  UFiles,
+  UIni,
+  UThemes,
+  USongs;
 
 type
   TScreenOptionsGame = class(TMenu)
     public
       old_Tabs, old_Sorting: 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 RefreshSongs;
   end;
 
 implementation
 
-uses UGraphic, SysUtils;
+uses
+  UGraphic,
+  UUnicodeUtils,
+  SysUtils;
 
-function TScreenOptionsGame.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+function TScreenOptionsGame.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  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;
@@ -71,12 +81,12 @@ begin
         begin
           AudioPlayback.PlaySound(SoundLib.Back);
           RefreshSongs;
-
           FadeTo(@ScreenOptions);
         end;
       SDLK_RETURN:
         begin
-          if SelInteraction = 6 then begin
+          if SelInteraction = 6 then
+          begin
             AudioPlayback.PlaySound(SoundLib.Back);
             RefreshSongs;
             FadeTo(@ScreenOptions);
@@ -116,15 +126,34 @@ begin
   old_Sorting := Ini.Sorting;
   old_Tabs    := Ini.Tabs;
 
+  Theme.OptionsGame.SelectPlayers.showArrows  := true;
+  Theme.OptionsGame.SelectPlayers.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsGame.SelectPlayers,    Ini.Players,    IPlayers);
-  AddSelectSlide(Theme.OptionsGame.SelectDifficulty, Ini.Difficulty, IDifficulty);
-  AddSelectSlide(Theme.OptionsGame.SelectLanguage,   Ini.Language,   ILanguage);
-  AddSelectSlide(Theme.OptionsGame.SelectTabs,       Ini.Tabs,       ITabs);
-  AddSelectSlide(Theme.OptionsGame.SelectSorting,    Ini.Sorting,    ISorting);
-  AddSelectSlide(Theme.OptionsGame.SelectDebug,      Ini.Debug,      IDebug);
+
+  Theme.OptionsGame.SelectDifficulty.showArrows  := true;
+  Theme.OptionsGame.SelectDifficulty.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsGame.SelectDifficulty, Ini.Difficulty, IDifficultyTranslated);
+
+  Theme.OptionsGame.SelectLanguage.showArrows  := true;
+  Theme.OptionsGame.SelectLanguage.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsGame.SelectLanguage,   Ini.Language,   ILanguageTranslated);
+
+  Theme.OptionsGame.SelectTabs.showArrows  := true;
+  Theme.OptionsGame.SelectTabs.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsGame.SelectTabs,       Ini.Tabs,       ITabsTranslated);
+
+  Theme.OptionsGame.SelectSorting.showArrows  := true;
+  Theme.OptionsGame.SelectSorting.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsGame.SelectSorting,    Ini.Sorting,    ISortingTranslated);
+
+  Theme.OptionsGame.SelectDebug.showArrows  := true;
+  Theme.OptionsGame.SelectDebug.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsGame.SelectDebug,      Ini.Debug,      IDebugTranslated);
+
+
 
   AddButton(Theme.OptionsGame.ButtonExit);
-  if (Length(Button[0].Text)=0) then
+  if (Length(Button[0].Text) = 0) then
     AddButtonText(14, 20, Theme.Options.Description[7]);
 
 end;
@@ -132,11 +161,11 @@ end;
 //Refresh Songs Patch
 procedure TScreenOptionsGame.RefreshSongs;
 begin
-if (ini.Sorting <> old_Sorting) or (ini.Tabs <> old_Tabs) then
+  if (ini.Sorting <> old_Sorting) or (ini.Tabs <> old_Tabs) then
     ScreenSong.Refresh;
 end;
 
-procedure TScreenOptionsGame.onShow;
+procedure TScreenOptionsGame.OnShow;
 begin
   inherited;