Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Favourites Viewtypes] improved viewtype selector #902

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Favourites Viewtypes] improved viewtype selector #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions 1080i/Custom_SetViewtype.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(507)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3123">
<include>DefContextButtonGradient</include>
Expand All @@ -130,7 +130,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(509)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3122">
<include>DefContextButtonGradient</include>
Expand All @@ -139,7 +139,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(510)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3101">
<include>DefContextButtonGradient</include>
Expand Down Expand Up @@ -184,7 +184,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(514)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3124">
<include>DefContextButtonGradient</include>
Expand All @@ -193,7 +193,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(504)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3125">
<include>DefContextButtonGradient</include>
Expand All @@ -202,7 +202,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(512)</onclick>
<onclick>Close</onclick>
<visible>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files)</visible>
<visible>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</visible>
</control>
<control type="button" id="3126">
<include>DefContextButtonGradient</include>
Expand All @@ -211,7 +211,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(511)</onclick>
<onclick>Close</onclick>
<visible>!Container.Content(actors) + !Container.Content(files)</visible>
<visible>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</visible>
</control>
<control type="button" id="3127">
<include>DefContextButtonGradient</include>
Expand All @@ -236,6 +236,7 @@
<label>31147</label>
<align>left</align>
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<enable>!Container.Content(favourites)</enable>
<onclick>Container.SetViewMode(57)</onclick>
<onclick>Close</onclick>
</control>
Expand Down Expand Up @@ -264,7 +265,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(54)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3132">
<include>DefContextButtonGradient</include>
Expand All @@ -273,15 +274,15 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(51)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3133">
<include>DefContextButtonGradient</include>
<label>31198</label>
<align>left</align>
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(58)</onclick>
<enable>!Container.Content(files)</enable>
<enable>!Container.Content(files) + !Container.Content(favourites)</enable>
<onclick>Close</onclick>
</control>
<control type="button" id="3134">
Expand All @@ -290,7 +291,7 @@
<align>left</align>
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(52)</onclick>
<enable>!Container.Content(files)</enable>
<enable>!Container.Content(files) + !Container.Content(favourites)</enable>
<onclick>Close</onclick>
</control>
<control type="button" id="3135">
Expand All @@ -309,15 +310,15 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(53)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="31381">
<include>DefContextButtonGradient</include>
<label>$LOCALIZE[535] $LOCALIZE[31591]</label>
<align>left</align>
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(527)</onclick>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
<onclick>Close</onclick>
</control>
<control type="button" id="3139">
Expand All @@ -326,7 +327,7 @@
<align>left</align>
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(56)</onclick>
<enable>!Container.Content(files)</enable>
<enable>!Container.Content(files) + !Container.Content(favourites)</enable>
<onclick>Close</onclick>
</control>
<control type="button" id="3140">
Expand All @@ -336,7 +337,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(515)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3141">
<include>DefContextButtonGradient</include>
Expand All @@ -345,7 +346,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(501)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3119">
<include>DefContextButtonGradient</include>
Expand All @@ -354,7 +355,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(519)</onclick>
<onclick>Close</onclick>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files)</enable>
<enable>!Container.Content(episodes) + !Container.Content(actors) + !Container.Content(files) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3157">
<include>DefContextButtonGradient</include>
Expand All @@ -363,7 +364,7 @@
<include condition="Skin.HasSetting(enable.forcedviews)">unlock_views</include>
<onclick>Container.SetViewMode(516)</onclick>
<onclick>Close</onclick>
<enable>Container.Content(seasons)</enable>
<enable>Container.Content(seasons) + !Container.Content(favourites)</enable>
</control>
<control type="button" id="3158">
<include>DefContextButtonGradient</include>
Expand Down
15 changes: 8 additions & 7 deletions 1080i/MyFavourites.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<window>
<defaultcontrol always="true">50</defaultcontrol>
<menucontrol>9000</menucontrol>
<views>50,550,55,500</views>
<views>50,550,55,500,555</views>
<onload condition="System.AddonIsEnabled(script.skin.info.service) + String.IsEmpty(Window(home).Property(skininfos_daemon_running))">RunScript(script.skin.info.service)</onload>
<onunload condition="Skin.HasSetting(home.netflix.autoplay.trailer) + $EXP[TrailerIsPlaying] + !Skin.HasSetting(trailer.dont.stop.on.unfocus) + !Window.Next(FullScreenVideo)">ClearProperty(TrailerPath,home)</onunload>
<onunload condition="Skin.HasSetting(home.netflix.autoplay.trailer) + $EXP[TrailerIsPlaying] + !Skin.HasSetting(trailer.dont.stop.on.unfocus) + !Window.Next(FullScreenVideo)">Stop</onunload>
Expand All @@ -14,6 +14,7 @@
<include condition="Skin.HasSetting(55wall.showinfo)">View_55_Wall_Info</include>
<include condition="Skin.HasSetting(55wall.showposter)">View_55_Wall_Poster</include>
<include condition="!Skin.HasSetting(55wall.showinfo) + !Skin.HasSetting(55wall.showposter)">View_55_Wall</include>
<include>View_555_Wall_Episodes</include>
<include>View_500_Thumbnails</include>
<include>JumpBarHorizontal2</include>
<include>Furniture_Header</include>
Expand Down Expand Up @@ -117,15 +118,15 @@
<control type="button" id="55551">
<include>DefContextMenuLabel</include>
<label>31076</label>
<visible>!Control.IsVisible(519) + !Control.IsVisible(500) + !Control.IsVisible(550) + !Control.IsVisible(555) + !Control.IsVisible(59) + !Control.IsVisible(58) + !Control.IsVisible(52) + !Control.IsVisible(515) + !Control.IsVisible(513)</visible>
<visible>!Control.IsVisible(500) + !Control.IsVisible(550) + !Control.IsVisible(555)</visible>
</control>
<control type="radiobutton" id="9028">
<include>DefContextButtonGradient</include>
<align>left</align>
<label>31264</label>
<selected>Skin.HasSetting(511ListInfo)</selected>
<onclick>Skin.ToggleSetting(511ListInfo)</onclick>
<visible>[Control.IsVisible(511) + Skin.HasSetting(ListView511)] | [Control.IsVisible(512) + Skin.HasSetting(ListView511)] | Control.IsVisible(56) | Control.IsVisible(50) | Control.IsVisible(516) | Control.IsVisible(57)</visible>
<visible>Control.IsVisible(50)</visible>
</control>
<control type="radiobutton" id="9030">
<include>DefContextButtonGradient</include>
Expand All @@ -151,7 +152,7 @@
<label>31676</label>
<selected>!Skin.HasSetting(hide.ratings)</selected>
<onclick>Skin.ToggleSetting(hide.ratings)</onclick>
<visible>Control.IsVisible(50) | Control.IsVisible(57) | Control.IsVisible(56)</visible>
<visible>Control.IsVisible(50)</visible>
</control>
<control type="radiobutton" id="9034" description="Info Wall (55)">
<include>DefContextButtonGradient</include>
Expand Down Expand Up @@ -180,7 +181,7 @@
<selected>Skin.HasSetting(list.show.filename)</selected>
<onclick>Skin.ToggleSetting(list.show.filename)</onclick>
<visible>Skin.HasSetting(511ListInfo)</visible>
<visible>Control.IsVisible(50) | Control.IsVisible(57) | Control.IsVisible(56)</visible>
<visible>Control.IsVisible(50)</visible>
</control>
<control type="radiobutton" id="90871">
<include>DefContextButtonGradient</include>
Expand All @@ -206,7 +207,7 @@
<selected>Skin.HasSetting(furniture.overlayinfobalken)</selected>
<onclick>Skin.ToggleSetting(furniture.overlayinfobalken)</onclick>
<onclick>ReloadSkin()</onclick>
<visible>Control.IsVisible(55) | Control.IsVisible(57) | Control.IsVisible(56) | Control.IsVisible(501) | Control.IsVisible(507)</visible>
<visible>Control.IsVisible(55)</visible>
</control>
<control type="button" id="55552">
<include>DefContextMenuLabel</include>
Expand All @@ -218,7 +219,7 @@
<label>31562</label>
<selected>Skin.HasSetting(show.reflections)</selected>
<onclick>Skin.ToggleSetting(show.reflections)</onclick>
<visible>Control.IsVisible(50) | Control.IsVisible(504) | Control.IsVisible(510) | Control.IsVisible(519) | Control.IsVisible(520) | Control.IsVisible(521) | Control.IsVisible(522) | Control.IsVisible(524) | Control.IsVisible(514) | Control.IsVisible(509) | Control.IsVisible(53) | Control.IsVisible(527)</visible>
<visible>Control.IsVisible(50)</visible>
</control>
<control type="radiobutton" id="9082">
<include>DefContextButtonGradient</include>
Expand Down
8 changes: 4 additions & 4 deletions 1080i/View_55_Wall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<visible>Control.IsVisible(55)</visible>
<include>ViewSlideForJumpBar</include>
<control type="panel" id="55">
<visible>$EXP[InGameMode] | Container.Content(musicvideos) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(sets) | Container.Content(videos)</visible>
<visible>$EXP[InGameMode] | Container.Content(musicvideos) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(sets) | Container.Content(videos) | Container.Content(favourites)</visible>
<top>206</top>
<right>70</right>
<width>1332</width>
Expand Down Expand Up @@ -64,7 +64,7 @@
<visible>Control.IsVisible(55)</visible>
<include>ViewSlideForJumpBar</include>
<control type="panel" id="55">
<visible>$EXP[InGameMode] | Container.Content(musicvideos) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(sets) | Container.Content(videos)</visible>
<visible>$EXP[InGameMode] | Container.Content(musicvideos) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(sets) | Container.Content(videos) | Container.Content(favourites)</visible>
<top>206</top>
<right>70</right>
<width>1135</width>
Expand Down Expand Up @@ -169,7 +169,7 @@
<visible>Control.IsVisible(55)</visible>
<include>ViewSlideForJumpBar</include>
<control type="panel" id="55">
<visible>$EXP[InGameMode] | Container.Content(musicvideos) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(sets) | Container.Content(videos)</visible>
<visible>$EXP[InGameMode] | Container.Content(musicvideos) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(sets) | Container.Content(videos) | Container.Content(favourites)</visible>
<top>206</top>
<right>70</right>
<left>70</left>
Expand Down Expand Up @@ -281,7 +281,7 @@
</include>
<viewtype label="31258">list</viewtype>
<include>ScrolltimeViewsList</include>
<visible>Container.Content(movies) | Container.Content(files) | Container.Content(musicvideos) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(sets) | Container.Content(videos) | $EXP[InGameMode]</visible>
<visible>Container.Content(movies) | Container.Content(files) | Container.Content(musicvideos) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(sets) | Container.Content(videos) | $EXP[InGameMode] | Container.Content(favourites)</visible>
<itemlayout height="337" width="444">
<control type="group">
<height>245</height>
Expand Down