All options do have one option visible now

FIXED: SelectSlides with only two options did not show arrows on reelection
ENHANCEMENT: Beautified some portions of UMenuSelectSlide.pas code

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1784 b956fd51-792f-4845-bead-9b4dfca2ff2c

7 files changed, 126 insertions, 70 deletions

diff --git a/src/menu/UMenuSelectSlide.pas b/src/menu/UMenuSelectSlide.pas
index 81870ab8..e416c357 100644
--- a/src/menu/UMenuSelectSlide.pas
+++ b/src/menu/UMenuSelectSlide.pas
@@ -151,15 +151,7 @@ begin
   Text := TText.Create;
   SetLength(TextOpt, 1);
   TextOpt[0] := TText.Create;
-
-  //Set Standard Width for Selections Background
-//  SBGW := 400;
-
   Visible := true;
-  {SetLength(TextOpt, 3);
-  TextOpt[0] := TText.Create;
-  TextOpt[1] := TText.Create;
-  TextOpt[2] := TText.Create;}
 end;
 
 procedure TSelectSlide.SetSelect(Value: boolean);
@@ -184,14 +176,6 @@ begin
     TextureSBG.ColG := SBGColG;
     TextureSBG.ColB := SBGColB;
     TextureSBG.Int := SBGInt;
-
-{    for I := 0 to High(TextOpt) do begin
-      TextOpt[I].ColR := STColR;
-      TextOpt[I].ColG := STColG;
-      TextOpt[I].ColB := STColB;
-      TextOpt[I].Int := STInt;
-    end;}
-
   end
   else
   begin
@@ -209,13 +193,6 @@ begin
     TextureSBG.ColG := SBGDColG;
     TextureSBG.ColB := SBGDColB;
     TextureSBG.Int := SBGDInt;
-
-{    for I := 0 to High(TextOpt) do begin
-      TextOpt[I].ColR := STDColR;
-      TextOpt[I].ColG := STDColG;
-      TextOpt[I].ColB := STDColB;
-      TextOpt[I].Int := STDInt;
-    end;}
   end;
 end;
 
@@ -225,7 +202,7 @@ var
   HalfL: integer;
   HalfR: integer;
 
-procedure DoSelection(Sel: cardinal);
+  procedure DoSelection(Sel: cardinal);
   var
     I: integer;
   begin
@@ -236,39 +213,45 @@ procedure DoSelection(Sel: cardinal);
       TextOpt[I].ColB := STDColB;
       TextOpt[I].Int := STDInt;
     end;
+
     if (integer(Sel) <= high(TextOpt)) then
     begin
       TextOpt[Sel].ColR := STColR;
       TextOpt[Sel].ColG := STColG;
       TextOpt[Sel].ColB := STColB;
       TextOpt[Sel].Int := STInt;
+      end;
     end;
-  end;
+
 begin
   SelectOptInt := Value;
   PData^ := Value;
-//  SetSelect(true); // reset all colors
 
   if (Length(TextOpt)>0) AND (Length(TextOptT)>0) then
   begin
 
+    //First option selected
     if (Value <= 0) then
-    begin //First Option Selected
+    begin
       Value := 0;
 
       Tex_SelectS_ArrowL.alpha := 0;
+      Tex_SelectS_ArrowR.alpha := 1;
 
-      for SO := low (TextOpt) to high(TextOpt) do
+      for SO := low(TextOpt) to high(TextOpt) do
       begin
         TextOpt[SO].Text := TextOptT[SO];
       end;
 
       DoSelection(0);
     end
+
+    //Last option selected
     else if (Value >= high(TextOptT)) then
-    begin //Last Option Selected
+    begin
       Value := high(TextOptT);
 
+      Tex_SelectS_ArrowL.alpha := 1;
       Tex_SelectS_ArrowR.alpha := 0;
 
       for SO := high(TextOpt) downto low (TextOpt) do
@@ -277,6 +260,8 @@ begin
       end;
       DoSelection(Lines-1);
     end
+
+    //in between first and last
     else
     begin
       Tex_SelectS_ArrowL.alpha := 1;
@@ -285,45 +270,44 @@ begin
       HalfL := Ceil((Lines-1)/2);
       HalfR := Lines-1-HalfL;
 
+      //Selected option is near to the left side
       if (Value <= HalfL) then
-      begin //Selected Option is near to the left side
-	{HalfL := Value;
-	HalfR := Lines-1-HalfL;}
-	//Change Texts
-	for SO := low (TextOpt) to high(TextOpt) do
-	begin
-	  TextOpt[SO].Text := TextOptT[SO];
-	end;
-
-	DoSelection(Value);
+      begin
+        //Change texts
+      	for SO := low (TextOpt) to high(TextOpt) do
+      	begin
+      	  TextOpt[SO].Text := TextOptT[SO];
+      	end;
+
+      	DoSelection(Value);
       end
+
+      //Selected option is near to the right side
       else if (Value > High(TextOptT)-HalfR) then
