editor: VideoGap slide

editor: keys 7&8 to change Video Gap

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

5 files changed, 487 insertions, 2 deletions

diff --git a/us_maker_edition/game/themes/Classic.ini b/us_maker_edition/game/themes/Classic.ini
index 82bb83c8..919080d6 100644
--- a/us_maker_edition/game/themes/Classic.ini
+++ b/us_maker_edition/game/themes/Classic.ini
@@ -8302,6 +8302,31 @@ SBGDColor = ColorLight
 STColor = White
 STDColor = GrayDark
 
+[EditSubVideoGap]
+X = 510
+Y = 270
+W = 100
+H = 20
+SkipX = 10
+TextSize = 16
+Text = EDIT_VIDEOGAP
+Tex = MainBar
+Type = Colorized
+TexSBG = MainBar
+TypeSBG = Colorized
+ShowArrows = 0
+SBGW = 100
+Align = 0
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = ColorDark
+SBGDColor = ColorLight
+STColor = White
+STDColor = GrayDark
 
 [EditSubSelectVolAudio]
 TexSBG = SelectBG
diff --git a/us_maker_edition/game/themes/Deluxe.ini b/us_maker_edition/game/themes/Deluxe.ini
index 143a8be0..dd72bfc0 100644
--- a/us_maker_edition/game/themes/Deluxe.ini
+++ b/us_maker_edition/game/themes/Deluxe.ini
@@ -8971,6 +8971,32 @@ SBGDColor = ColorLight
 STColor = White
 STDColor = GrayDark
 
+[EditSubVideoGap]
+X = 510
+Y = 270
+W = 100
+H = 20
+SkipX = 10
+TextSize = 16
+Text = EDIT_VIDEOGAP
+Tex = MainBar
+Type = Colorized
+TexSBG = MainBar
+TypeSBG = Colorized
+ShowArrows = 0
+SBGW = 100
+Align = 0
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = ColorDark
+SBGDColor = ColorLight
+STColor = White
+STDColor = GrayDark
+
 [EditSubSelectVolAudio]
 TexSBG = SelectBG
 Text = EDIT_VOLUME_AUDIO
diff --git a/us_maker_edition/game/themes/Verdure.ini b/us_maker_edition/game/themes/Verdure.ini
index 126e0134..2e878391 100644
--- a/us_maker_edition/game/themes/Verdure.ini
+++ b/us_maker_edition/game/themes/Verdure.ini
@@ -8991,4 +8991,396 @@ IndicatorYOffset = 3
 X = 80

 W = 640

 Y = 535

-H = 41
\ No newline at end of file
+H = 41

+

+[EditSub]

+

+[EditSubTitle]

+X = 30

+Y = 60

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_TITLE

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 350

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubArtist]

+X = 30

+Y = 81

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_ARTIST

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 350

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubMP3]

+X = 30

+Y = 102

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_MP3

+Tex = MainBar

+Type = Colorized

+TexSBG = SelectBG

+TypeSBG = Colorized

+ShowArrows = 1

+OneItemOnly = 1

+SBGW = 350

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubCover]

+X = 30

+Y = 123

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_COVER

+Tex = MainBar

+Type = Colorized

+TexSBG = SelectBG

+TypeSBG = Colorized

+ShowArrows = 1

+OneItemOnly = 1

+SBGW = 350

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubBackground]

+X = 30

+Y = 144

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_BACKGROUND

+Tex = MainBar

+Type = Colorized

+TexSBG = SelectBG

+TypeSBG = Colorized

+ShowArrows = 1

+OneItemOnly = 1

+SBGW = 350

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubBPM]

+X = 30

+Y = 165

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_BPM

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 100

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubGAP]

+X = 30

+Y = 186

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_GAP

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 100

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubStart]

+X = 30

+Y = 207

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_START

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 100

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubDuration]

+X = 30

+Y = 228

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_DURATION

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 100

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubTone]

+X = 30

+Y = 249

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_TONE

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 100

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubLyric]

+X = 30

