fixed various issues and requests

kodi-community-addons · Apr 8, 2015 · 7443dbd · 7443dbd
1 parent d5d6276
commit 7443dbd
Show file tree

Hide file tree

Showing 15 changed files with 282 additions and 212 deletions.
diff --git a/skin.titan.helix/1080i/DialogVideoInfo.xml b/skin.titan.helix/1080i/DialogVideoInfo.xml
@@ -120,7 +120,7 @@
 					<width>1800</width>
 					<height>450</height>
 					<itemgap>15</itemgap>
-					<onup>noop</onup>
+					<onup>50</onup>
 					<ondown>noop</ondown>
 					<orientation>horizontal</orientation>
 
@@ -707,7 +707,7 @@
 								<posy>0</posy>
 								<width>950</width>
 								<height>50</height>
-								<label>$INFO[ListItem.label]</label>
+								<label>$INFO[ListItem.label,[B],[/B]] $INFO[ListItem.label2,(,)]</label>
 								<font>Reg28</font>
 								<textcolor>$INFO[Skin.String(ViewDetailsTextColor)]</textcolor>
 								<shadowcolor>$INFO[Skin.String(ViewDetailsTextShadowColor)]</shadowcolor>
@@ -722,7 +722,7 @@
 								<posy>0</posy>
 								<width>950</width>
 								<height>50</height>
-								<label>$INFO[ListItem.label]</label>
+								<label>$INFO[ListItem.label,[B],[/B]] $INFO[ListItem.label2,(,)]</label>
 								<textcolor>$INFO[Skin.String(ViewDetailsFocusColor)]</textcolor>
 								<shadowcolor>$INFO[Skin.String(ViewDetailsFocusShadowColor)]</shadowcolor>
 								<font>Reg28</font>

diff --git a/skin.titan.helix/1080i/FileManager.xml b/skin.titan.helix/1080i/FileManager.xml
@@ -16,30 +16,10 @@
         <!--Header-->
         <include>Header</include>
 
-		<!-- footer -->
-		<control type="image">	
-			<posx>50</posx>
-			<posy>960</posy>
-			<width>1820</width>
-			<height>84</height>
-			<texture>home/home_rss.png</texture>
-			<visible>[!Skin.HasSetting(NoFooterBar) + skin.hastheme(classic)]</visible>	
-			<include>animation_fade_visible_hidden</include>				
-		</control>
-		<control type="image">
-			<posx>0</posx>
-			<posy>982</posy>
-			<width>1920</width>
-			<height>110</height>
-			<texture>colors/color_white.png</texture>
-			<colordiffuse>$VAR[panel_color]</colordiffuse>
-			<visible>!skin.hastheme(classic) + !skin.hassetting(nofooterbar)</visible>
-			<include>animation_fade_visible_hidden</include>
-			<animation effect="fade" end="80" time="0" reversible="false" condition="StringCompare(Skin.String(FooterOpacity),80)">Conditional</animation>
-			<animation effect="fade" end="60" time="0" reversible="false" condition="StringCompare(Skin.String(FooterOpacity),60)">Conditional</animation>
-			<animation effect="fade" end="40" time="0" reversible="false" condition="StringCompare(Skin.String(FooterOpacity),40)">Conditional</animation>
-			<animation effect="fade" end="20" time="0" reversible="false" condition="StringCompare(Skin.String(FooterOpacity),20)">Conditional</animation>
-			<animation effect="fade" end="0" time="0" reversible="false" condition="StringCompare(Skin.String(FooterOpacity),0)">Conditional</animation>
+		<!-- footer bar -->
+		<control type="group">
+			<visible>!Control.IsVisible(514)</visible>
+			<include condition="!skin.hassetting(nofooterbar)">Footer</include>
 		</control>
 
 		<control type="group">
@@ -50,7 +30,7 @@
 				<posx>60</posx>
 				<posy>240</posy>
 				<width>1800</width>
