Mixed aspect ratio artwork selection for square widgets

1080i/Includes_Labels.xml

@@ -129,6 +129,8 @@
         <!-- <value condition="!String.IsEmpty(ListItem.TvShowTitle) + !String.IsEqual(ListItem.Label,ListItem.TVShowTitle) + !String.IsEqual(ListItem.DBType,tvshow) + $EXP[Exp_WidgetWindow]">$INFO[ListItem.TvShowTitle]</value> -->
         <value condition="$EXP[Exp_IsPVRItem] + !String.IsEmpty(ListItem.Title)">$INFO[ListItem.Title]</value>
         <value condition="!String.IsEmpty(ListItem.TvShowTitle) + !String.IsEqual(ListItem.Title,ListItem.TVShowTitle) + !String.IsEqual(ListItem.DBType,tvshow)">$INFO[ListItem.TvShowTitle]</value>
+        <value condition="!String.IsEmpty(ListItem.Label2)">$INFO[ListItem.Label2]</value>
+        <value condition="String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song)">$INFO[ListItem.Artist]</value>
         <value condition="!String.IsEmpty(ListItem.Genre)">$INFO[ListItem.Genre]</value>
         <value condition="!String.IsEmpty(ListItem.Premiered)">$INFO[ListItem.Premiered]</value>
     </variable>

1080i/Includes_Layouts.xml

@@ -2027,7 +2027,10 @@
                         <visible>$EXP[Exp_IsPVRItem]</visible>
                     </include>
                     <include content="Object_ItemIcon">
-                        <param name="icon">$INFO[ListItem.Icon]</param>
+                        <param name="icon">$VAR[Image_Square]</param>
+                        <param name="icon_keep">$VAR[Image_Square]</param>
+                        <param name="is_keep">String.IsEqual(ListItem.DBType,movie)</param>
+                        <param name="icon_keep_bordersize">0</param>
                         <param name="diffuse">$PARAM[diffuse]</param>
                     </include>
                     <include content="Object_Indicator" condition="!$PARAM[variation]">
@@ -2036,7 +2039,6 @@
                         <param name="gradient_fade">16</param>
                         <visible>!$EXP[Exp_IsPVRItem]</visible>
                     </include>
-                    <include condition="$PARAM[variation] + !$PARAM[selected]">Object_Indicator</include>
                 </control>
                 <include content="Object_Control" condition="!$PARAM[variation]">
                     <param name="control">group</param>
@@ -2050,10 +2052,42 @@
                         <align>center</align>
                     </control>
                 </include>
+                <include content="Object_Control" condition="$PARAM[variation] + !Skin.HasSetting(Views.DisableBigSquareText)">
+                    <param name="control">group</param>
+                    <visible>!String.IsEqual(ListItem.DBType,movie)</visible>
+                    <include content="Object_Control">
+                        <param name="control">image</param>
+                        <texture border="12" colordiffuse="bbffffff">diffuse/poster_fade.png</texture>
+                    </include>
+                    <include content="Object_Control">
+                        <param name="control">group</param>
+                        <bottom>0</bottom>
+                        <height>120</height>
+                        <control type="label">
+                            <textcolor>ffdedede</textcolor>
+                            <label>$VAR[Label_Landscape_Upper]</label>
+                            <textoffsetx>30</textoffsetx>
+                            <align>left</align>
+                            <font>font_mini_bold</font>
+                            <height>40</height>
+                            <bottom>50</bottom>
+                        </control>
+                        <control type="label">
+                            <textcolor>b3dedede</textcolor>
+                            <label>$VAR[Label_Landscape_Lower]</label>
+                            <textoffsetx>30</textoffsetx>
+                            <align>left</align>
+                            <font>font_mini</font>
+                            <height>20</height>
+                            <bottom>30</bottom>
+                        </control>
+                    </include>
+                </include>
                 <include content="Object_Control" condition="!$PARAM[selected] + Skin.HasSetting(Glass.BorderOutline)">
                     <param name="control">image</param>
                     <texture colordiffuse="overlay_line" border="12">common/box-outline.png</texture>
                 </include>
+                <include condition="$PARAM[variation] + !$PARAM[selected]">Object_Indicator</include>
                 <include content="Object_SelectBox" condition="$PARAM[selected]">
                     <param name="indicator">$PARAM[variation]</param>
                     <param name="focusbounce">true</param>

1080i/SkinSettings.xml

@@ -708,6 +708,14 @@
                                 <onclick>Skin.ToggleSetting(Views.DisableBigLandscapeText)</onclick>
                                 <selected>!Skin.HasSetting(Views.DisableBigLandscapeText)</selected>
                             </include>
+                            <include content="Dialog_Settings_Button" description="Big Square Info">
+                                <param name="id">6007</param>
+                                <param name="control" value="radiobutton" />
+                                <label>$LOCALIZE[31387]</label>
+                                <visible>Container(3).HasFocus(6)</visible>
+                                <onclick>Skin.ToggleSetting(Views.DisableBigSquareText)</onclick>
+                                <selected>!Skin.HasSetting(Views.DisableBigSquareText)</selected>
+                            </include>
 
                             <!-- Dependencies -->
                             <include content="Dialog_Settings_Label" description="Dependencies">

1080i/script-skinvariables-includes.xml

@@ -621,4 +621,8 @@
         <value condition="Window.IsVisible(AddonBrowser.xml) + ListItem.Property(addon.hasupdate)">indicator/circle</value>
         <value condition="Window.IsVisible(AddonBrowser.xml) + ListItem.Property(addon.isinstalled)">indicator/circle</value>
     </variable>
+    <variable name="Image_Square">
+        <value condition="String.IsEqual(ListItem.DBType,movie)">$VAR[Image_Poster]</value>
+        <value condition="True">$VAR[Image_Landscape]</value>
+    </variable>
 </includes>

language/resource.language.en_gb/strings.po

@@ -1944,3 +1944,8 @@ msgstr ""
 msgctxt "#31386"
 msgid "Unwatched only"
 msgstr ""
+
+#: /1080i/SkinSettings.xml
+msgctxt "#31387"
+msgid "Text labels on big square viewtypes"
+msgstr ""