- 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

3 files changed, 21 insertions, 1 deletions

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;