-				<height>660</height>
+				<height>700</height>
 				<texture>colors/color_white.png</texture>
 				<animation effect="fade" end="90" time="0" condition="true">Conditional</animation>
 				<colordiffuse>$VAR[panel_color]</colordiffuse>
@@ -105,13 +85,13 @@
 							<align>left</align>
 							<font>Reg30</font>
 							<info>ListItem.Label</info>
-							<textcolor>midgrey</textcolor>
+							<textcolor>white</textcolor>
 						</control>
 						<control type="label">
-							<posx>890</posx>
-							<width>200</width>
+							<posx>210</posx>
+							<width>670</width>
 							<align>right</align>
-							<font>Reg30</font>
+							<font>Reg24</font>
 							<info>ListItem.Label2</info>
 							<textcolor>midgrey</textcolor>
 						</control>
@@ -141,16 +121,15 @@
 							<font>Reg30</font>
 							<info>ListItem.Label</info>
 							<scrollspeed>30</scrollspeed>
-							<textcolor>mainblue</textcolor>
+							<textcolor>$INFO[Skin.String(ButtonFocusColor)]</textcolor>
 						</control>
 						<control type="label">
-							<posx>890</posx>
-							<width>200</width>
+							<posx>210</posx>
+							<width>670</width>
 							<align>right</align>
-							<font>Reg30</font>
+							<font>Reg24</font>
 							<info>ListItem.Label2</info>
-							<scrollspeed>30</scrollspeed>
-							<textcolor>mainblue</textcolor>
+							<textcolor>midgrey</textcolor>
 						</control>
 					</focusedlayout>
 				</control>
@@ -159,22 +138,12 @@
 					<label></label>
 					<!--Object Info RSS-->
 					<description>Header Label</description>
-					<posx>110</posx>
-					<posy>680</posy>
+					<posx>80</posx>
+					<posy>580</posy>
 					<width>480</width>
 					<align>left</align>
 					<font>Reg30</font>
-					<textcolor>white</textcolor>
-				</control>
-				<control type="label">
-					<!--Page Info RSS-->
-					<posx>870</posx>
-					<posy>680</posy>
-					<width>250</width>
-					<align>right</align>
-					<font>Reg30</font>
-					<textcolor>white</textcolor>
-					<label>$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages]</label>
+					<textcolor>lightgrey</textcolor>
 				</control>
 			</control>
 			<control type="group">
@@ -227,13 +196,13 @@
 							<align>left</align>
 							<font>Reg30</font>
 							<info>ListItem.Label</info>
-							<textcolor>midgrey</textcolor>
+							<textcolor>white</textcolor>
 						</control>
 						<control type="label">
-							<posx>890</posx>
-							<width>200</width>
+							<posx>210</posx>
+							<width>670</width>
 							<align>right</align>
-							<font>Reg30</font>
+							<font>Reg24</font>
 							<info>ListItem.Label2</info>
 							<textcolor>midgrey</textcolor>
 						</control>
@@ -263,39 +232,28 @@
 							<font>Reg30</font>
 							<info>ListItem.Label</info>
 							<scrollspeed>30</scrollspeed>
-							<textcolor>mainblue</textcolor>
+							<textcolor>$INFO[Skin.String(ButtonFocusColor)]</textcolor>
 						</control>
 						<control type="label">
-							<posx>890</posx>
-							<width>200</width>
+							<posx>210</posx>
+							<width>670</width>
 							<align>right</align>
-							<font>Reg30</font>
+							<font>Reg24</font>
 							<info>ListItem.Label2</info>
-							<scrollspeed>30</scrollspeed>
-							<textcolor>mainblue</textcolor>
+							<textcolor>midgrey</textcolor>
 						</control>
 					</focusedlayout>
 				</control>
 				<control type="label" id="13">
 					<!--Object Info RSS-->
 					<description>Header Label</description>
