Make Banner View row height adjustable.

Addresses Issue #124.
jingai · Sep 22, 2016 · 302a8d7 · 302a8d7
1 parent fdc68cf
commit 302a8d7
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 67 deletions.
diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml
@@ -399,7 +399,16 @@
 						<onclick>Skin.ToggleSetting(LogoViewSingleItem)</onclick>
 						<selected>Skin.HasSetting(LogoViewSingleItem)</selected>
 					</control>
-					<control type="radiobutton" id="515">
+					<control type="button" id="515">
+						<include>SettingsLabel</include>
+						<onfocus condition="IsEmpty(Skin.String(BannerViewHeight))">Skin.SetString(BannerViewHeight,2)</onfocus>
+						<label2>$INFO[Skin.String(BannerViewHeight)]</label2>
+						<label>$LOCALIZE[31483]</label>
+						<onclick condition="StringCompare(Skin.String(BannerViewHeight),2) | IsEmpty(Skin.String(BannerViewHeight))">Skin.SetString(BannerViewHeight,3)</onclick>
+						<onclick condition="StringCompare(Skin.String(BannerViewHeight),3)">Skin.SetString(BannerViewHeight,4)</onclick>
+						<onclick condition="StringCompare(Skin.String(BannerViewHeight),4)">Skin.SetString(BannerViewHeight,2)</onclick>
+					</control>
+					<control type="radiobutton" id="516">
 						<include>SettingsLabel</include>
 						<label>$LOCALIZE[31712]</label>
 						<onclick>Skin.ToggleSetting(CropMVGalleryIcon)</onclick>
@@ -654,21 +663,21 @@
 						<onfocus condition="IsEmpty(Skin.String(OSDFade))">Skin.SetString(OSDFade,Disabled)</onfocus>
 						<label2>$INFO[Skin.String(OSDFade)]</label2>
 						<label>$LOCALIZE[31476]</label>
-						<onclick condition="Stringcompare(Skin.String(OSDFade),Disabled) | IsEmpty(Skin.String(OSDFade))">Skin.SetString(OSDFade,Partial)</onclick>
-						<onclick condition="Stringcompare(Skin.String(OSDFade),Partial)">Skin.SetString(OSDFade,Complete)</onclick>
-						<onclick condition="Stringcompare(Skin.String(OSDFade),Complete)">Skin.SetString(OSDFade,Disabled)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFade),Disabled) | IsEmpty(Skin.String(OSDFade))">Skin.SetString(OSDFade,Partial)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFade),Partial)">Skin.SetString(OSDFade,Complete)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFade),Complete)">Skin.SetString(OSDFade,Disabled)</onclick>
 					</control>
 					<control type="button" id="711">
 						<include>SettingsLabel</include>
 						<onfocus condition="IsEmpty(Skin.String(OSDFadeTime))">Skin.SetString(OSDFadeTime,15)</onfocus>
 						<label2>$INFO[Skin.String(OSDFadeTime),, s]</label2>
 						<label>$LOCALIZE[31477]</label>
-						<onclick condition="Stringcompare(Skin.String(OSDFadeTime),30) | IsEmpty(Skin.String(OSDFadeTime))">Skin.SetString(OSDFadeTime,5)</onclick>
-						<onclick condition="Stringcompare(Skin.String(OSDFadeTime),5)">Skin.SetString(OSDFadeTime,10)</onclick>
-						<onclick condition="Stringcompare(Skin.String(OSDFadeTime),10)">Skin.SetString(OSDFadeTime,15)</onclick>
-						<onclick condition="Stringcompare(Skin.String(OSDFadeTime),15)">Skin.SetString(OSDFadeTime,20)</onclick>
-						<onclick condition="Stringcompare(Skin.String(OSDFadeTime),20)">Skin.SetString(OSDFadeTime,25)</onclick>
-						<onclick condition="Stringcompare(Skin.String(OSDFadeTime),25)">Skin.SetString(OSDFadeTime,30)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFadeTime),30) | IsEmpty(Skin.String(OSDFadeTime))">Skin.SetString(OSDFadeTime,5)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFadeTime),5)">Skin.SetString(OSDFadeTime,10)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFadeTime),10)">Skin.SetString(OSDFadeTime,15)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFadeTime),15)">Skin.SetString(OSDFadeTime,20)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFadeTime),20)">Skin.SetString(OSDFadeTime,25)</onclick>
+						<onclick condition="StringCompare(Skin.String(OSDFadeTime),25)">Skin.SetString(OSDFadeTime,30)</onclick>
 						<visible>![StringCompare(Skin.String(OSDFade),Disabled) | IsEmpty(Skin.String(OSDFade))]</visible>
 					</control>
 					<control type="image" id="712">