-      begin //Selected is too near to the right border
-	HalfR := high(TextOptT) - Value;
-	HalfL := Lines-1-HalfR;
-	//Change Texts
-	for SO := high(TextOpt) downto low (TextOpt) do
-	begin
-	    TextOpt[SO].Text := TextOptT[high(TextOptT)-(Lines-SO-1)];
-	end;
-
-	DoSelection (HalfL);
+      begin
+      	HalfR := high(TextOptT) - Value;
+      	HalfL := Lines-1-HalfR;
+      	//Change texts
+       	for SO := high(TextOpt) downto low (TextOpt) do
+       	begin
+	        TextOpt[SO].Text := TextOptT[high(TextOptT)-(Lines-SO-1)];
+      	end;
+
+    	  DoSelection (HalfL);
       end
+
       else
       begin
-	//Change Texts
-	for SO := low (TextOpt) to high(TextOpt) do
-	begin
-	  TextOpt[SO].Text := TextOptT[Value - HalfL + SO];
-	end;
+      	//Change Texts
+       	for SO := low (TextOpt) to high(TextOpt) do
+      	begin
+	       TextOpt[SO].Text := TextOptT[Value - HalfL + SO];
+      	end;
 
-	DoSelection(HalfL);
+        DoSelection(HalfL);
       end;
-
     end;
-
   end;
-
 end;
 
 procedure TSelectSlide.Draw;
@@ -335,7 +319,7 @@ begin
     DrawTexture(Texture);
     DrawTexture(TextureSBG);
 
-    if(showArrows) then begin
+    if(showArrows && ) then begin
       DrawTexture(Tex_SelectS_ArrowL);
       DrawTexture(Tex_SelectS_ArrowR);
     end;
diff --git a/src/screens/UScreenOptionsAdvanced.pas b/src/screens/UScreenOptionsAdvanced.pas
index f57ee865..d5f58c72 100644
--- a/src/screens/UScreenOptionsAdvanced.pas
+++ b/src/screens/UScreenOptionsAdvanced.pas
@@ -129,11 +129,28 @@ begin
 
   //SelectLoadAnimation Hidden because it is useless atm
   //AddSelect(Theme.OptionsAdvanced.SelectLoadAnimation, Ini.LoadAnimation, ILoadAnimation);
+  Theme.OptionsAdvanced.SelectScreenFade.showArrows := true;
+  Theme.OptionsAdvanced.SelectScreenFade.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsAdvanced.SelectScreenFade, Ini.ScreenFade, IScreenFade);
+
+  Theme.OptionsAdvanced.SelectEffectSing.showArrows := true;
+  Theme.OptionsAdvanced.SelectEffectSing.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsAdvanced.SelectEffectSing, Ini.EffectSing, IEffectSing);
+
+  Theme.OptionsAdvanced.SelectLineBonus.showArrows := true;
+  Theme.OptionsAdvanced.SelectLineBonus.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsAdvanced.SelectLineBonus, Ini.LineBonus, ILineBonus);
+
+  Theme.OptionsAdvanced.SelectOnSongClick.showArrows := true;
+  Theme.OptionsAdvanced.SelectOnSongClick.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsAdvanced.SelectOnSongClick, Ini.OnSongClick, IOnSongClick);
+
+  Theme.OptionsAdvanced.SelectAskbeforeDel.showArrows := true;
+  Theme.OptionsAdvanced.SelectAskbeforeDel.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsAdvanced.SelectAskbeforeDel, Ini.AskBeforeDel, IAskbeforeDel);
+
+  Theme.OptionsAdvanced.SelectPartyPopup.showArrows := true;
+  Theme.OptionsAdvanced.SelectPartyPopup.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsAdvanced.SelectPartyPopup, Ini.PartyPopup, IPartyPopup);
 
   AddButton(Theme.OptionsAdvanced.ButtonExit);
diff --git a/src/screens/UScreenOptionsGraphics.pas b/src/screens/UScreenOptionsGraphics.pas
index 896f3d99..1ac2a9c4 100644
--- a/src/screens/UScreenOptionsGraphics.pas
+++ b/src/screens/UScreenOptionsGraphics.pas
@@ -132,11 +132,28 @@ begin
   inherited Create;
   LoadFromTheme(Theme.OptionsGraphics);
 
+  Theme.OptionsGraphics.SelectResolution.showArrows := true;
+  Theme.OptionsGraphics.SelectResolution.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsGraphics.SelectResolution,   Ini.Resolution, IResolution);
+
+  Theme.OptionsGraphics.SelectFullscreen.showArrows := true;
+  Theme.OptionsGraphics.SelectFullscreen.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsGraphics.SelectFullscreen,   Ini.Fullscreen, IFullscreen);
+
+  Theme.OptionsGraphics.SelectDepth.showArrows := true;
+  Theme.OptionsGraphics.SelectDepth.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsGraphics.SelectDepth,        Ini.Depth, IDepth);
+
+  Theme.OptionsGraphics.SelectVisualizer.showArrows := true;
+  Theme.OptionsGraphics.SelectVisualizer.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsGraphics.SelectVisualizer,   Ini.VisualizerOption, IVisualizer);
+
+  Theme.OptionsGraphics.SelectOscilloscope.showArrows := true;
+  Theme.OptionsGraphics.SelectOscilloscope.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsGraphics.SelectOscilloscope, Ini.Oscilloscope, IOscilloscope);
+
+  Theme.OptionsGraphics.SelectMovieSize.showArrows := true;
+  Theme.OptionsGraphics.SelectMovieSize.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsGraphics.SelectMovieSize,    Ini.MovieSize, IMovieSize);
 
   AddButton(Theme.OptionsGraphics.ButtonExit);
