updates and fixes to music library

jurialmunkey · Dec 30, 2016 · 975044e · 975044e
1 parent 6ec112d
commit 975044e
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 *.xcf
 *~
 .gitattributes
+Thumbs.db
diff --git a/16x9/Includes_Image.xml b/16x9/Includes_Image.xml
@@ -31,7 +31,8 @@
     <variable name="Image_Thumb">
         <value condition="Container.Content(episodes) | Window.IsVisible(MyPics.xml)">$INFO[ListItem.Art(thumb)]</value>
         <value condition="!IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>
-        <value>$INFO[ListItem.Icon]</value>
+        <value condition="!IsEmpty(Window(home).Property(SkinHelper.Music.FanArt)) + !Control.IsVisible(58)">$INFO[Window(home).Property(SkinHelper.Music.FanArt)]</value>
+        <value condition="!Control.IsVisible(56)">$INFO[ListItem.Icon]</value>
     </variable>
 
     <variable name="Image_PVRThumb">
@@ -110,6 +111,7 @@
         <value condition="Skin.HasSetting(background.hidefanart) + !IsEmpty(Skin.String(background.fallback))">$INFO[Skin.String(background.fallback)]</value>
         <value condition="!IsEmpty(Container(9500).ListItem.Art(fanart)) + !Skin.HasSetting(global.fanart)">$INFO[Container(9500).ListItem.Art(fanart)]</value>
         <value condition="!IsEmpty(ListItem.Art(fanart)) + !Skin.HasSetting(global.fanart)">$INFO[ListItem.Art(fanart)]</value>
+        <value condition="!IsEmpty(Window(home).Property(SkinHelper.Music.Fanart)) + !Skin.HasSetting(global.fanart)">$INFO[Window(home).Property(SkinHelper.Music.Fanart)]</value>
         <value condition="!IsEmpty(Skin.String(background.fallback))">$INFO[Skin.String(background.fallback)]</value>
         <value>common/black.png</value>
         <!-- <value>special://skin/extras/backgrounds/main.jpg</value> -->

diff --git a/16x9/Includes_Label.xml b/16x9/Includes_Label.xml
@@ -82,6 +82,8 @@
         <value condition="!IsEmpty(ListItem.Property(Album_Description))">$INFO[ListItem.Property(Album_Description)]</value>
         <value condition="!IsEmpty(ListItem.AddonDescription)">$INFO[ListItem.AddonDescription]</value>
         <value condition="!IsEmpty(Window(Home).Property(SkinHelper.Music.Info))">$INFO[Window(Home).Property(SkinHelper.Music.Info)]</value>
+        <value condition="!IsEmpty(Window(Home).Property(SkinHelper.Music.Albums))">$INFO[Window(Home).Property(SkinHelper.Music.Albums)]</value>
+        <value condition="!IsEmpty(Window(Home).Property(SkinHelper.Music.TrackList))">$INFO[Window(Home).Property(SkinHelper.Music.TrackList)]</value>
         <value>$INFO[ListItem.Plot]</value>
     </variable>
 
@@ -103,8 +105,10 @@
 
     <variable name="Label_ExtraInfo_Icons">
         <value condition="Container.Content(songs)">$INFO[ListItem.Album,,  •  ]$INFO[ListItem.Year,,  •  ]$INFO[ListItem.Duration]</value>