diff --git a/720p/Viewtype_Banner.xml b/720p/Viewtype_Banner.xml
@@ -1,83 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
+	<include name="Banner3x2_ImagePos">
+		<posx>40</posx>
+		<posy>340</posy>
+		<height>180</height>
+		<width>1200</width>
+	</include>
+	<include name="Banner3x2_TitleYPos">
+		<posy>280</posy>
+	</include>
+	<include name="Banner3x3_ImagePos">
+		<posx>40</posx>
+		<posy>250</posy>
+		<height>270</height>
+		<width>1200</width>
+	</include>
+	<include name="Banner3x3_TitleYPos">
+		<posy>190</posy>
+	</include>
+	<include name="Banner3x4_ImagePos">
+		<posx>40</posx>
+		<posy>160</posy>
+		<height>360</height>
+		<width>1200</width>
+	</include>
+	<include name="Banner3x4_TitleYPos">
+		<posy>100</posy>
+	</include>
 	<include name="Viewtype_Banner">
 		<control type="group">
 			<visible>Control.IsVisible(511)</visible>
 			<!-- Browser -->
 			<control type="panel" id="511">
+				<include>Animation_OpenCloseFade</include>
+				<include>Animation_FadedByMenu</include>
+				<include>Animation_HiddenByInfo</include>
+				<include condition="StringCompare(Skin.String(BannerViewHeight),2) | IsEmpty(Skin.String(BannerViewHeight))">Banner3x2_ImagePos</include>
+				<include condition="StringCompare(Skin.String(BannerViewHeight),3)">Banner3x3_ImagePos</include>
+				<include condition="StringCompare(Skin.String(BannerViewHeight),4)">Banner3x4_ImagePos</include>
 				<viewtype label="$LOCALIZE[31286]">wide</viewtype>
-				<posx>40</posx>
-				<posy>340</posy>
-				<height>180</height>
-				<width>1200</width>
 				<include condition="!Skin.HasSetting(ViewLockdown)">OnLeft7000</include>
 				<ondown>511</ondown>
 				<onup>511</onup>
 				<pagecontrol>-</pagecontrol>
 				<orientation>vertical</orientation>
 				<preloaditems>2</preloaditems>
 				<scrolltime>200</scrolltime>
-				<include>Animation_OpenCloseFade</include>
-				<include>Animation_FadedByMenu</include>
-				<include>Animation_HiddenByInfo</include>
 				<visible>!Skin.HasSetting(NoViewBanner)</visible>
 				<visible>Window.IsActive(videos) + Container.Content(tvshows)</visible>
 				<include>BannerViewCommon_Browser</include>
 			</control>