-					<posx>150</posx>
-					<posy>680</posy>
+					<right>90</right>
+					<posy>580</posy>
 					<width>480</width>
-					<align>left</align>
-					<label>-</label>
-					<font>Reg30</font>
-					<textcolor>white</textcolor>
-				</control>
-				<control type="label">
-					<!--Page Info RSS-->
-					<posx>870</posx>
-					<posy>680</posy>
-					<width>250</width>
 					<align>right</align>
+					<label>-</label>
 					<font>Reg30</font>
-					<textcolor>white</textcolor>
-					<label>$INFO[Container(21).CurrentPage]/$INFO[Container(21).NumPages]</label>
+					<textcolor>lightgrey</textcolor>
 				</control>
 			</control>
 		</control>

diff --git a/skin.titan.helix/1080i/Includes.xml b/skin.titan.helix/1080i/Includes.xml
@@ -121,7 +121,7 @@
 			<control type="group">						
 				<control type="image">	
 					<posx>50</posx>
-					<posy>965</posy>
+					<posy>960</posy>
 					<width>1820</width>
 					<height>84</height>
 					<texture>home/home_rss.png</texture>
@@ -324,7 +324,8 @@
 				<textcolor>$VAR[ThemeFontColorBlack]</textcolor>
 				<label>$INFO[ListItem.label]</label>
 				<animation effect="slide" end="0,16" time="0" condition="!skin.hastheme(classic)">Conditional</animation>
-				<visible>skin.hastheme(classic) | [!skin.hastheme(classic) + IsEmpty(ListItem.VideoResolution) + IsEmpty(Container.Listitem.Art(clearlogo)) + IsEmpty(Container.Listitem.Art(tvshow.clearlogo))]</visible>
+				<visible>!Control.IsVisible(884)</visible>
+				<visible>skin.hastheme(classic) | [!skin.hastheme(classic) + IsEmpty(ListItem.VideoResolution)]</visible>
 			</control>
 			<control type="label">
 				<!--songs-->
@@ -337,7 +338,7 @@
 				<textcolor>$VAR[ThemeFontColorBlack]</textcolor>
 				<label>$INFO[ListItem.Title]</label>
 				<animation effect="slide" end="0,16" time="0" condition="!skin.hastheme(classic)">Conditional</animation>
-				<visible>[IsEmpty(Container.Listitem.Art(clearlogo)) + !skin.hastheme(classic)] | skin.hastheme(classic)</visible>
+				<visible>!Control.IsVisible(884)</visible>
 			</control>
 			<control type="label">
 				<visible>Container.Content(songs)</visible>
@@ -432,19 +433,6 @@
 				<label>$INFO[ListItem.Title]</label>
 				<animation effect="slide" end="0,16" time="0" condition="!skin.hastheme(classic)">Conditional</animation>
 			</control>
-			<control type="image">
-				<!--logo-->
-				<posx>810</posx>
-				<posy>10</posy>
-				<width>350</width>
-				<height>80</height>
-				<align>center</align>
-				<valign>center</valign>
-				<fadetime>600</fadetime>
-				<aspectratio>keep</aspectratio>
-				<texture>$VAR[ListItemClearLogo]</texture>
-				<visible>!skin.hastheme(classic) + !Skin.HasSetting(ShowLogoAltLocation)</visible>
-			</control>
 
 		</control>
 
@@ -476,6 +464,7 @@
             <aligny>center</aligny>
             <colordiffuse>$INFO[Skin.String(HeaderTextShadowColor)]</colordiffuse>
             <texture>$VAR[value_header_icon]</texture>
+			<visible>!Control.IsVisible(882)</visible>
         </control>
 		<control type="image">
             <visible>skin.hastheme(classic) + !Window.IsActive(DialogKaiToast.xml) + !Window.IsActive(DialogExtendedProgressBar.xml) + !Control.IsVisible(88888) + ![ControlGroup(77777).HasFocus | StringCompare(Window(Home).Property(ShowWidget),show)] + ![Skin.HasSetting(AutoShowWidgets) + !IsEmpty(Window(Home).Property(activewidget))]</visible>
