Skip to content

Commit

Permalink
widget update wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed May 6, 2024
1 parent f2ccd90 commit d68c892
Show file tree
Hide file tree
Showing 19 changed files with 271 additions and 82 deletions.
34 changes: 31 additions & 3 deletions 16x9/Components_Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@
<param name="category" value="12" />
<param name="previous" value="12$PARAM[widget_position]21" />
<param name="id" value="12$PARAM[widget_position]30" />
<param name="next" value="12$PARAM[next_widget_position]11" />
<param name="next" value="12$PARAM[widget_position]45" />
<param name="next_condition" value="!Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
<param name="alt_next" value="12$PARAM[widget_position]40" />
<param name="alt_next_condition" value="Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
Expand All @@ -765,7 +765,7 @@
<param name="category" value="12" />
<param name="previous" value="12$PARAM[widget_position]21" />
<param name="id" value="12$PARAM[widget_position]30" />
<param name="next" value="12$PARAM[next_widget_position]11" />
<param name="next" value="12$PARAM[widget_position]45" />
<param name="next_condition" value="!Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
<param name="alt_next" value="12$PARAM[widget_position]40" />
<param name="alt_next_condition" value="Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
Expand Down Expand Up @@ -818,8 +818,36 @@
<onclick>Skin.SetNumeric(Widget$PARAM[widget_position]_Custom_Limit)</onclick>
</control>
<control type="radiobutton" id="12$PARAM[widget_position]45">
<description>Spotlight content with auto-scroll</description>
<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20)</visible>
<label> - $LOCALIZE[31496]</label>
<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_AutoScroll)</onclick>
<selected>Skin.HasSetting(Widget$PARAM[widget_position]_AutoScroll)</selected>
</control>
<control type="radiobutton" id="12$PARAM[widget_position]46">
<description>Enable trailers to autoplay</description>
<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.HasSetting(Trailer_Autoplay)</visible>
<label> - $LOCALIZE[31467]</label>
<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Trailer_Autoplay)</onclick>
<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Trailer_Autoplay)</selected>
</control>
<control type="radiobutton" id="12$PARAM[widget_position]47">
<description>Prefer keyart for poster views</description>
<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.String(Widget$PARAM[widget_position]_Display,Posters)</visible>
<label> - $LOCALIZE[31498]</label>
<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Prefer_Keyart)</onclick>
<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Prefer_Keyart)</selected>
</control>
<control type="radiobutton" id="12$PARAM[widget_position]48">
<description>Prefer landscape art for fanart views</description>
<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + [Skin.String(Widget$PARAM[widget_position]_Display,Fanart) | Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)]</visible>
<label> - $LOCALIZE[31499]</label>
<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Prefer_Landscape)</onclick>
<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Prefer_Landscape)</selected>
</control>
<control type="radiobutton" id="12$PARAM[widget_position]49">
<description>Prefer thumbnails for episodes instead of show fanart</description>
<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)</visible>
<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom) + [Skin.String(Widget$PARAM[widget_position]_Display,Fanart) | Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)]</visible>
<label> - $LOCALIZE[31477]</label>
<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Episode_Thumbs)</onclick>
<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Episode_Thumbs)</selected>
Expand Down
64 changes: 52 additions & 12 deletions 16x9/Components_Viewtype_505_Grid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,41 @@
</definition>
</include>

<include name="GridView_Widget_Overlay">
<definition>
<control type="label" id="6004">
<include content="Hidden_Control" />
<label>$VAR[Info_Label]</label>
</control>
<control type="grouplist">
<visible>!$EXP[Content_Switching]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<left>95</left>
<width>322</width>
<top>872</top>
<height>198</height>
<orientation>vertical</orientation>
<align>center</align>
<itemgap>0</itemgap>
<control type="textbox">
<height max="135">auto</height>
<font>Spotlight_Title</font>
<textcolor>$VAR[Light_Color]</textcolor>
<label>$VAR[Title_Label]</label>
<align>center</align>
</control>
<control type="label">
<visible>!String.IsEmpty(Control.GetLabel(6004))</visible>
<height>35</height>
<font>Grid_Info</font>
<textcolor>$VAR[Light_Color]</textcolor>
<label>$INFO[Control.GetLabel(6004)]</label>
<align>center</align>
</control>
</control>
</definition>
</include>

