[Estouchy] Game support

mhueske · Dec 7, 2016 · bd78410 · bd78410
1 parent 5e57a75
commit bd78410
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 22 deletions.
diff --git a/addons/skin.estouchy/addon.xml b/addons/skin.estouchy/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estouchy" version="1.1.0" name="Estouchy" provider-name="Team Kodi">
+<addon id="skin.estouchy" version="2.0.0" name="Estouchy" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.12.0"/>
 	</requires>

diff --git a/addons/skin.estouchy/changelog.txt b/addons/skin.estouchy/changelog.txt
@@ -1,3 +1,6 @@
+V2.0.0
+- Kodi v18 LittlePony
+
 V1.1.0
 - Redesign
 

diff --git a/addons/skin.estouchy/media/icon_menu_games.png b/addons/skin.estouchy/media/icon_menu_games.png
diff --git a/addons/skin.estouchy/media/icon_settings_games.png b/addons/skin.estouchy/media/icon_settings_games.png
diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml
@@ -759,6 +759,12 @@
 						<icon>icon_menu_addons.png</icon>
 						<visible>!Skin.HasSetting(HideHomeButtonPrograms)</visible>
 					</item>
+					<item>
+						<label></label>
+						<onclick>ActivateWindow(Games)</onclick>
+						<icon>icon_menu_games.png</icon>
+						<visible>!Skin.HasSetting(HideHomeButtonGames)</visible>
+					</item>
 				</content>
 			</control>
 		</control>
@@ -910,6 +916,13 @@
 			<thumb></thumb>
 			<visible>!Skin.HasSetting(HideHomeButtonPrograms)</visible>
 		</item>
+		<item>
+			<label>15016</label>
+			<onclick>ActivateWindow(Games)</onclick>
+			<icon>icon_menu_games.png</icon>
+			<thumb></thumb>
+			<visible>System.GetBool(gamesgeneral.enable) + !Skin.HasSetting(HideHomeButtonGames)</visible>
+		</item>
 		<item>
 			<label>8</label>
 			<onclick>ActivateWindow(Weather)</onclick>
@@ -972,22 +985,24 @@
 					<itemgap>0</itemgap>
 					<include condition="Window.IsVisible(AddonBrowser)">AddonsMenu</include>
 					<include condition="Window.IsVisible(EventLog)">EventLogMenu</include>
+					<include condition="Window.IsVisible(Games)">GamesMenu</include>
 					<include condition="Window.IsVisible(Music)">MusicMenu</include>
 					<include condition="Window.IsVisible(MusicOSD)">MusicOSDMenu</include>
 					<include condition="Window.IsVisible(MusicPlaylist)">MusicPlaylistMenu</include>
 					<include condition="Window.IsVisible(MusicPlaylistEditor)">MusicPlaylistEditorMenu</include>
 					<include condition="Window.IsVisible(Pictures)">PicturesMenu</include>
 					<include condition="Window.IsVisible(Programs)">ProgramsMenu</include>
 					<include condition="Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch)">PVRMenu</include>
-					<include condition="Window.IsVisible(PlayerSettings) | Window.IsVisible(MediaSettings) | Window.IsVisible(PVRSettings) | Window.IsVisible(ServiceSettings) | Window.IsVisible(InterfaceSettings) | Window.IsVisible(SystemSettings)">SettingsMenu</include>
+					<include condition="Window.IsVisible(Settings)">SettingsMenu</include>
+					<include condition="Window.IsVisible(PlayerSettings) | Window.IsVisible(MediaSettings) | Window.IsVisible(PVRSettings) | Window.IsVisible(ServiceSettings) | Window.IsVisible(InterfaceSettings) | Window.IsVisible(GameSettings) | Window.IsVisible(SystemSettings)">SettingsCatMenu</include>
 					<include condition="Window.IsVisible(Videos)">VideosMenu</include>
 					<include condition="Window.IsVisible(VideoOSD)">VideoOSDMenu</include>
 					<include condition="Window.IsVisible(VideoPlaylist)">VideoPlaylistMenu</include>
 				</control>
 				<control type="image">
 					<description>Panel Arrow image</description>
 					<posx>110r</posx>
-					<posy>125r</posy>
+					<posy>122r</posy>
 					<width>75</width>
 					<height>41</height>
 					<texture>arrow_up.png</texture>
@@ -1060,6 +1075,22 @@
 			<label>192</label>
 		</control>
 	</include>
+	<include name="GamesMenu">
+		<control type="button" id="3">
+			<description>Sort by button</description>
+			<include>MenuButtonCommonValues</include>
+			<label>103</label>
+		</control>
+		<control type="togglebutton" id="4">
+			<description>Sort asc</description>
+			<include>MenuButtonCommonValues</include>
+			<alttexturefocus>list_focus.png</alttexturefocus>
+			<alttexturenofocus></alttexturenofocus>
+			<label>31051</label>
+			<altlabel>31050</altlabel>
+			<usealttexture>Container.SortDirection(Ascending)</usealttexture>
+		</control>
+	</include>
 	<include name="MusicMenu">
 		<control type="button" id="3">
 			<description>Sort by button</description>