-        <value condition="Container.Content(artists)">$INFO[ListItem.Property(Artist_YearsActive)]</value>
-        <value condition="Container.Content(albums)">$INFO[ListItem.Artist]$INFO[ListItem.Year,  •  ,]</value>
+        <value condition="Container.Content(artists) + !IsEmpty(ListItem.Property(Artist_YearsActive))">$INFO[ListItem.Property(Artist_YearsActive)]$INFO[Window(Home).Property(SkinHelper.Music.AlbumCount),  •  , $LOCALIZE[132]]$INFO[Window(Home).Property(SkinHelper.Music.SongCount),  •  , $LOCALIZE[134]]</value>
+        <value condition="Container.Content(albums) + [!IsEmpty(ListItem.Artist) | !IsEmpty(ListItem.Year)]">$INFO[ListItem.Artist]$INFO[ListItem.Year,  •  ,]$INFO[Window(Home).Property(SkinHelper.Music.SongCount),  •  , $LOCALIZE[134]]</value>
+        <value condition="Container.Content(artists) + !IsEmpty(Window(Home).Property(SkinHelper.Music.AlbumCount))">$INFO[Window(Home).Property(SkinHelper.Music.AlbumCount),, $LOCALIZE[132]]$INFO[Window(Home).Property(SkinHelper.Music.SongCount),  •  , $LOCALIZE[134]]</value>
+        <value condition="[Container.Content(artists) | Container.Content(albums)] + !IsEmpty(Window(Home).Property(SkinHelper.Music.SongCount))">$INFO[Window(Home).Property(SkinHelper.Music.SongCount),, $LOCALIZE[134]]</value>
         <value condition="Container.Content(seasons)">$INFO[ListItem.Year,,  •  ]$INFO[ListItem.Episode,, $LOCALIZE[20360]]</value>
         <value condition="!ListItem.IsCollection + Container.Content(movies)">$VAR[Label_ExtraInfo,,  •  ]$INFO[ListItem.Year,,  •  ]$INFO[ListItem.Rating]</value>
         <value condition="!ListItem.IsCollection + !Container.Content(movies)">$VAR[Label_ExtraInfo,,  •  ]$INFO[ListItem.Premiered,,  •  ]$INFO[ListItem.Rating]</value>

diff --git a/16x9/Includes_Object.xml b/16x9/Includes_Object.xml
@@ -285,7 +285,7 @@
                     <height>405</height>
                     <include>Object_Background</include>
                     <control type="image">
-                        <aspectratio>scale</aspectratio>
+                        <aspectratio>keep</aspectratio>
                         <fadetime>200</fadetime>
                         <texture background="true">$VAR[Image_Thumb]</texture>
                     </control>
@@ -307,7 +307,7 @@
                     <height>405</height>
                     <include>Object_Background</include>
                     <control type="image">
-                        <aspectratio>scale</aspectratio>
+                        <aspectratio>keep</aspectratio>
                         <fadetime>200</fadetime>
                         <texture background="true">$VAR[Image_Thumb]</texture>
                     </control>
@@ -343,33 +343,23 @@
             <height>24</height>
             <textcolor>$VAR[HighlightColor2]</textcolor>
             <font>Font-ListInfo-Small-Bold</font>
-            <label>$VAR[Label_GenreLine,[UPPERCASE],[/UPPERCASE]]</label>
+            <label fallback="19499">$VAR[Label_GenreLine,[UPPERCASE],[/UPPERCASE]]</label>
         </control>
         <control type="textbox">
             <left>pad</left>
             <right>pad</right>
             <height>120</height>
             <font>Font-ListInfo</font>
             <align>left</align>
-            <label>$VAR[Label_Plot]</label>
+            <label fallback="31092">$VAR[Label_Plot]</label>
         </control>
-        <!-- <control type="textbox">
-            <top>6</top>
-            <left>pad</left>
-            <right>pad</right>
-            <height>154</height>
-            <font>Font-ListInfo</font>
-            <align>left</align>
-            <label>$VAR[Label_Plot]</label>
-            <visible>IsEmpty(ListItem.Genre)</visible>
-        </control> -->
         <control type="label">
             <left>pad</left>
             <right>pad</right>
             <height>20</height>
             <align>right</align>
             <font>Font-ListInfo-Small-Bold</font>
-            <label>$VAR[Label_ExtraInfo_Icons]</label>
+            <label fallback="31203">$VAR[Label_ExtraInfo_Icons]</label>
         </control>
     </include>
 
@@ -384,7 +374,7 @@
                 <include>Object_Background</include>
                 <control type="image">
                     <fadetime>$PARAM[fadetime]</fadetime>
-                    <aspectratio>scale</aspectratio>
+                    <aspectratio>keep</aspectratio>
                     <texture background="true">$VAR[Image_Thumb]</texture>
                 </control>
                 <control type="image">

diff --git a/16x9/Includes_Window.xml b/16x9/Includes_Window.xml
@@ -1514,6 +1514,7 @@
                                 <itemgap>0</itemgap>
                                 <orientation>horizontal</orientation>
                                 <height>60</height>
+                                <width>100%</width>
                                 <control type="label">
                                     <aligny>top</aligny>
                                     <width>80</width>
