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

1 files changed, 31 insertions, 11 deletions

diff --git a/unicode/src/screens/UScreenOptionsSound.pas b/unicode/src/screens/UScreenOptionsSound.pas
index d0125a9d..78bf9633 100644
--- a/unicode/src/screens/UScreenOptionsSound.pas
+++ b/unicode/src/screens/UScreenOptionsSound.pas
@@ -61,14 +61,14 @@ uses
 function TScreenOptionsSound.ParseInput(PressedKey: cardinal;
   CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
-  Result := True;
+  Result := true;
   if (PressedDown) then
   begin // Key Down
         // check normal keys
     case UCS4UpperCase(CharCode) of
       Ord('Q'):
       begin
-        Result := False;
+        Result := false;
         Exit;
       end;
     end;
@@ -137,19 +137,39 @@ begin
 
   LoadFromTheme(Theme.OptionsSound);
 
-  AddSelectSlide(Theme.OptionsSound.SelectSlideVoicePassthrough,
-    Ini.VoicePassthrough, IVoicePassthrough);
-  AddSelectSlide(Theme.OptionsSound.SelectBackgroundMusic,
-    Ini.BackgroundMusicOption, IBackgroundMusic);
-  AddSelectSlide(Theme.OptionsSound.SelectMicBoost, Ini.MicBoost, IMicBoost);
+  Theme.OptionsSound.SelectSlideVoicePassthrough.showArrows := true;
+  Theme.OptionsSound.SelectSlideVoicePassthrough.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsSound.SelectSlideVoicePassthrough, Ini.VoicePassthrough, IVoicePassthrough);
+
+  Theme.OptionsSound.SelectBackgroundMusic.showArrows := true;
+  Theme.OptionsSound.SelectBackgroundMusic.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsSound.SelectBackgroundMusic, Ini.BackgroundMusicOption, IBackgroundMusic);
+
   // TODO: - MicBoost needs to be moved to ScreenOptionsRecord
+  Theme.OptionsSound.SelectMicBoost.showArrows := true;
+  Theme.OptionsSound.SelectMicBoost.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsSound.SelectMicBoost, Ini.MicBoost, IMicBoost);
+
+
+  Theme.OptionsSound.SelectClickAssist.showArrows := true;
+  Theme.OptionsSound.SelectClickAssist.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsSound.SelectClickAssist, Ini.ClickAssist, IClickAssist);
+
+  Theme.OptionsSound.SelectBeatClick.showArrows := true;
+  Theme.OptionsSound.SelectBeatClick.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsSound.SelectBeatClick, Ini.BeatClick, IBeatClick);
+
+  Theme.OptionsSound.SelectThreshold.showArrows := true;
+  Theme.OptionsSound.SelectThreshold.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsSound.SelectThreshold, Ini.ThresholdIndex, IThreshold);
-  AddSelectSlide(Theme.OptionsSound.SelectSlidePreviewVolume,
-    Ini.PreviewVolume, IPreviewVolume);
-  AddSelectSlide(Theme.OptionsSound.SelectSlidePreviewFading,
-    Ini.PreviewFading, IPreviewFading);
+
+  Theme.OptionsSound.SelectSlidePreviewVolume.showArrows := true;
+  Theme.OptionsSound.SelectSlidePreviewVolume.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsSound.SelectSlidePreviewVolume, Ini.PreviewVolume, IPreviewVolume);
+
+  Theme.OptionsSound.SelectSlidePreviewFading.showArrows := true;
+  Theme.OptionsSound.SelectSlidePreviewFading.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsSound.SelectSlidePreviewFading, Ini.PreviewFading, IPreviewFading);
 
   AddButton(Theme.OptionsSound.ButtonExit);
   if (Length(Button[0].Text) = 0) then