-			<!-- Title -->
-			<control type="label">
-				<posx>40</posx>
-				<posy>280</posy>
-				<width>1200</width>
-				<height>30</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>METF_TitleTextLarge</font>
-				<textcolor>TitleText</textcolor>
-				<label>$VAR[ListItemTitle]</label>
-				<include>Animation_OpenCloseFade</include>
-				<include>Animation_FadedByMenu</include>
-				<include>Animation_HiddenByInfo</include>
-				<visible>Window.IsActive(videos) + Container.Content(tvshows)</visible>
-			</control>
-			<!-- Details -->
-			<control type="grouplist">
-				<posx>40</posx>
-				<posy>310</posy>
-				<width>1200</width>
-				<height>30</height>
-				<align>center</align>
-				<itemgap>10</itemgap>
-				<orientation>horizontal</orientation>
-				<include>Animation_OpenCloseFade</include>
-				<include>Animation_FadedByMenu</include>
-				<include>Animation_HiddenByInfo</include>
-				<include>ViewDetailsGenreYearDurEpsUnwatched</include>
-				<visible>Window.IsActive(videos) + Container.Content(tvshows)</visible>
-			</control>
-			<!-- Arrows -->
 			<control type="group">
 				<include>Animation_OpenCloseFade</include>
 				<include>Animation_FadedByMenu</include>
 				<include>Animation_HiddenByInfo</include>
-				<visible>Window.IsActive(videos)</visible>
-				<control type="image">
-					<posx>10</posx>
-					<posy>313</posy>
-					<width>24</width>
-					<height>24</height>
-					<texture>Arrow2Up.png</texture>
-					<colordiffuse>ArrowDiffuse</colordiffuse>
-					<visible>Container.HasPrevious</visible>
+				<include condition="StringCompare(Skin.String(BannerViewHeight),2) | IsEmpty(Skin.String(BannerViewHeight))">Banner3x2_TitleYPos</include>
+				<include condition="StringCompare(Skin.String(BannerViewHeight),3)">Banner3x3_TitleYPos</include>
+				<include condition="StringCompare(Skin.String(BannerViewHeight),4)">Banner3x4_TitleYPos</include>
+				<!-- Title -->
+				<control type="label">
+					<posx>40</posx>
+					<width>1200</width>
+					<height>30</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>METF_TitleTextLarge</font>
+					<textcolor>TitleText</textcolor>
+					<label>$VAR[ListItemTitle]</label>
+					<visible>Window.IsActive(videos) + Container.Content(tvshows)</visible>
+				</control>
+				<!-- Details -->
+				<control type="grouplist">
+					<posx>40</posx>
+					<posy>30</posy>
+					<width>1200</width>
+					<height>30</height>
+					<align>center</align>
+					<itemgap>10</itemgap>
+					<orientation>horizontal</orientation>
+					<include>ViewDetailsGenreYearDurEpsUnwatched</include>
+					<visible>Window.IsActive(videos) + Container.Content(tvshows)</visible>
 				</control>
-				<control type="image">
-					<posx>1246</posx>
-					<posy>313</posy>
-					<width>24</width>
-					<height>24</height>
-					<texture>Arrow2Down.png</texture>
-					<colordiffuse>ArrowDiffuse</colordiffuse>
-					<visible>Container.HasNext</visible>
+				<!-- Arrows -->
+				<control type="group">
+					<visible>Window.IsActive(videos)</visible>
+					<control type="image">
+						<posx>10</posx>
+						<posy>33</posy>
+						<width>24</width>
+						<height>24</height>
+						<texture>Arrow2Up.png</texture>
+						<colordiffuse>ArrowDiffuse</colordiffuse>
+						<visible>Container.HasPrevious</visible>
+					</control>
+					<control type="image">
+						<posx>1246</posx>
+						<posy>33</posy>
+						<width>24</width>
+						<height>24</height>
+						<texture>Arrow2Down.png</texture>
+						<colordiffuse>ArrowDiffuse</colordiffuse>
+						<visible>Container.HasNext</visible>
+					</control>
 				</control>
 			</control>
 		</control>

diff --git a/language/English/strings.po b/language/English/strings.po
@@ -1060,7 +1060,11 @@ msgctxt "#31482"
 msgid "Install"
 msgstr ""
 
-#empty strings from id 31483 to 31599
+msgctxt "#31483"
+msgid "Banner View: Number of rows"
+msgstr ""
+
+#empty strings from id 31484 to 31599
 
 #PVR Resources