Skip to content

Commit

Permalink
skin sync
Browse files Browse the repository at this point in the history
  • Loading branch information
@gade01
gade01 committed Aug 17, 2020
1 parent cd363c8 commit 0b16e4a
Show file tree
Hide file tree
Showing 23 changed files with 14,183 additions and 551 deletions.
8 changes: 5 additions & 3 deletions 720p/PlayerControls.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,10 @@
<control type="image">
<description>Star Rating</description>
<left>650</left>
<top>40</top>
<top>39</top>
<width>70</width>
<height>16</height>
<aligny>center</aligny>
<texture background="true">$VAR[PlayerStarRating]</texture>
<aspectratio align="right">keep</aspectratio>
<include>StarRatingFadeAnim</include>
Expand Down Expand Up @@ -509,8 +510,8 @@

<control type="label">
<description>Title</description>
<left>232</left>
<top>39</top>
<left>232</left>
<width>400</width>
<height>16</height>
<font>DialogTitleFont</font>
Expand All @@ -523,9 +524,10 @@
<control type="image">
<description>Star Rating</description>
<left>650</left>
<top>40</top>
<top>39</top>
<width>70</width>
<height>16</height>
<aligny>center</aligny>
<texture background="true">$VAR[PlayerStarRating]</texture>
<aspectratio align="right">keep</aspectratio>
<include>StarRatingFadeAnim</include>
Expand Down
20 changes: 1 addition & 19 deletions 720p/VideoFullScreen.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,32 +190,14 @@
<aligny>center</aligny>
</control>
<control type="label" id="1">
<width min="10" max="320">auto</width>
<width min="10" max="600">auto</width>
<height>40</height>
<font>MediaInfoFont</font>
<textcolor>MediaInfoItemColor2</textcolor>
<shadowcolor>ShadowColor</shadowcolor>
<label fallback="31001">$INFO[VideoPlayer.Director]</label>
<aligny>center</aligny>
</control>
<control type="label" id="1">
<width min="10" max="110">auto</width>
<height>40</height>
<font>MediaInfoFont</font>
<textcolor>MediaInfoItemColor</textcolor>
<shadowcolor>ShadowColor</shadowcolor>
<label> $LOCALIZE[20417]:</label>
<aligny>center</aligny>
</control>
<control type="label" id="1">
<width min="10" max="320">auto</width>
<height>40</height>
<font>MediaInfoFont</font>
<textcolor>MediaInfoItemColor2</textcolor>
<shadowcolor>ShadowColor</shadowcolor>
<label fallback="31001">$INFO[VideoPlayer.Writer]</label>
<aligny>center</aligny>
</control>
</control>