<!-- Widget -->
<include name="GridView_ListIcon_Static_Unfocused">
<include content="ListIcon_Static_Unfocused">
Expand Down Expand Up @@ -1083,6 +1118,7 @@
<param name="5x_item_width" value="1800" />
<param name="6x_item_width" value="2160" />
<param name="art_icon" value="$PARAM[art_icon]" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
</include>
</definition>
</include>
Expand All @@ -1106,6 +1142,7 @@
<param name="5x_item_width" value="2960" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="focus_border_visible" value="$PARAM[focus_border_visible]" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
<nested />
</include>
</definition>
Expand All @@ -1119,19 +1156,20 @@
<param name="target_id" value="$PARAM[target_id]" />
<param name="displaytype_label" value="Spotlight" />
<param name="displaytype_isfanart" value="false" />
<param name="top" value="803" />
<param name="item_height" value="252" />
<param name="item_width_minus_dropshadow_width" value="328" />
<param name="item_width" value="448" />
<param name="item_width_plus_dropshadow_width" value="568" />
<param name="2x_item_width" value="896" />
<param name="3x_item_width" value="1344" />
<param name="4x_item_width" value="1792" />
<param name="5x_item_width" value="2240" />
<param name="6x_item_width" value="2688" />
<param name="top" value="872" />
<param name="item_height" value="198" />
<param name="item_width_minus_dropshadow_width" value="232" />
<param name="item_width" value="352" />
<param name="item_width_plus_dropshadow_width" value="472" />
<param name="2x_item_width" value="704" />
<param name="3x_item_width" value="1056" />
<param name="4x_item_width" value="1408" />
<param name="5x_item_width" value="1760" />
<param name="6x_item_width" value="2112" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="art_diffuse" value="true" />
<param name="focus_border_visible" value="$PARAM[focus_border_visible]" />
<animation effect="slide" start="0,0" end="20,0" time="0" condition="true">Conditional</animation>
<nested />
</include>
</definition>
Expand All @@ -1156,6 +1194,7 @@
<param name="5x_item_width" value="1800" />
<param name="6x_item_width" value="2160" />
<param name="art_icon" value="$PARAM[art_icon]" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
</include>
</definition>
</include>
Expand All @@ -1178,8 +1217,9 @@
<definition>
<include content="Progress_Grid">
<param name="id" value="$PARAM[id]" />
<param name="left" value="104" />
<param name="bottom" value="40" />
<param name="left" value="136" />
<param name="width" value="240" />
<param name="bottom" value="25" />
<param name="progress_indicator_background" value="$VAR[Accent_Color]" />
<param name="slides" value="Default" />
</include>
Expand Down
38 changes: 1 addition & 37 deletions 16x9/Content_Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,13 +607,6 @@
<onclick>Skin.ToggleSetting(BillboardView_Enabled_Addons)</onclick>
<selected>Skin.HasSetting(BillboardView_Enabled_Addons)</selected>
</control>
<!-- <control type="radiobutton" id="1304">
<description>Billboard - Favourites</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
<label>$LOCALIZE[31496]</label>
<onclick>Skin.ToggleSetting(BillboardView_Enabled_favouritesbrowser)</onclick>
<selected>Skin.HasSetting(BillboardView_Enabled_favouritesbrowser)</selected>
</control> -->
<control type="radiobutton" id="1305">
<description>Add movement</description>
<label>$LOCALIZE[31441]</label>
Expand Down Expand Up @@ -654,13 +647,6 @@
<onclick>Skin.ToggleSetting(ShowcaseView_Enabled_Addons)</onclick>
<selected>Skin.HasSetting(ShowcaseView_Enabled_Addons)</selected>
</control>
<!-- <control type="radiobutton" id="1315">
<description>Showcase - Favourites</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
<label>$LOCALIZE[31496]</label>
<onclick>Skin.ToggleSetting(ShowcaseView_Enabled_favouritesbrowser)</onclick>
<selected>Skin.HasSetting(ShowcaseView_Enabled_favouritesbrowser)</selected>
</control> -->
<control type="label" id="1320">
<description>Strip</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
Expand Down Expand Up @@ -694,13 +680,6 @@
<onclick>Skin.ToggleSetting(StripView_Enabled_Addons)</onclick>
<selected>Skin.HasSetting(StripView_Enabled_Addons)</selected>
</control>
<!-- <control type="radiobutton" id="1325">
<description>Strip - Favourites</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
<label>$LOCALIZE[31496]</label>
<onclick>Skin.ToggleSetting(StripView_Enabled_favouritesbrowser)</onclick>
<selected>Skin.HasSetting(StripView_Enabled_favouritesbrowser)</selected>
</control> -->
<control type="label" id="1330">
<description>Grid</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
Expand Down Expand Up @@ -754,13 +733,6 @@
<onclick>Skin.ToggleSetting(GridView_Enabled_Addons)</onclick>
<selected>Skin.HasSetting(GridView_Enabled_Addons)</selected>
</control>
<!-- <control type="radiobutton" id="1338">
<description>Grid - Favourites</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
<label>$LOCALIZE[31496]</label>
<onclick>Skin.ToggleSetting(GridView_Enabled_favouritesbrowser)</onclick>
<selected>Skin.HasSetting(GridView_Enabled_favouritesbrowser)</selected>
</control> -->