@@ -1508,6 +1539,14 @@
 		</control>
 	</include>
 	<include name="SettingsMenu">
+		<control type="button" id="20">
+			<description>Sysinfo button</description>
+			<include>MenuButtonCommonValues</include>
+			<label>130</label>
+			<onclick>ActivateWindow(SystemInfo)</onclick>
+		</control>
+	</include>
+	<include name="SettingsCatMenu">
 		<control type="button" id="20">
 			<description>Settings level button</description>
 			<include>MenuButtonCommonValues</include>
@@ -1656,23 +1695,23 @@
 					<icon>icon_settings_system.png</icon>
 				</item>
 				<item id="7">
+					<label>15016</label>
+					<label2>35100</label2>
+					<onclick>ActivateWindow(GameSettings)</onclick>
+					<icon>icon_settings_games.png</icon>
+				</item>
+				<item id="8">
 					<label>24001</label>
 					<label2>31407</label2>
 					<onclick>ActivateWindow(AddonBrowser)</onclick>
 					<icon>icon_settings_addons.png</icon>
 				</item>
-				<item id="8">
+				<item id="9">
 					<label>13200</label>
 					<label2>31411</label2>
 					<onclick>ActivateWindow(Profiles)</onclick>
 					<icon>icon_settings_profiles.png</icon>
 				</item>
-				<item id="9">
-					<label>130</label>
-					<label2>31412</label2>
-					<onclick>ActivateWindow(SystemInfo)</onclick>
-					<icon>icon_settings_systeminfo.png</icon>
-				</item>
 			</content>
 		</control>
 	</include>
@@ -1822,6 +1861,22 @@
 				<textoffsetx>20</textoffsetx>
 			</control>
 			<control type="radiobutton" id="110">
+				<description>Hide Games</description>
+				<width>$PARAM[panel-width]</width>
+				<height>80</height>
+				<aligny>center</aligny>
+				<font>font24_title</font>
+				<textcolor>white</textcolor>
+				<texturefocus>list_focus.png</texturefocus>
+				<texturenofocus></texturenofocus>
+				<pulseonselect>false</pulseonselect>
+				<label>$LOCALIZE[15016]</label>
+				<onclick>Skin.ToggleSetting(HideHomeButtonGames)</onclick>
+				<selected>!Skin.HasSetting(HideHomeButtonGames)</selected>
+				<enable>System.GetBool(gamesgeneral.enable)</enable>
+				<textoffsetx>20</textoffsetx>
+			</control>
+			<control type="radiobutton" id="111">
 				<description>Hide Weather</description>
 				<width>$PARAM[panel-width]</width>
 				<height>80</height>
@@ -1836,7 +1891,7 @@
 				<selected>!Skin.HasSetting(HideHomeButtonWeather)</selected>
 				<textoffsetx>20</textoffsetx>
 			</control>
-			<control type="radiobutton" id="111">
+			<control type="radiobutton" id="112">
 				<description>Hide Favourites</description>
 				<width>$PARAM[panel-width]</width>
 				<height>80</height>

diff --git a/addons/skin.estouchy/xml/MyGames.xml b/addons/skin.estouchy/xml/MyGames.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<defaultcontrol always="true">50</defaultcontrol>
+	<views>50,500,550</views>
+	<onunload>ClearProperty(PopupMenuVisible,Home)</onunload>
+	<controls>
+		<include>CommonBackground</include>
+		<include>SideMenu</include>
+		<include>Header</include>
+		<include>CommonNowPlaying</include>
+		<include>Footer</include>
+		<control type="label">
+			<description>Window label</description>
+			<include>MediaWindowTitleCommons</include>
+			<label>$LOCALIZE[15016]$INFO[Container.FolderName, - ]</label>
+		</control>
+		<control type="group">
+			<include>Window_OpenClose_Animation_Zoom</include>
+			<include content="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 -->
+				<param name="panel-width" value="1530"/>
+				<param name="layout-width" value="306"/>
+			</include>
+			<include content="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 -->
+				<param name="panel-width" value="1090"/>
+				<param name="layout-width" value="363"/>
+			</include>
+			<include content="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 500 -->
+				<param name="panel-width" value="1530"/>
+				<param name="label-width" value="1230"/>
+				<param name="label2-posx" value="1360r"/>
+			</include>
+			<include content="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 500 -->
+				<param name="panel-width" value="1090"/>
+				<param name="label-width" value="790"/>
+				<param name="label2-posx" value="920r"/>
+			</include>
+			<include content="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 550 -->
+				<param name="panel-width" value="1530"/>
+				<param name="textbox-width-movies" value="1350"/>
+				<param name="textbox-width-episodes" value="1250"/>
+			</include>
+			<include content="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 550 -->
+				<param name="panel-width" value="1090"/>
+				<param name="textbox-width-movies" value="910"/>
+				<param name="textbox-width-episodes" value="810"/>
+			</include>
+		</control>
+		<include>ScrollBarCommons</include>
+		<include>BottomMenu</include>
+		<include content="PopupMenu">
+			<param name="panel-posy">400</param>
+			<param name="panel-height">160</param>
+		</include>
+		<include>ScrollOffsetLabel</include>
+	</controls>
+</window>
diff --git a/addons/skin.estouchy/xml/Settings.xml b/addons/skin.estouchy/xml/Settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<onunload>ClearProperty(PopupMenuVisible,Home)</onunload>
 	<controls>
 		<include>CommonBackground</include>
 		<include content="SettingsPanel" condition="String.IsEqual(Skin.AspectRatio,16:9)">