@@ -1534,6 +1535,7 @@
                                 <itemgap>0</itemgap>
                                 <orientation>horizontal</orientation>
                                 <height>80</height>
+                                <width>100%</width>
                                 <control type="label">
                                     <aligny>top</aligny>
                                     <width>80</width>

diff --git a/16x9/Viewtype_BigIcon.xml b/16x9/Viewtype_BigIcon.xml
@@ -298,15 +298,15 @@
                             <control type="image">
                                 <width>100%</width>
                                 <height>100%</height>
-                                <aspectratio>scale</aspectratio>
+                                <aspectratio>keep</aspectratio>
                                 <texture background="true" fallback="special://skin/extras/backgrounds/home.jpg">$VAR[Image_Thumb]</texture>
                             </control>
                         </itemlayout>
                         <focusedlayout width="1280" height="720">
                             <control type="image">
                                 <width>100%</width>
                                 <height>100%</height>
-                                <aspectratio>scale</aspectratio>
+                                <aspectratio>keep</aspectratio>
                                 <texture background="true" fallback="special://skin/extras/backgrounds/home.jpg">$VAR[Image_Thumb]</texture>
                             </control>
                         </focusedlayout>

diff --git a/16x9/Viewtype_Icon.xml b/16x9/Viewtype_Icon.xml
@@ -397,6 +397,10 @@
                                 <top>pad</top>
                                 <bottom>pad</bottom>
                                 <include>Object_Background</include>
+                                <control type="image">
+                                    <aspectratio>keep</aspectratio>
+                                    <texture background="true">$INFO[ListItem.ActualIcon]</texture>
+                                </control>
                                 <control type="image">
                                     <aspectratio>scale</aspectratio>
                                     <texture background="true">$VAR[Image_Thumb]</texture>
@@ -443,15 +447,21 @@
                             <bottom>5</bottom>
                             <top>5</top>
                             <control type="image">
-                                <texture colordiffuse="$VAR[HighlightColor]">common/white.png</texture>
+                                <texture colordiffuse="$VAR[HighlightColor]" border="12">common/border.png</texture>
                             </control>
-                            <control type="image">
+                            <control type="group">
                                 <left>pad</left>
                                 <right>pad</right>
                                 <top>pad</top>
                                 <bottom>pad</bottom>
-                                <aspectratio>scale</aspectratio>
-                                <texture background="true">$VAR[Image_Thumb]</texture>
+                                <control type="image">
+                                    <aspectratio>keep</aspectratio>
+                                    <texture background="true">$INFO[ListItem.ActualIcon]</texture>
+                                </control>
+                                <control type="image">
+                                    <aspectratio>scale</aspectratio>
+                                    <texture background="true">$VAR[Image_Thumb]</texture>
+                                </control>
                             </control>
                             <control type="image">
                                 <right>15</right>

diff --git a/16x9/Viewtype_List.xml b/16x9/Viewtype_List.xml
@@ -190,7 +190,7 @@
                     <include>Object_Background</include>
                     <control type="image">
                         <fadetime>200</fadetime>
-                        <aspectratio>scale</aspectratio>
+                        <aspectratio>keep</aspectratio>
                         <texture>$VAR[Image_Thumb]</texture>
                     </control>
                 </control>

diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
     id="skin.eminence.2"
-    version="2.5.15"
+    version="2.5.16"
     name="Eminence 2.0"
     provider-name="jurialmunkey">
     <requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+[B]2.5.16[/B]
+Fix up Music Library display
+Add additional Skin Helper lookups
+Tweaks to a number of views
+Fix up cut off Default Icons
+
 [B]2.5.15[/B]
 Fix sorting labels when no sorting active
 

diff --git a/language/English/strings.po b/language/English/strings.po
@@ -740,4 +740,8 @@ msgstr ""
 
 msgctxt "#31202"
 msgid "Sort by: Default"
-msgstr ""
+msgstr ""
+
+msgctxt "#31203"
+msgid "No Additional Details Available"
+msgstr ""
diff --git a/media/DefaultMusicArtists.png b/media/DefaultMusicArtists.png
diff --git a/media/DefaultMusicRoles.png b/media/DefaultMusicRoles.png
diff --git a/media/indicator/resolution/2160.png b/media/indicator/resolution/2160.png