+Y = 270

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_LYRIC

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 350

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubVideoGap]

+X = 510

+Y = 270

+W = 100

+H = 20

+SkipX = 10

+TextSize = 16

+Text = EDIT_VIDEOGAP

+Tex = MainBar

+Type = Colorized

+TexSBG = MainBar

+TypeSBG = Colorized

+ShowArrows = 0

+SBGW = 100

+Align = 0

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = ColorDark

+SBGDColor = ColorLight

+STColor = White

+STDColor = GrayDark

+

+[EditSubSelectVolAudio]

+TexSBG = SelectBG

+Text = EDIT_VOLUME_AUDIO

+Type = Colorized

+TypeSBG = Colorized

+X = 580

+Y = 545

+W = 250

+H = 16

+TextSize = 14

+SkipX = -150

+ShowArrows = 1

+OneItemOnly = 1

+SBGW = 100

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = DarkBlue

+SBGDColor = LightBlue

+STColor = White

+STDColor = GrayDark

+

+[EditSubSelectVolMidi]

+TexSBG = SelectBG

+Text = EDIT_VOLUME_MIDI

+Type = Colorized

+TypeSBG = Colorized

+X = 580

+Y = 562

+W = 0

+H = 16

+TextSize = 14

+SkipX = 100

+ShowArrows = 1

+OneItemOnly = 1

+SBGW = 100

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = DarkBlue

+SBGDColor = LightBlue

+STColor = White

+STDColor = GrayDark

+

+[EditSubSelectVolClick]

+TexSBG = SelectBG

+Text = EDIT_VOLUME_CLICK

+Type = Colorized

+TypeSBG = Colorized

+X = 580

+Y = 579

+W = 0

+H = 16

+TextSize = 14

+SkipX = 100

+ShowArrows = 1

+OneItemOnly = 1

+SBGW = 100

+

+Color = ColorDark

+DColor = ColorLight

+TColor = White

+TDColor = White

+

+SBGColor = DarkBlue

+SBGDColor = LightBlue

+STColor = White

+STDColor = GrayDark

diff --git a/us_maker_edition/src/base/UThemes.pas b/us_maker_edition/src/base/UThemes.pas
index af901b03..21d729f8 100644
--- a/us_maker_edition/src/base/UThemes.pas
+++ b/us_maker_edition/src/base/UThemes.pas
@@ -521,6 +521,7 @@ type
       SelectVolAudio:      TThemeSelectSlide;
       SelectVolMidi:       TThemeSelectSlide;
       SelectVolClick:      TThemeSelectSlide;
+      SlideVideoGap:      TThemeSelectSlide;
   end;
 
   //Error- and Check-Popup
@@ -1418,6 +1419,7 @@ begin
       ThemeLoadSelectSlide(EditSub.SelectVolAudio, 'EditSubSelectVolAudio');
       ThemeLoadSelectSlide(EditSub.SelectVolMidi, 'EditSubSelectVolMidi');
       ThemeLoadSelectSlide(EditSub.SelectVolClick, 'EditSubSelectVolClick');
+      ThemeLoadSelectSlide(EditSub.SlideVideoGap, 'EditSubVideoGap');
 
       //error and check popup
       ThemeLoadBasic (ErrorPopup, 'ErrorPopup');
diff --git a/us_maker_edition/src/screens/UScreenEditSub.pas b/us_maker_edition/src/screens/UScreenEditSub.pas
index e003e78d..7e14cd8c 100644
--- a/us_maker_edition/src/screens/UScreenEditSub.pas
+++ b/us_maker_edition/src/screens/UScreenEditSub.pas
@@ -173,11 +173,17 @@ type
       LyricData:        integer;
       LyricVal:         array of UTF8String;
       SlideLyricIndex:  integer;
+      // VideoGap header
+      VideoGapSlideId:  integer;
+      VideoGapData:        integer;
+      VideoGapVal:         array of UTF8String;
+      SlideVideoGapIndex:  integer;
       // Volume Slide
       VolumeAudioSlideId: integer;
       VolumeMidiSlideId:  integer;
       VolumeClickSlideId: integer;
       VolumeAudioIndex,VolumeMidiIndex,VolumeClickIndex: integer; //for update slide
