From 3011f6be392e0bc1bbf0c1f649ccc3d774ae68fb Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Sun, 17 Oct 2010 15:40:13 +0000 Subject: - added medley icons to dx-theme - set CalcMedley default = true git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2674 b956fd51-792f-4845-bead-9b4dfca2ff2c --- medley_new/game/themes/Deluxe.ini | 24 +++++++++++++++++++++ medley_new/game/themes/Deluxe/Blue.ini | 2 ++ medley_new/game/themes/Deluxe/Fall.ini | 2 ++ medley_new/game/themes/Deluxe/Ocean.ini | 2 ++ medley_new/game/themes/Deluxe/Ribbon.ini | 2 ++ medley_new/game/themes/Deluxe/Summer.ini | 2 ++ medley_new/game/themes/Deluxe/Winter.ini | 2 ++ .../game/themes/Deluxe/[icon]song_calcmedley.png | Bin 0 -> 379 bytes .../game/themes/Deluxe/[icon]song_medley.png | Bin 0 -> 384 bytes medley_new/src/base/USong.pas | 2 +- medley_new/src/base/UThemes.pas | 8 +++++++ medley_new/src/screens/UScreenSong.pas | 12 +++++++++++ 12 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 medley_new/game/themes/Deluxe/[icon]song_calcmedley.png create mode 100644 medley_new/game/themes/Deluxe/[icon]song_medley.png (limited to 'medley_new') diff --git a/medley_new/game/themes/Deluxe.ini b/medley_new/game/themes/Deluxe.ini index 30a1a198..d7745cac 100644 --- a/medley_new/game/themes/Deluxe.ini +++ b/medley_new/game/themes/Deluxe.ini @@ -439,6 +439,30 @@ Length = 15 Reflection = 1 ReflectionSpacing = 2 +[SongMedleyIcon] +X = 335 +Y = 445 +W = 24 +H = 24 +Z = 0.95 +Color = White +Tex = icon_song_medley +Type = Transparent +Reflection = 1 +ReflectionSpacing = 22 + +[SongCalculatedMedleyIcon] +X = 335 +Y = 445 +W = 24 +H = 24 +Z = 0.95 +Color = White +Tex = icon_song_calcmedley +Type = Transparent +Reflection = 1 +ReflectionSpacing = 22 + [SongVideoIcon] X = 310 Y = 445 diff --git a/medley_new/game/themes/Deluxe/Blue.ini b/medley_new/game/themes/Deluxe/Blue.ini index 3ebc04ff..62314f91 100644 --- a/medley_new/game/themes/Deluxe/Blue.ini +++ b/medley_new/game/themes/Deluxe/Blue.ini @@ -24,6 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png icon_song_menu = [icon]song_menu.png icon_song_search = [icon]song_search.png icon_song_video = [icon]song_video.png +icon_song_medley = [icon]song_medley.png +icon_song_calcmedley = [icon]song_calcmedley.png # # # M A I N # # # diff --git a/medley_new/game/themes/Deluxe/Fall.ini b/medley_new/game/themes/Deluxe/Fall.ini index 4502be61..feef593b 100644 --- a/medley_new/game/themes/Deluxe/Fall.ini +++ b/medley_new/game/themes/Deluxe/Fall.ini @@ -24,6 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png icon_song_menu = [icon]song_menu.png icon_song_search = [icon]song_search.png icon_song_video = [icon]song_video.png +icon_song_medley = [icon]song_medley.png +icon_song_calcmedley = [icon]song_calcmedley.png # # # M A I N # # # diff --git a/medley_new/game/themes/Deluxe/Ocean.ini b/medley_new/game/themes/Deluxe/Ocean.ini index 8af41f20..aa935a77 100644 --- a/medley_new/game/themes/Deluxe/Ocean.ini +++ b/medley_new/game/themes/Deluxe/Ocean.ini @@ -24,6 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png icon_song_menu = [icon]song_menu.png icon_song_search = [icon]song_search.png icon_song_video = [icon]song_video.png +icon_song_medley = [icon]song_medley.png +icon_song_calcmedley = [icon]song_calcmedley.png # # # M A I N # # # diff --git a/medley_new/game/themes/Deluxe/Ribbon.ini b/medley_new/game/themes/Deluxe/Ribbon.ini index 06a4dd41..ed0d7a40 100644 --- a/medley_new/game/themes/Deluxe/Ribbon.ini +++ b/medley_new/game/themes/Deluxe/Ribbon.ini @@ -24,6 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png icon_song_menu = [icon]song_menu.png icon_song_search = [icon]song_search.png icon_song_video = [icon]song_video.png +icon_song_medley = [icon]song_medley.png +icon_song_calcmedley = [icon]song_calcmedley.png # # # M A I N # # # diff --git a/medley_new/game/themes/Deluxe/Summer.ini b/medley_new/game/themes/Deluxe/Summer.ini index 660a5ec7..e63b3968 100644 --- a/medley_new/game/themes/Deluxe/Summer.ini +++ b/medley_new/game/themes/Deluxe/Summer.ini @@ -24,6 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png icon_song_menu = [icon]song_menu.png icon_song_search = [icon]song_search.png icon_song_video = [icon]song_video.png +icon_song_medley = [icon]song_medley.png +icon_song_calcmedley = [icon]song_calcmedley.png # # # M A I N # # # diff --git a/medley_new/game/themes/Deluxe/Winter.ini b/medley_new/game/themes/Deluxe/Winter.ini index 71b4dfaa..fd993078 100644 --- a/medley_new/game/themes/Deluxe/Winter.ini +++ b/medley_new/game/themes/Deluxe/Winter.ini @@ -24,6 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png icon_song_menu = [icon]song_menu.png icon_song_search = [icon]song_search.png icon_song_video = [icon]song_video.png +icon_song_medley = [icon]song_medley.png +icon_song_calcmedley = [icon]song_calcmedley.png # # # M A I N # # # diff --git a/medley_new/game/themes/Deluxe/[icon]song_calcmedley.png b/medley_new/game/themes/Deluxe/[icon]song_calcmedley.png new file mode 100644 index 00000000..30a13ea0 Binary files /dev/null and b/medley_new/game/themes/Deluxe/[icon]song_calcmedley.png differ diff --git a/medley_new/game/themes/Deluxe/[icon]song_medley.png b/medley_new/game/themes/Deluxe/[icon]song_medley.png new file mode 100644 index 00000000..ac7b25bb Binary files /dev/null and b/medley_new/game/themes/Deluxe/[icon]song_medley.png differ diff --git a/medley_new/src/base/USong.pas b/medley_new/src/base/USong.pas index a736b4ae..0dd4b006 100644 --- a/medley_new/src/base/USong.pas +++ b/medley_new/src/base/USong.pas @@ -1550,7 +1550,7 @@ begin Resolution := 4; Creator := ''; PreviewStart := 0; - CalcMedley := false; + CalcMedley := true; Medley.Source := msNone; Relative := false; diff --git a/medley_new/src/base/UThemes.pas b/medley_new/src/base/UThemes.pas index b385406f..9dad86d5 100644 --- a/medley_new/src/base/UThemes.pas +++ b/medley_new/src/base/UThemes.pas @@ -261,6 +261,10 @@ type //Video Icon Mod VideoIcon: TThemeStatic; + //Medley Icons + MedleyIcon: TThemeStatic; + CalculatedMedleyIcon: TThemeStatic; + //Show Cat in TopLeft Mod TextCat: TThemeText; StaticCat: TThemeStatic; @@ -1087,6 +1091,10 @@ begin //Video Icon Mod ThemeLoadStatic(Song.VideoIcon, 'SongVideoIcon'); + //Medley Icons + ThemeLoadStatic(Song.MedleyIcon, 'SongMedleyIcon'); + ThemeLoadStatic(Song.CalculatedMedleyIcon, 'SongCalculatedMedleyIcon'); + //Show Cat in TopLeft Mod ThemeLoadStatic(Song.StaticCat, 'SongStaticCat'); ThemeLoadText(Song.TextCat, 'SongTextCat'); diff --git a/medley_new/src/screens/UScreenSong.pas b/medley_new/src/screens/UScreenSong.pas index 716cfb0c..1de16f94 100644 --- a/medley_new/src/screens/UScreenSong.pas +++ b/medley_new/src/screens/UScreenSong.pas @@ -78,6 +78,10 @@ type //Video Icon Mod VideoIcon: cardinal; + //Medley Icons + MedleyIcon: cardinal; + CalcMedleyIcon: cardinal; + TextCat: integer; StaticCat: integer; @@ -866,6 +870,10 @@ begin //Show Video Icon Mod VideoIcon := AddStatic(Theme.Song.VideoIcon); + //Meldey Icons + MedleyIcon := AddStatic(Theme.Song.MedleyIcon); + CalcMedleyIcon := AddStatic(Theme.Song.CalculatedMedleyIcon); + //Party Mode StaticTeam1Joker1 := AddStatic(Theme.Song.StaticTeam1Joker1); StaticTeam1Joker2 := AddStatic(Theme.Song.StaticTeam1Joker2); @@ -1027,6 +1035,10 @@ begin // Set visibility of video icon Statics[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet; + // Set visibility of medley icons + Statics[MedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msTag); + Statics[CalcMedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msCalculated); + // Set texts Text[TextArtist].Text := CatSongs.Song[Interaction].Artist; Text[TextTitle].Text := CatSongs.Song[Interaction].Title; -- cgit v1.2.3