aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Medley/game/themes/Deluxe.ini24
-rw-r--r--Medley/game/themes/Deluxe/Blue.ini2
-rw-r--r--Medley/game/themes/Deluxe/Fall.ini2
-rw-r--r--Medley/game/themes/Deluxe/Ribbon.ini2
-rw-r--r--Medley/game/themes/Deluxe/Summer.ini2
-rw-r--r--Medley/game/themes/Deluxe/Winter.ini2
-rw-r--r--Medley/game/themes/Deluxe/icon/song_calcmedley.pngbin0 -> 379 bytes
-rw-r--r--Medley/game/themes/Deluxe/icon/song_medley.pngbin0 -> 384 bytes
-rw-r--r--Medley/src/base/UThemes.pas8
-rw-r--r--Medley/src/screens/UScreenSong.pas19
10 files changed, 54 insertions, 7 deletions
diff --git a/Medley/game/themes/Deluxe.ini b/Medley/game/themes/Deluxe.ini
index b9bbc747..05c20551 100644
--- a/Medley/game/themes/Deluxe.ini
+++ b/Medley/game/themes/Deluxe.ini
@@ -426,6 +426,30 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 22
+[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
+
[SongStatic3]
X = 278
Y = 120
diff --git a/Medley/game/themes/Deluxe/Blue.ini b/Medley/game/themes/Deluxe/Blue.ini
index 10017fb3..abb2fdce 100644
--- a/Medley/game/themes/Deluxe/Blue.ini
+++ b/Medley/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/game/themes/Deluxe/Fall.ini b/Medley/game/themes/Deluxe/Fall.ini
index 38f25cdb..dd7d5122 100644
--- a/Medley/game/themes/Deluxe/Fall.ini
+++ b/Medley/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/game/themes/Deluxe/Ribbon.ini b/Medley/game/themes/Deluxe/Ribbon.ini
index 73cae2ab..3a62d960 100644
--- a/Medley/game/themes/Deluxe/Ribbon.ini
+++ b/Medley/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/game/themes/Deluxe/Summer.ini b/Medley/game/themes/Deluxe/Summer.ini
index 36e9f5d7..544b37b5 100644
--- a/Medley/game/themes/Deluxe/Summer.ini
+++ b/Medley/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/game/themes/Deluxe/Winter.ini b/Medley/game/themes/Deluxe/Winter.ini
index 72514a15..28c58ac6 100644
--- a/Medley/game/themes/Deluxe/Winter.ini
+++ b/Medley/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/game/themes/Deluxe/icon/song_calcmedley.png b/Medley/game/themes/Deluxe/icon/song_calcmedley.png
new file mode 100644
index 00000000..30a13ea0
--- /dev/null
+++ b/Medley/game/themes/Deluxe/icon/song_calcmedley.png
Binary files differ
diff --git a/Medley/game/themes/Deluxe/icon/song_medley.png b/Medley/game/themes/Deluxe/icon/song_medley.png
new file mode 100644
index 00000000..ac7b25bb
--- /dev/null
+++ b/Medley/game/themes/Deluxe/icon/song_medley.png
Binary files differ
diff --git a/Medley/src/base/UThemes.pas b/Medley/src/base/UThemes.pas
index 6ffeb3b1..4ffe0ba0 100644
--- a/Medley/src/base/UThemes.pas
+++ b/Medley/src/base/UThemes.pas
@@ -259,6 +259,10 @@ type
//Video Icon Mod
VideoIcon: TThemeStatic;
+ //Medley Icons
+ MedleyIcon: TThemeStatic;
+ CalculatedMedleyIcon: TThemeStatic;
+
//Show Cat in TopLeft Mod
TextCat: TThemeText;
StaticCat: TThemeStatic;
@@ -999,6 +1003,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/src/screens/UScreenSong.pas b/Medley/src/screens/UScreenSong.pas
index 421c392a..22ecb505 100644
--- a/Medley/src/screens/UScreenSong.pas
+++ b/Medley/src/screens/UScreenSong.pas
@@ -72,6 +72,10 @@ type
//Video Icon Mod
VideoIcon: cardinal;
+ //Medley Icons
+ MedleyIcon: cardinal;
+ CalcMedleyIcon: cardinal;
+
TextCat: integer;
StaticCat: integer;
@@ -883,6 +887,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);
@@ -1022,17 +1030,14 @@ begin
// Set visibility of video icon
Static[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet;
+ // Set visibility of medley icons
+ Static[MedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msTag);
+ Static[CalcMedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msCalculated);
+
// Set texts
Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;
Text[TextTitle].Text := CatSongs.Song[Interaction].Title;
- //medley mod
- if CatSongs.Song[Interaction].Medley.Source = msTag then
- Text[TextTitle].Text := Text[TextTitle].Text + ' [M]';
-
- if CatSongs.Song[Interaction].Medley.Source = msCalculated then
- Text[TextTitle].Text := Text[TextTitle].Text + ' [C]';
-
if (Ini.TabsAtStartup = 1) and (CatSongs.CatNumShow = -1) then
begin
Text[TextNumber].Text := IntToStr(CatSongs.Song[Interaction].OrderNum) + '/' + IntToStr(CatSongs.CatCount);