+
       VolumeAudio:    array of UTF8String;
       VolumeMidi:    array of UTF8String;
       VolumeClick:    array of UTF8String;
@@ -608,6 +614,26 @@ begin
           end;
         end;
 
+      SDLK_7:
+        begin
+          if SDL_ModState = 0 then
+            CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) - 1 )/100;
+          if SDL_ModState = KMOD_LSHIFT then
+            CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) - 10 )/100;
+          if SDL_ModState = KMOD_LCTRL then
+            CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) - 100 )/100;
+        end;
+
+      SDLK_8:
+        begin
+          if SDL_ModState = 0 then
+            CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) + 1 )/100;
+          if SDL_ModState = KMOD_LSHIFT then
+            CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) + 10 )/100;
+          if SDL_ModState = KMOD_LCTRL then
+            CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) + 100 )/100;
+        end;
+
       SDLK_9:
         begin
           // Decrease GAP
@@ -2213,6 +2239,10 @@ begin
   VolumeAudioSlideId := AddSelectSlide(Theme.EditSub.SelectVolAudio, VolumeAudioIndex, VolumeAudio);
   VolumeMidiSlideId := AddSelectSlide(Theme.EditSub.SelectVolMidi, VolumeMidiIndex, VolumeMidi);
   VolumeClickSlideId := AddSelectSlide(Theme.EditSub.SelectVolClick, VolumeClickIndex, VolumeClick);
+  // VideoGap Header
+  VideoGapSlideId := AddSelectSlide(Theme.EditSub.SlideVideoGap, VideoGapdata, VideoGapVal);
+  SelectsS[VideoGapSlideId].Text.Align := 0;
+  SelectsS[VideoGapSlideId].Text.X := SelectsS[VideoGapSlideId].Texture.X + 3;
 
 //  TextTitle :=  AddText(180, 65,  0, 24, 0, 0, 0, 'a');
 //  TextArtist := AddText(180, 90,  0, 24, 0, 0, 0, 'b');
@@ -2401,7 +2431,7 @@ begin
     UpdateSelectSlideOptions(Theme.EditSub.SlideTone,ToneSlideId,ToneVal,SlideToneIndex);
     SelectsS[ToneSlideId].TextOpt[0].Align := 0;
     SelectsS[ToneSlideId].TextOpt[0].X := SelectsS[ToneSlideId].TextureSBG.X + 5;
-    // Header Tone
+    // Header Lyric
     SetLength(LyricVal, 1);
     LyricVal[0] := '';
     SlideLyricIndex := 1;
@@ -2409,6 +2439,14 @@ begin
     SelectsS[LyricSlideId].TextOpt[0].Align := 0;
     SelectsS[LyricSlideId].TextOpt[0].X := SelectsS[LyricSlideId].TextureSBG.X + 5;
 
+    // Header VideoGap
+    SetLength(VideoGapVal, 1);
+    VideoGapVal[0] := '';
+    SlideVideoGapIndex := 1;
+    UpdateSelectSlideOptions(Theme.EditSub.SlideVideoGap,VideoGapSlideId,VideoGapVal,SlideVideoGapIndex);
+    SelectsS[VideoGapSlideId].TextOpt[0].Align := 0;
+    SelectsS[VideoGapSlideId].TextOpt[0].X := SelectsS[VideoGapSlideId].TextureSBG.X + 5;
+
     // volume slides
     SetLength(VolumeAudio, 0);
     SetLength(VolumeMidi, 0);
@@ -2608,6 +2646,8 @@ begin
     //Text[TextNText].Text :=              Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text;
     LyricVal[0] := Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text;
     SelectsS[LyricSlideId].TextOpt[0].Text := LyricVal[0];
+    VideoGapVal[0] := floattostr(CurrentSong.VideoGAP);
+    SelectsS[VideoGapSlideId].TextOpt[0].Text := VideoGapVal[0];
   end;
 
   // Text Edit Mode