<control type="textbox" id="1">
Expand Down
2 changes: 1 addition & 1 deletion 720p/custom_1110_LibraryOptions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<width>212</width>
<itemgap>0</itemgap>
<orientation>vertical</orientation>
<visible>String.Contains(Container.FolderPath,videodb://tvshows/) | String.Contains(Container.FolderPath,videodb://recentlyaddedepisodes/)</visible>
<visible>String.Contains(Container.FolderPath,videodb://tvshows/) | String.Contains(Container.FolderPath,videodb://inprogresstvshows/) | String.Contains(Container.FolderPath,videodb://recentlyaddedepisodes/)</visible>
<onup>200</onup>
<ondown>200</ondown>
<onleft>Dialog.Close(1110)</onleft>
Expand Down
9 changes: 5 additions & 4 deletions 720p/includes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</variable>

<variable name="FormattedDurationVar">
<value condition="Integer.IsEqual(ListItem.Duration(mins),0)">$NUMBER[1]</value>
<value condition="!String.IsEmpty(ListItem.Duration) + Integer.IsEqual(ListItem.Duration(mins),0)">$NUMBER[1]</value>
<value condition="Integer.IsEqual(ListItem.Duration(mins),60)">$NUMBER[1]$LOCALIZE[31403]$NUMBER[00]</value>
<value condition="Integer.IsEqual(ListItem.Duration(h),0)">$INFO[ListItem.Duration(mins)]</value>
<value>$INFO[ListItem.Duration(h)]$LOCALIZE[31403]$INFO[ListItem.Duration(mm)]</value>
Expand Down Expand Up @@ -199,8 +199,8 @@
</variable>

<variable name="SkinSettingsAddonsDescription">
<value condition="Control.HasFocus(7002)">&#x5b;$LOCALIZE[31462]&#x5d; $LOCALIZE[31439]</value>
<value condition="Control.HasFocus(7003)">&#x5b;$LOCALIZE[31462]&#x5d; $LOCALIZE[31440]</value>
<value condition="Control.HasFocus(7002)">$LOCALIZE[31439]</value>
<value condition="Control.HasFocus(7003)">$LOCALIZE[31440]</value>
<value condition="Control.HasFocus(7004)">&#x5b;$LOCALIZE[31462]&#x5d;</value>
<value condition="Control.HasFocus(7005)">&#x5b;$LOCALIZE[31462]&#x5d; $LOCALIZE[31441]</value>
<value condition="Control.HasFocus(7006)">&#x5b;$LOCALIZE[31462]&#x5d; $LOCALIZE[31442]</value>
Expand All @@ -217,7 +217,7 @@
<value condition="Control.HasFocus(7015)">$LOCALIZE[31452]</value>
<value condition="Control.HasFocus(7016)">$LOCALIZE[31453]</value>
<value condition="Control.HasFocus(7023)">$LOCALIZE[31454]</value>
<value condition="Control.HasFocus(7024)">&#x5b;$LOCALIZE[31462]&#x5d; $LOCALIZE[31468]</value>
<value condition="Control.HasFocus(7024)">$LOCALIZE[31468]</value>
<value condition="Control.HasFocus(7025)">$LOCALIZE[31455]</value>
<value condition="Control.HasFocus(7019)">$LOCALIZE[31458]</value>
<value condition="Control.HasFocus(7020)">$LOCALIZE[31461]</value>
Expand Down Expand Up @@ -2258,6 +2258,7 @@
<value condition="VideoPlayer.Content(Movies) + [[Skin.HasSetting(ShowClearLogoOSD) + !String.IsEmpty(Player.Art(clearlogo))] | [Skin.HasSetting(ShowClearArtOSD) + String.IsEmpty(Player.Art(clearart)) + !String.IsEmpty(Player.Art(clearlogo))]]">$INFO[Player.Art(clearlogo)]</value>
<value condition="VideoPlayer.Content(Episodes) + [Skin.HasSetting(ShowClearArtOSD) + !String.IsEmpty(Player.Art(tvshow.clearart))]">$INFO[Player.Art(tvshow.clearart)]</value>
<value condition="VideoPlayer.Content(Episodes) + [[Skin.HasSetting(ShowClearLogoOSD) + !String.IsEmpty(Player.Art(tvshow.clearlogo))] | [Skin.HasSetting(ShowClearArtOSD) + String.IsEmpty(Player.Art(tvshow.clearart)) + !String.IsEmpty(Player.Art(tvshow.clearlogo))]]">$INFO[Player.Art(tvshow.clearlogo)]</value>
<value condition="Window.IsActive(PlayerControls) + VideoPlayer.Content(Movies)">$INFO[Player.Art(poster)]</value>
<value condition="VideoPlayer.Content(Movies)">$INFO[Player.Art(fanart)]</value>
<value>$INFO[VideoPlayer.Cover]</value>
</variable>
Expand Down
4 changes: 2 additions & 2 deletions 720p/includes_Backgrounds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
<include name="BackgroundMovies">
<control type="group">
<include condition="![Skin.HasSetting(DisableMusicPlayingBG) | Skin.HasSetting(DisableVideoPlayingBG)]">IsMediaPlayingCondition</include>
<visible>Container.Content(Movies) | Container.Content(Sets)</visible>
<visible>String.Contains(Container.FolderPath,/movies/)</visible>

<control type="multiimage">
<description>Custom Background</description>
Expand All @@ -407,7 +407,7 @@
<include name="BackgroundTVShows">
<control type="group">
<include condition="![Skin.HasSetting(DisableMusicPlayingBG) | Skin.HasSetting(DisableVideoPlayingBG)]">IsMediaPlayingCondition</include>
<visible>Container.Content(TVShows) | Container.Content(Episodes)</visible>
<visible>String.Contains(Container.FolderPath,/tvshows/) | Container.Content(Episodes)</visible>

<control type="multiimage">
<description>Custom Background</description>
Expand Down
37 changes: 24 additions & 13 deletions 720p/includes_Home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@

<variable name="TVCategoryAction">
<value condition="!String.IsEmpty(Skin.String(PVRCategoryAction))">$INFO[Skin.String(PVRCategoryAction)]</value>
<value>ActivateWindow(TVChannels,Return)</value>
<value>ActivateWindow(TVChannels)</value>
</variable>

<include name="HomeTVCategory">
Expand All @@ -560,7 +560,7 @@

<variable name="RadioCategoryAction">
<value condition="!String.IsEmpty(Skin.String(PVRRadioCategoryAction))">$INFO[Skin.String(PVRRadioCategoryAction)]</value>
<value>ActivateWindow(RadioChannels,Return)</value>
<value>ActivateWindow(RadioChannels)</value>
</variable>

<include name="HomeRadioCategory">
Expand Down Expand Up @@ -2405,9 +2405,9 @@
<visible>Skin.HasSetting(EditMoviesSubMenuBtn4) + !String.IsEmpty(Skin.String(MoviesSubMenuBtn4Label))</visible>
</item>
<item id="5">
<description>Studios</description>
<label>$LOCALIZE[20388]</label>
<onclick>ActivateWindow(Videos,videodb://movies/studios/,Return)</onclick>
<description>Movie Sets</description>
<label>$LOCALIZE[20434]</label>
<onclick>ActivateWindow(Videos,videodb://movies/sets/,Return)</onclick>
<visible>!Skin.HasSetting(EditMoviesSubMenuBtn5)</visible>
</item>
<item id="5">
Expand Down Expand Up @@ -3733,7 +3733,7 @@
<top>15</top>
<width>98</width>
<height>134</height>
<texture diffuse="covers/home-panel-movie-cover-diffuse.png" background="true">$INFO[VideoPlayer.cover]</texture>
<texture diffuse="covers/home-panel-movie-cover-diffuse.png" background="true">$VAR[PosterImageOSD]</texture>
<aspectratio scalediffuse="false">scale</aspectratio>
</control>

Expand Down Expand Up @@ -3801,16 +3801,17 @@

<control type="group">
<visible>VideoPlayer.Content(LiveTV)</visible>

<control type="image">
<description>Cover</description>
<left>15</left>
<top>27</top>
<top>15</top>
<width>176</width>
<height>110</height>
<height>134</height>
<texture diffuse="covers/home-panel-episode-cover-diffuse.png" background="true" fallback="DefaultVideo.png">$INFO[VideoPlayer.Cover]</texture>
<bordersize>4</bordersize>
<aspectratio>keep</aspectratio>
</control>

<control type="label">
<description>Title</description>
<left>203</left>
Expand All @@ -3821,6 +3822,7 @@
<shadowcolor>ShadowColor</shadowcolor>
<label>[UPPERCASE]$LOCALIZE[13350][/UPPERCASE]</label>
</control>

<control type="grouplist">
<left>203</left>
<top>47</top>
Expand Down Expand Up @@ -3849,7 +3851,7 @@
<visible>!Player.Seeking</visible>
</control>
<control type="label">
<description>Show/Year</description>
<description>Channel Name</description>
<top>9</top>
<width>272</width>
<height>12</height>
Expand All @@ -3859,6 +3861,16 @@
<label>$INFO[VideoPlayer.ChannelName]</label>
<scroll>true</scroll>
</control>
<control type="label">
<description>Next Title</description>
<width>272</width>
<height>12</height>
<font>PanelInfoFont</font>
<textcolor>MediaInfoItemColor2</textcolor>
<shadowcolor>ShadowColor</shadowcolor>
<label>$INFO[VideoPlayer.NextTitle,$LOCALIZE[209]: ,]</label>
<scroll>true</scroll>
</control>
</control>
</control>

Expand All @@ -3868,11 +3880,10 @@
<control type="image">
<description>Cover</description>
<left>15</left>
<top>27</top>
<top>15</top>
<width>176</width>
<height>110</height>
<height>134</height>
<texture diffuse="covers/home-panel-episode-cover-diffuse.png" background="true">$INFO[VideoPlayer.cover]</texture>
<bordersize>4</bordersize>
<aspectratio>keep</aspectratio>
</control>

Expand Down
6 changes: 2 additions & 4 deletions 720p/includes_SkinSettingsHome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<description>Favourite Type</description>
<include>ExpandedSettingsGroupRadioBtn</include>
<label>$LOCALIZE[31603]</label>
<include>SubMenuBtn1FavouriteSelected</include>
<include>SubMenuBtn$PARAM[number]FavouriteSelected</include>
<onclick>$VAR[SubMenuBtn$PARAM[number]TypeClick]</onclick>
<onclick>$VAR[SubMenuBtn$PARAM[number]TypeClick2]</onclick>
<onclick>$VAR[SubMenuBtn$PARAM[number]TypeClick5]</onclick>
Expand Down Expand Up @@ -643,8 +643,6 @@
<label>$LOCALIZE[31072]</label>
<selected>Skin.HasSetting(HideRecentlyAddedHomePanel)</selected>
<onclick>Skin.ToggleSetting(HideRecentlyAddedHomePanel)</onclick>
<onclick>ReloadSkin()</onclick>
<include>ReloadSkinNotification</include>
</control>
<control type="radiobutton" id="2340">
<description>Hide in Progress Info Panel</description>
Expand Down Expand Up @@ -5070,7 +5068,7 @@
<value condition="Skin.HasSetting(ExpandAddMoreCategorySettings4) + Skin.String(AddMoreCategoryBtn16BackgroundImageType,fanart) + String.IsEqual(Skin.String(AddMoreCategoryBtn16BackgroundImagePathLabel),$LOCALIZE[3] ($LOCALIZE[31311]))">$INFO[Window(Home).Property(SkinHelper.InProgressVideosBackground)]</value>
<value condition="Skin.HasSetting(ExpandAddMoreCategorySettings4) + Skin.String(AddMoreCategoryBtn16BackgroundImageType,fanart) + String.IsEqual(Skin.String(AddMoreCategoryBtn16BackgroundImagePathLabel),$LOCALIZE[2] ($LOCALIZE[590]))">$INFO[Window(Home).Property(SkinHelper.AllMusicBackground)]</value>
<value condition="Skin.HasSetting(ExpandAddMoreCategorySettings4) + Skin.String(AddMoreCategoryBtn16BackgroundImageType,fanart) + String.IsEqual(Skin.String(AddMoreCategoryBtn16BackgroundImagePathLabel),$LOCALIZE[2] ($LOCALIZE[31924]))">$INFO[Window(Home).Property(SkinHelper.RecentMusicBackground)]</value>
<value condition="Skin.HasSetting(ExpandAddMoreCategorySettings4) + Skin.String(AddMoreCategoryBtn12BackgroundImageType,fanart) + [String.IsEqual(Skin.String(AddMoreCategoryBtn12BackgroundImagePathLabel),$LOCALIZE[31030] ($LOCALIZE[590])) | String.IsEqual(Skin.String(AddMoreCategoryBtn12BackgroundImagePathLabel),$LOCALIZE[31030] ($LOCALIZE[31924]))]">$INFO[Container(9050).ListItem.Art(fanart)]</value>
<value condition="Skin.HasSetting(ExpandAddMoreCategorySettings4) + Skin.String(AddMoreCategoryBtn16BackgroundImageType,fanart) + [String.IsEqual(Skin.String(AddMoreCategoryBtn16BackgroundImagePathLabel),$LOCALIZE[31030] ($LOCALIZE[590])) | String.IsEqual(Skin.String(AddMoreCategoryBtn16BackgroundImagePathLabel),$LOCALIZE[31030] ($LOCALIZE[31924]))]">$INFO[Container(9050).ListItem.Art(fanart)]</value>
</variable>

<include name="AddMoreCategoryBtn4BackgroundImageVisible">
Expand Down
28 changes: 14 additions & 14 deletions 720p/includes_SkinSettingsMenus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<selected>Skin.HasSetting(ExpandShutdownMenuSettings)</selected>
<onclick>Skin.SetBool(ExpandShutdownMenuSettings)</onclick>
<onclick>Skin.SetBool(ExpandedSettings)</onclick>
<onclick>Control.SetFocus(960)</onclick>
<onclick>Control.SetFocus(970)</onclick>
</control>
<control type="radiobutton" id="6002">
<description>Context Menu</description>
Expand All @@ -37,7 +37,7 @@
<selected>Skin.HasSetting(ExpandContextMenuSettings)</selected>
<onclick>Skin.SetBool(ExpandContextMenuSettings)</onclick>
<onclick>Skin.SetBool(ExpandedSettings)</onclick>
<onclick>Control.SetFocus(961)</onclick>
<onclick>Control.SetFocus(971)</onclick>
</control>
</control>

Expand All @@ -52,15 +52,15 @@
<label>$LOCALIZE[31504]</label>
</control>

<control type="grouplist" id="960">
<control type="grouplist" id="970">
<description>Shutdown Menu Area</description>
<top>50</top>
<width>755</width>
<height>450</height>
<itemgap>0</itemgap>
<onup>960</onup>
<ondown>960</ondown>
<onleft>1960</onleft>
<onup>970</onup>
<ondown>970</ondown>
<onleft>1970</onleft>
<onright>noop</onright>
<include>ControlsOpenCloseAnim</include>
<control type="radiobutton" id="6101">
Expand Down Expand Up @@ -119,10 +119,10 @@
</control>
</control>

<control type="button" id="1960">
<control type="button" id="1970">
<description>Back</description>
<include>SettingsBackBtn</include>
<onright>960</onright>
<onright>970</onright>
<onleft>Skin.Reset(ExpandShutdownMenuSettings)</onleft>
<onleft>Skin.Reset(ExpandedSettings)</onleft>
<onleft>Control.SetFocus(6001)</onleft>
Expand All @@ -143,15 +143,15 @@
<label>$LOCALIZE[31505]</label>
</control>

<control type="grouplist" id="961">
<control type="grouplist" id="971">
<description>Shutdown Menu Area</description>
<top>50</top>
<width>755</width>
<height>450</height>
<itemgap>0</itemgap>
<onup>961</onup>
<ondown>961</ondown>
<onleft>1961</onleft>
<onup>971</onup>
<ondown>971</ondown>
<onleft>1971</onleft>
<onright>noop</onright>
<include>ControlsOpenCloseAnim</include>
<control type="radiobutton" id="6201">
Expand Down Expand Up @@ -211,10 +211,10 @@
</control>
</control>

<control type="button" id="1961">
<control type="button" id="1971">
<description>Back</description>
<include>SettingsBackBtn</include>
<onright>961</onright>
<onright>971</onright>
<onleft>Skin.Reset(ExpandContextMenuSettings)</onleft>
<onleft>Skin.Reset(ExpandedSettings)</onleft>
<onleft>Control.SetFocus(6002)</onleft>
Expand Down
Loading

0 comments on commit 0b16e4a

Please sign in to comment.