diff --git a/src/screens/UScreenOptionsLyrics.pas b/src/screens/UScreenOptionsLyrics.pas
index 7efe1cd2..dbc57cb3 100644
--- a/src/screens/UScreenOptionsLyrics.pas
+++ b/src/screens/UScreenOptionsLyrics.pas
@@ -119,9 +119,16 @@ begin
 
   LoadFromTheme(Theme.OptionsLyrics);
 
+  Theme.OptionsLyrics.SelectLyricsFont.showArrows := true;
+  Theme.OptionsLyrics.SelectLyricsFont.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsLyrics.SelectLyricsFont, Ini.LyricsFont, ILyricsFont);
+
+  Theme.OptionsLyrics.SelectLyricsEffect.showArrows := true;
+  Theme.OptionsLyrics.SelectLyricsEffect.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsLyrics.SelectLyricsEffect, Ini.LyricsEffect, ILyricsEffect);
-  //AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization); GAH!!!!11 DIE!!!
+
+  Theme.OptionsLyrics.SelectNoteLines.showArrows := true;
+  Theme.OptionsLyrics.SelectNoteLines.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsLyrics.SelectNoteLines, Ini.NoteLines, INoteLines);
 
   AddButton(Theme.OptionsLyrics.ButtonExit);
diff --git a/src/screens/UScreenOptionsRecord.pas b/src/screens/UScreenOptionsRecord.pas
index 3737a134..cf799204 100644
--- a/src/screens/UScreenOptionsRecord.pas
+++ b/src/screens/UScreenOptionsRecord.pas
@@ -244,6 +244,8 @@ begin
       InputDeviceNames[DeviceIndex] := AudioInputProcessor.DeviceList[DeviceIndex].Name;
     end;
     // add device-selection slider (InteractionID: 0)
+    Theme.OptionsRecord.SelectSlideCard.showArrows := true;
+    Theme.OptionsRecord.SelectSlideCard.oneItemOnly := true;
     AddSelectSlide(Theme.OptionsRecord.SelectSlideCard, CurrentDeviceIndex, InputDeviceNames);
 
     // init source-selection slider
@@ -252,6 +254,9 @@ begin
     begin
       InputSourceNames[SourceIndex] := InputDevice.Source[SourceIndex].Name;
     end;
+
+    Theme.OptionsRecord.SelectSlideInput.showArrows := true;
+    Theme.OptionsRecord.SelectSlideInput.oneItemOnly := true;
     // add source-selection slider (InteractionID: 1)
     SelectInputSourceID := AddSelectSlide(Theme.OptionsRecord.SelectSlideInput,
         InputDeviceCfg.Input, InputSourceNames);
diff --git a/src/screens/UScreenOptionsSound.pas b/src/screens/UScreenOptionsSound.pas
index 99ecb599..f10c1cb9 100644
--- a/src/screens/UScreenOptionsSound.pas
+++ b/src/screens/UScreenOptionsSound.pas
@@ -136,19 +136,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);
-  AddSelectSlide(Theme.OptionsSound.SelectBeatClick, Ini.BeatClick, IBeatClick);
+
+  Theme.OptionsSound.SelectThreshold.showArrows := true;
+  Theme.OptionsSound.SelectThreshold.oneItemOnly := true;
+  AddSelectSlide(Theme.OptionsSound.SelectThreshold, 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
diff --git a/src/screens/UScreenOptionsThemes.pas b/src/screens/UScreenOptionsThemes.pas
index e44bfca8..beb23023 100644
--- a/src/screens/UScreenOptionsThemes.pas
+++ b/src/screens/UScreenOptionsThemes.pas
@@ -161,10 +161,16 @@ begin
 
   LoadFromTheme(Theme.OptionsThemes);
 
+  Theme.OptionsThemes.SelectTheme.showArrows := true;
+  Theme.OptionsThemes.SelectTheme.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsThemes.SelectTheme, Ini.Theme, ITheme);
 
+  Theme.OptionsThemes.SelectSkin.showArrows := true;
+  Theme.OptionsThemes.SelectSkin.oneItemOnly := true;
   SkinSelect := AddSelectSlide(Theme.OptionsThemes.SelectSkin, Ini.SkinNo, ISkin);
 
+  Theme.OptionsThemes.SelectColor.showArrows := true;
+  Theme.OptionsThemes.SelectColor.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsThemes.SelectColor, Ini.Color, IColor);
 
   AddButton(Theme.OptionsThemes.ButtonExit);