@@ -47,7 +48,17 @@
 					<onclick>ActivateWindow(Favourites)</onclick>
 					<icon>icon_button_favourites.png</icon>
 				</item>
+				<item>
+					<label>5</label>
+					<onclick condition="String.IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick>
+					<onclick condition="!String.IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick>
+					<icon>icon_button_settings.png</icon>
+				</item>
 			</content>
 		</control>
+		<include content="PopupMenu">
+			<param name="panel-posy">480</param>
+			<param name="panel-height">80</param>
+		</include>
 	</controls>
 </window>
diff --git a/addons/skin.estouchy/xml/ViewsList.xml b/addons/skin.estouchy/xml/ViewsList.xml
@@ -51,7 +51,7 @@
 					<height>62</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
+					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Games) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="label">
 					<posx>75</posx>
@@ -193,7 +193,7 @@
 					<height>62</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
+					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Games) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="label">
 					<posx>75</posx>

diff --git a/addons/skin.estouchy/xml/ViewsThumbnail.xml b/addons/skin.estouchy/xml/ViewsThumbnail.xml
@@ -34,7 +34,7 @@
 					<height>200</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>scale</aspectratio>
-					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Games) | Container.Content(Images) | Container.Content(Actors) | Container.Content(Sets)</visible>
 				</control>
 				<control type="image">
 					<posx>67</posx>
@@ -43,7 +43,7 @@
 					<height>86</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | Container.Content(Playlists) | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content() | Container.Content(Files) | Container.Content(Games) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | Container.Content(Playlists)</visible>
 				</control>
 				<control type="image">
 					<posx>10</posx>
@@ -90,7 +90,7 @@
 					<height>200</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>scale</aspectratio>
-					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Games) | Container.Content(Images) | Container.Content(Actors) | Container.Content(Sets)</visible>
 				</control>
 				<control type="image">
 					<posx>67</posx>
@@ -99,7 +99,7 @@
 					<height>86</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | Container.Content(Playlists) | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content() | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | Container.Content(Playlists)</visible>
 				</control>
 				<control type="image">
 					<posx>10</posx>

diff --git a/addons/skin.estouchy/xml/ViewsWide.xml b/addons/skin.estouchy/xml/ViewsWide.xml
@@ -22,7 +22,7 @@
 			<visible>String.IsEqual(Skin.AspectRatio,4:3) + Control.IsVisible(550)</visible>
 		</control>
 		<control type="panel" id="550">
-			<visible>Container.Content(Movies) | Container.Content(TVShows) | Container.Content(Seasons) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons)</visible>
+			<visible>Container.Content(Movies) | Container.Content(TVShows) | Container.Content(Seasons) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Games)</visible>
 			<posx>120</posx>
 			<posy>120</posy>
 			<width>$PARAM[panel-width]</width>
@@ -89,7 +89,7 @@
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture>
 					<animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation>
-					<visible>!String.IsEqual(ListItem.Label,..)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..) + ![Container.Content(Files) | Container.Content(Games)]</visible>
 				</control>
 				<control type="image">
 					<posx>100r</posx>
@@ -195,7 +195,7 @@
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture>
 					<animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation>
-					<visible>!String.IsEqual(ListItem.Label,..)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..) + ![Container.Content(Files) | Container.Content(Games)]</visible>
 				</control>
 				<control type="image">
 					<posx>100r</posx>
@@ -745,7 +745,7 @@
 					<selectedcolor>selected</selectedcolor>
 					<align>right</align>
 					<aligny>center</aligny>
-					<label>$INFO[ListItem.AddonVersion]$INFO[ListItem.AddonStatus, - ]</label>
+					<label>$INFO[ListItem.AddonVersion]$INFO[ListItem.Property(Addon.Status), - ]</label>
 				</control>
 				<control type="image">
 					<posx>40r</posx>
@@ -811,7 +811,7 @@
 					<selectedcolor>selected</selectedcolor>
 					<align>right</align>
 					<aligny>center</aligny>
-					<label>$INFO[ListItem.AddonVersion]$INFO[ListItem.AddonStatus, - ]</label>
+					<label>$INFO[ListItem.AddonVersion]$INFO[ListItem.Property(Addon.Status), - ]</label>
 				</control>
 				<control type="image">
 					<posx>40r</posx>