@@ -486,6 +475,7 @@
             <aligny>center</aligny>
             <colordiffuse>$INFO[Skin.String(HeaderTextColor)]</colordiffuse>
             <texture>$VAR[value_header_icon]</texture>
+			<visible>!Control.IsVisible(882)</visible>
         </control>
         <control type="label">
             <visible>!Window.IsActive(DialogKaiToast.xml) + !Window.IsActive(DialogExtendedProgressBar.xml) + !Control.IsVisible(88888) + ![ControlGroup(77777).HasFocus | StringCompare(Window(Home).Property(ShowWidget),show)] + ![Skin.HasSetting(AutoShowWidgets) + !IsEmpty(Window(Home).Property(activewidget))]</visible>
@@ -497,6 +487,7 @@
             <align>left</align>
             <textcolor>$INFO[Skin.String(HeaderTextColor)]</textcolor>
             <label>$VAR[value_header]</label>
+			<visible>!Control.IsVisible(882)</visible>
 			<shadowcolor>$INFO[Skin.String(HeaderTextShadowColor)]</shadowcolor>
 			<animation effect="slide" end="80,15" time="0" condition="skin.hastheme(classic)">Conditional</animation>
         </control>
@@ -511,25 +502,68 @@
 			<textcolor>$INFO[Skin.String(HeaderTextColor)]</textcolor>
 			<shadowcolor>$INFO[Skin.String(HeaderTextShadowColor)]</shadowcolor>
 			<visible>!Skin.HasSetting(EnableTouchSupport)</visible>
+			<visible>!Control.IsVisible(882)</visible>
 		</control>
     </include>
 
-	<include name="TimeInfo">
-		<!--clearlogo alt location-->
-		<control type="image">
+	<include name="ClearLogo">
+		<!--clearlogo top right-->
+		<control type="image" id="881">
 			<right>60</right>
 			<top>20</top>
-			<width>650</width>
-			<height>140</height>
+			<width>550</width>
+			<height>110</height>
 			<fadetime>600</fadetime>
 			<aspectratio align="right" aligny="center">keep</aspectratio>
 			<texture>$VAR[ListItemClearLogo]</texture>
-			<visible>Skin.HasSetting(ShowLogoAltLocation) + [!IsEmpty(Container.ListItem.Art(tvshow.clearlogo)) | !IsEmpty(Container.ListItem.Art(clearlogo))]</visible>
-			<visible>![Window.IsActive(DialogKaiToast.xml) + IsEmpty(Window(Home).Property(activewidget))] + ![Window.IsActive(DialogExtendedProgressBar.xml) + IsEmpty(Window(Home).Property(activewidget))] + !Control.IsVisible(88888) + ![ControlGroup(77777).HasFocus | StringCompare(Window(Home).Property(ShowWidget),show)] + ![Skin.HasSetting(AutoShowWidgets) + !IsEmpty(Window(Home).Property(activewidget))]</visible>
+			<visible>!IsEmpty(Control.GetLabel(881)) + Skin.String(ClearLogoLocation, topright)</visible>
 		</control>
