From 685ed5368eabc3704e2b099a1bd43c8317d92c31 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 15 Dec 2009 18:31:06 +0000
Subject: added medley icons to screensong

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2040 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Medley/src/base/UThemes.pas        |  8 ++++++++
 Medley/src/screens/UScreenSong.pas | 19 ++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'Medley/src')

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);
-- 
cgit v1.2.3