<!-- Customisations -->
<control type="label" id="1400">
Expand Down Expand Up @@ -1011,16 +983,8 @@
<param name="category" value="15" />
<param name="previous" value="1531" />
<param name="id" value="1532" />
<param name="next" value="1533" />
<param name="next" value="1534" />
</include>
<control type="radiobutton" id="1533">
<description>Home</description>
<label>- $LOCALIZE[31467]</label>
<selected>Skin.String(Trailer_Autoplay_Home_Enabled,true)</selected>
<onclick condition="Skin.String(Trailer_Autoplay_Home_Enabled,true)">Skin.SetString(Trailer_Autoplay_Home_Enabled,false)</onclick>
<onclick condition="!Skin.String(Trailer_Autoplay_Home_Enabled,true)">Skin.SetString(Trailer_Autoplay_Home_Enabled,true)</onclick>
<visible>ControlGroup(9).HasFocus(15) + Skin.HasSetting(Trailer_Autoplay)</visible>
</control>
<control type="radiobutton" id="1534">
<description>Videos / Movies</description>
<label>- $LOCALIZE[31468]</label>
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Content_Settings_Sliders.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
<onleft condition="Skin.String(Background_Slideshow,Custom) + !Library.HasContent(music) + !Library.HasContent(tvshows) + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
<onleft condition="Skin.String(Background_Slideshow,Artists) + Library.HasContent(tvshows)">Skin.SetString(Background_Slideshow,TVShows)</onleft>
<onleft condition="Skin.String(Background_Slideshow,Artists) + !Library.HasContent(tvshows) + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
<onleft condition="Skin.String(Background_Slideshow,TVShows + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
<onleft condition="Skin.String(Background_Slideshow,TVShows) + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
<onleft condition="Skin.String(Background_Slideshow,Movies)">Skin.SetString(Background_Slideshow,Videos)</onleft>
<onleft condition="Skin.String(Background_Slideshow,Videos)">Skin.SetString(Background_Slideshow,Global)</onleft>
<onright condition="[Skin.String(Background_Slideshow,Global) | !Skin.String(Background_Slideshow)] + Library.HasContent(video)">Skin.SetString(Background_Slideshow,Videos)</onright>
Expand Down
4 changes: 2 additions & 2 deletions 16x9/Content_Viewtype_Options.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,15 +326,15 @@
<label2>$LOCALIZE[31014] $VAR[Copacetic_Divider_Bold] $LOCALIZE[16100]$INFO[Container.NumItems, (,)]</label2>
<property name="ActionLeft">SendClick(14)</property>
<property name="ActionRight">SendClick(14)</property>
<visible>Window.Is(videos) + Control.IsEnabled(14) + !System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets) + Integer.IsGreater(Container.NumItems,1)</visible>
<visible>Window.Is(videos) + Control.IsEnabled(14) + !System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets)</visible>
</item>
<item id="2">
<onclick>SetFocus(50)</onclick>
<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[16101]$INFO[Container.TotalUnWatched, (,)] $VAR[Copacetic_Chevron_Right]</label>
<label2>$LOCALIZE[31014] $VAR[Copacetic_Divider_Bold] $LOCALIZE[16101]$INFO[Container.TotalUnWatched, (,)]</label2>
<property name="ActionLeft">SendClick(14)</property>
<property name="ActionRight">SendClick(14)</property>
<visible>Window.Is(videos) + Control.IsEnabled(14) + System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets) + Integer.IsGreater(Container.NumItems,1)</visible>
<visible>Window.Is(videos) + Control.IsEnabled(14) + System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets)</visible>
</item>
<!-- Current playlist -->
<item>
Expand Down
4 changes: 2 additions & 2 deletions 16x9/Custom_1199_Test_Label.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1199">
<visible>false</visible>
<visible>true</visible>
<zorder>3</zorder>
<controls>
<control type="image">
Expand All @@ -12,7 +12,7 @@
</control>
<control type="label">
<align>right</align>
<label>$INFO[Window(home).Property(Trailer_Autoplay)]</label>
<label>$INFO[Window(home).Property(Autoscroll_Trailers)]</label>
<height>200</height>
</control>
</controls>
Expand Down
18 changes: 18 additions & 0 deletions 16x9/Font.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,18 @@
<size>25</size>
<linespacing>0.9</linespacing>
</font>
<font>
<name>Spotlight_Title</name>
<filename>Inter/Inter-Black.ttf</filename>
<size>30</size>
<linespacing>0.9</linespacing>
</font>
<font>
<name>Spotlight_Title</name>
<filename>Inter/Inter-Black.ttf</filename>
<size>30</size>
<linespacing>0.9</linespacing>
</font>
<font>
<name>Body</name>
<filename>Inter/Inter-Light.ttf</filename>
Expand Down Expand Up @@ -691,6 +703,12 @@
<size>25</size>
<linespacing>0.9</linespacing>
</font>
<font>
<name>Spotlight_Title</name>
<filename>resource://resource.fonts.copacetic/Inter-NotoSansSC-Black.ttf</filename>
<size>30</size>
<linespacing>0.9</linespacing>
</font>
<font>
<name>Body</name>
<filename>resource://resource.fonts.copacetic/Inter-NotoSansSC-Light.ttf</filename>
Expand Down
5 changes: 2 additions & 3 deletions 16x9/Home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
<!-- Content -->
<control type="group">
<include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
<control type="group">
<visible>Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | Control.HasFocus(4201)</visible>
<visible>!$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
<include content="Horizontal_List">
<param name="hidden_id" value="3000" />
<param name="focused_color" value="$VAR[Light_Color]" />
Expand All @@ -67,8 +67,6 @@
<top>30</top>
<texturenofocus colordiffuse="$VAR[Light_Color]">icons/icon_browse_unfocused_120.png</texturenofocus>
<texturefocus colordiffuse="$VAR[Light_Color]">icons/icon_browse_focused_120.png</texturefocus>
<!-- <onclick>Skin.SetString(globalsearch)</onclick> -->
<!-- <onclick>ActivateWindow(1180)</onclick> -->
<onclick>RunScript(script.copacetic.helper,action=globalsearch_input)</onclick>
<onclick>SetFocus(3000)</onclick>
<include content="globalsearch_home_Navigation" />
Expand All @@ -81,6 +79,7 @@
<include content="Music_Player_Widget" condition="Skin.HasSetting(Music_Player_Enabled)">
<param name="left_label_visible" value="true" />
<param name="background_visible" value="false" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
</include>
</control>
</controls>
Expand Down
4 changes: 3 additions & 1 deletion 16x9/Templates_Widgets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
<control type="group">
<visible>!$EXP[TransparentDialog_IsVisible]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay) + ![Skin.String(Widget$PARAM[widget_position]_View,Grid) + Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)]" />
<control type="group">
<visible>Control.HasFocus(320$PARAM[widget_position])</visible>
<include content="Visible_Fade_Delayed_Animation" />
Expand All @@ -153,11 +154,12 @@
<param name="info_label_visible" value="true" />
<param name="info_label" value="$VAR[Copacetic_Divider_Bold,, ]$INFO[Container(320$PARAM[widget_position]).CurrentItem]$INFO[Container(320$PARAM[widget_position]).NumItems,/]" />
<param name="textcolor" value="$VAR[Breadcrumb_Label_Color]" />
<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay) + Skin.String(Widget$PARAM[widget_position]_View,Grid) + Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)" />
</include>
<nested />
<!-- Busy spinner -->
<include content="Busy_Spinner">
<param name="visible" value="Control.HasFocus(320$PARAM[widget_position]) + Container(320$PARAM[widget_position]).IsUpdating + !Window.IsVisible(busydialog) + !Skin.String(Trailer_Autoplay_Home_Enabled,true)" />
<param name="visible" value="Control.HasFocus(320$PARAM[widget_position]) + Container(320$PARAM[widget_position]).IsUpdating + !Window.IsVisible(busydialog) + !Skin.HasSetting(Widget$PARAM[widget_position]_Trailer_Autoplay)" />
<param name="color" value="$VAR[Volume_Focused_Color]" />
<include content="Trailer_Autoplay_Fade_Delayed_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
</include>
Expand Down
Loading

0 comments on commit d68c892

Please sign in to comment.