+
+		<!--clearlogo top left-->
+		<control type="image" id="882">
+			<left>60</left>
+			<top>20</top>
+			<width>550</width>
+			<height>110</height>
+			<fadetime>600</fadetime>
+			<aspectratio align="left" aligny="center">keep</aspectratio>
+			<texture>$VAR[ListItemClearLogo]</texture>
+			<visible>!IsEmpty(Control.GetLabel(882)) + Skin.String(ClearLogoLocation, topleft)</visible>
+		</control>
+
+		<!--clearlogo top center-->
+		<control type="image" id="883">
+			<left>760</left>
+			<top>20</top>
+			<width>400</width>
+			<height>110</height>
+			<fadetime>600</fadetime>
+			<aspectratio align="center" aligny="center">keep</aspectratio>
+			<texture>$VAR[ListItemClearLogo]</texture>
+			<visible>!IsEmpty(Control.GetLabel(883)) + Skin.String(ClearLogoLocation, topcenter) + !Skin.HasSetting(ShowMovieTitleHeader)</visible>
+		</control>
+
+		<!--clearlogo footer-->
+		<control type="image" id="884">
+			<left>760</left>
+			<bottom>10</bottom>
+			<width>400</width>
+			<height>80</height>
+			<align>center</align>
+			<valign>center</valign>
+			<fadetime>600</fadetime>
+			<aspectratio>keep</aspectratio>
+			<texture>$VAR[ListItemClearLogo]</texture>
+			<visible>!IsEmpty(Control.GetLabel(884)) + Skin.String(ClearLogoLocation, footer) + !skin.hastheme(classic)</visible>
+		</control>
+
+	</include>
+
+	<include name="TimeInfo">
+
         <control type="group">
             <visible>![ControlGroup(77777).HasFocus | StringCompare(Window(Home).Property(ShowWidget),show)]</visible>
-			<visible>[[Skin.HasSetting(ShowLogoAltLocation) + IsEmpty(Container.ListItem.Art(tvshow.clearlogo)) + IsEmpty(Container.ListItem.Art(clearlogo))] | !Skin.HasSetting(ShowLogoAltLocation)]</visible>
+			<visible>!Control.IsVisible(881)</visible>
 			<visible>!Control.IsVisible(77551)</visible>
 			<animation type="Conditional" condition="Window.IsActive(DialogMuteBug.xml)">
                 <effect type="slide" start="0,0" end="-100,0" time="400" tween="cubic" easing="inout" delay="0" />
@@ -649,11 +683,12 @@
 	</include>
 
 	<include name="ProfileInfo">
-	<control type="group" id="891">
+		<control type="group" id="891">
 			<animation effect="slide" end="440" time="0" condition="Skin.String(GadgetRows, simplever)">Conditional</animation>
 			<defaultcontrol>890</defaultcontrol>
 			<posx>60</posx>
 			<posy>30</posy>
+			<visible>!Control.IsVisible(882)</visible>
 			<visible>!Control.IsVisible(77551)</visible>
 			<visible>!Window.IsActive(DialogKaiToast.xml) + !Window.IsActive(DialogExtendedProgressBar.xml) + Skin.HasSetting(ShowProfile) + ![ControlGroup(77777).HasFocus | StringCompare(Window(Home).Property(ShowWidget),show)] + !Control.IsVisible(88888)</visible>
             <width>150</width>
@@ -723,6 +758,7 @@
             <posy>15</posy>
             <width>350</width>
             <height>300</height>
+			<visible>!Control.IsVisible(882)</visible>
 			<visible>!Control.IsVisible(77551)</visible>
             <visible>Weather.IsFetched</visible>
 			<include>animation_fade_visible_hidden</include>
@@ -817,7 +853,8 @@
     <include name="SubMenuTabTop">
         <!--Sub Menu Tab Top-->
         <control type="group">
-		<visible>!Skin.HasSetting(KioskMode.Enabled)</visible>
+			<visible>!Skin.HasSetting(KioskMode.Enabled)</visible>
+			<visible>!Control.IsVisible(883)</visible>
             <visible>Control.IsVisible(500) | Control.IsVisible(52) | Control.IsVisible(501) | Control.IsVisible(502) | Control.IsVisible(506) | Control.IsVisible(58) | Control.IsVisible(507) | Control.IsVisible(508) | Control.IsVisible(513) | Control.IsVisible(514)</visible>
 			<control type="button" id="99002">
 				<posx>890</posx>