Skip to content

Commit

Permalink
new widget settings screen wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed May 7, 2024
1 parent 266c696 commit 37c1b96
Show file tree
Hide file tree
Showing 22 changed files with 440 additions and 131 deletions.
55 changes: 55 additions & 0 deletions 16x9/Components_Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,54 @@
<onfocus condition="Control.IsVisible(12920)">Control.SetHidden(12920)</onfocus>
</include>

<include name="widgetsettings_Component">
<param name="widget_position" />
<param name="previous_widget_position" />
<param name="next_widget_position" />
<definition>
<!-- Content -->
<control type="button" id="$PARAM[widget_position]1">
<description>Widget content type</description>
<visible>ControlGroup(3200).HasFocus($PARAM[widget_position])</visible>
<include content="skinnsettings_Default_Button" />
<label>$LOCALIZE[31445]</label>
<label2>$VAR[Widget$PARAM[widget_position]_Content]</label2>
<onclick>Skin.SelectBool(424, 504|Widget$PARAM[widget_position]_Content_Disabled, 31200|Widget$PARAM[widget_position]_Content_InProgress, 31201|Widget$PARAM[widget_position]_Content_NextUp, 31202|Widget$PARAM[widget_position]_Content_LatestMovies, 31204|Widget$PARAM[widget_position]_Content_RandomMovies, 31203|Widget$PARAM[widget_position]_Content_LatestTVShows, 31205|Widget$PARAM[widget_position]_Content_RandomTVShows, 31206|Widget$PARAM[widget_position]_Content_LatestAlbums, 31207|Widget$PARAM[widget_position]_Content_RecentAlbums, 31208|Widget$PARAM[widget_position]_Content_RandomAlbums, 31209|Widget$PARAM[widget_position]_Content_LikedSongs, 1036|Widget$PARAM[widget_position]_Content_Favourites, 31210|Widget$PARAM[widget_position]_Content_Custom)</onclick>
</control>
<!-- View -->
<include content="skinsettings_Slider_Button">
<param name="left" value="3200" />
<param name="right" value="0" />
<param name="info" value="Widget$PARAM[widget_position]_View" />
<param name="visible" value="ControlGroup(3200).HasFocus($PARAM[widget_position]) + !Skin.HasSetting(Widget$PARAM[widget_position]_Content_Disabled)" />
<param name="label" value="$LOCALIZE[31005]" />
<param name="label2" value="$VAR[Widget$PARAM[widget_position]_View]" />
<param name="category" value="$PARAM[widget_position]" />
<param name="previous" value="$PARAM[widget_position]1" />
<param name="id" value="$PARAM[widget_position]2" />
<param name="next" value="$PARAM[widget_position]3" />
<param name="next_condition" value="Control.IsVisible($PARAM[widget_position]3)" />
<param name="alt_next" value="$PARAM[widget_position]4" />
<param name="alt_next_condition" value="!Control.IsVisible($PARAM[widget_position]3) + Control.IsVisible($PARAM[widget_position]4)" />
<param name="alt2_next" value="$PARAM[widget_position]11" />
<param name="alt2_next_condition" value="!Control.IsVisible($PARAM[widget_position]3) + !Control.IsVisible($PARAM[widget_position]4)" />
</include>
<!-- Display -->
<include content="skinsettings_Slider_Button">
<param name="left" value="3200" />
<param name="right" value="0" />
<param name="info" value="Widget$PARAM[widget_position]_Display" />
<param name="visible" value="ControlGroup(3200).HasFocus($PARAM[widget_position]) + !Skin.HasSetting(Widget$PARAM[widget_position]_Content_Disabled) + ![Skin.String(Widget$PARAM[widget_position]_View,Billboard) | Skin.HasSetting(Widget$PARAM[widget_position]_Content_Disabled) | Skin.HasSetting(Widget$PARAM[widget_position]_Content_LatestAlbums) | Skin.HasSetting(Widget$PARAM[widget_position]_Content_RecentAlbums) | Skin.HasSetting(Widget$PARAM[widget_position]_Content_RandomAlbums) | Skin.HasSetting(Widget$PARAM[widget_position]_Content_LikedSongs)]" />
<param name="label" value="$LOCALIZE[131]" />
<param name="label2" value="$VAR[Widget$PARAM[widget_position]_Display]" />
<param name="category" value="$PARAM[widget_position]" />
<param name="previous" value="$PARAM[widget_position]2" />
<param name="id" value="$PARAM[widget_position]3" />
<param name="next" value="$PARAM[widget_position]4" />>
</include>
</definition>
</include>

<include name="Widget_Settings_Content">
<param name="widget_position" />
<param name="previous_widget_position" />
Expand Down Expand Up @@ -818,6 +866,13 @@
<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]50">
<description>Enable clearlogos for widgets</description>
<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20)</visible>
<label> - $LOCALIZE[31476]</label>
<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Clearlogos_Enabled)</onclick>
<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Clearlogos_Enabled)</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>
Expand Down
7 changes: 4 additions & 3 deletions 16x9/Components_Viewtypes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@
<param name="info_gap" default="-5" />
<param name="plot_label" default="$VAR[Plot_Label]" />
<param name="plot_maxheight" default="103" />
<param name="widget_clearlogos" default="false" />
<definition>
<include content="Hidden_Components">
<control type="label" id="6003">
Expand All @@ -527,14 +528,14 @@
<centerleft>50%</centerleft>
</include>
<control type="grouplist">
<include content="Common_Details_Slides" condition="Skin.HasSetting(Crop_Clearlogos) + ![Window.Is(home) + !Skin.HasSetting(Widgets_Clearlogos_Enabled)]">
<include content="Common_Details_Slides" condition="Skin.HasSetting(Crop_Clearlogos) + ![Window.Is(home) + !$PARAM[widget_clearlogos]]">
<param name="viewtype_label" value="$PARAM[viewtype_label]" />
</include>
<orientation>vertical</orientation>
<align>center</align>
<itemgap>$PARAM[itemgap]</itemgap>
<usecontrolcoords>true</usecontrolcoords>
<include content="Common_Details_Logo" condition="[Window.Is(home) + Skin.HasSetting(Widgets_Clearlogos_Enabled)] | Window.Is(videos) | Window.Is(music) | Window.Is(programs)">
<include content="Common_Details_Logo" condition="[Window.Is(home) + $PARAM[widget_clearlogos]] | Window.Is(videos) | Window.Is(music) | Window.Is(programs)">
<param name="visible" value="[!$EXP[BillboardView_IsVisible] + [$EXP[$PARAM[viewtype_label]View_Logo_IsVisible] | $EXP[Widget_HasLogo]] + !$EXP[$PARAM[viewtype_label]View_Details_Title]] | [$EXP[BillboardView_IsVisible] + $EXP[BillboardView_Logo_IsVisible]] | [Window.Is(home) + $EXP[Widget_HasLogo]]" />
<param name="align" value="left" />
<param name="aligny" value="bottom" />
Expand All @@ -543,7 +544,7 @@
<animation effect="slide" start="0,0" end="-60,366" time="0" condition="$EXP[BillboardView_IsVisible] + $EXP[BillboardView_Logo_IsVisible] + $EXP[BillboardView_Details_Title]">Conditional</animation>
</include>
<include content="Common_Details_Textbox">
<param name="visible" value="[$EXP[$PARAM[viewtype_label]View_Media_IsVisible] + !$EXP[$PARAM[viewtype_label]View_Logo_IsVisible]] | [$EXP[ShowcaseView_Media_IsVisible] + ![$EXP[ShowcaseView_Logo_IsVisible] | $EXP[ShowcaseView_Details_Overlay_IsVisible]]] | $EXP[Infoscreen_Widget_HasFocus] | [Window.Is(home) + [!$EXP[Widget_HasLogo] | !Skin.HasSetting(Widgets_Clearlogos_Enabled)]]" />
<param name="visible" value="[$EXP[$PARAM[viewtype_label]View_Media_IsVisible] + !$EXP[$PARAM[viewtype_label]View_Logo_IsVisible]] | [$EXP[ShowcaseView_Media_IsVisible] + ![$EXP[ShowcaseView_Logo_IsVisible] | $EXP[ShowcaseView_Details_Overlay_IsVisible]]] | $EXP[Infoscreen_Widget_HasFocus] | [Window.Is(home) + [!$EXP[Widget_HasLogo] | !$PARAM[widget_clearlogos]]]" />
<param name="font" value="$PARAM[viewtype_label]_Title" />
<param name="color" value="$PARAM[title_color]" />
<param name="maxheight" value="$PARAM[title_maxheight]" />
Expand Down
121 changes: 115 additions & 6 deletions 16x9/Content_Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,22 @@
<param name="category" value="10" />
<param name="previous" value="1021" />
<param name="id" value="1022" />
<param name="next" value="1001" />
<param name="next" value="1023" />
</include>
<control type="radiobutton" id="1023">
<description>Prefer keyart to posters on infoscreens</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>$LOCALIZE[31428]</label>
<onclick>Skin.ToggleSetting(Infoscreens_Prefer_Keyart)</onclick>
<selected>Skin.HasSetting(Infoscreens_Prefer_Keyart)</selected>
</control>
<control type="radiobutton" id="1024">
<description>Prefer landscape art to fanart on infoscreens</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>$LOCALIZE[31700]</label>
<onclick>Skin.ToggleSetting(Infoscreens_Prefer_Landscape)</onclick>
<selected>Skin.HasSetting(Infoscreens_Prefer_Landscape)</selected>
</control>

<!-- Background -->
<control type="label" id="1600">
Expand Down Expand Up @@ -432,12 +446,11 @@
<onclick>Skin.ToggleSetting(Widgets_Enabled)</onclick>
<selected>Skin.HasSetting(Widgets_Enabled)</selected>
</control>
<control type="radiobutton" id="1102">
<description>Enable clearlogos for widgets</description>
<control type="button" id="1113">
<description>Configure widgets</description>
<visible>ControlGroup(9).HasFocus(11) + Skin.HasSetting(Widgets_Enabled)</visible>
<label>- $LOCALIZE[31476]</label>
<onclick>Skin.ToggleSetting(Widgets_Clearlogos_Enabled)</onclick>
<selected>Skin.HasSetting(Widgets_Clearlogos_Enabled)</selected>
<label>Configure widgets</label>
<onclick>ActivateWindow(1140)</onclick>
</control>
<control type="button" id="1103">
<description>- Reset widgets</description>
Expand Down Expand Up @@ -1120,4 +1133,100 @@
</control>
</include>

<include name="widgetsettings_Left_List_Content">
<control type="button" id="1">
<description>Widget 1</description>
<label>$LOCALIZE[31445] 1</label>
<texturefocus />
</control>
<control type="button" id="2">
<description>Widget 2</description>
<label>$LOCALIZE[31445] 2</label>
<texturefocus />
</control>
<control type="button" id="3">
<description>Widget 3</description>
<label>$LOCALIZE[31445] 3</label>
<texturefocus />
</control>
<control type="button" id="4">
<description>Widget 4</description>
<label>$LOCALIZE[31445] 4</label>
<texturefocus />
</control>
<control type="button" id="5">
<description>Widget 5</description>
<label>$LOCALIZE[31445] 5</label>
<texturefocus />
</control>
<control type="button" id="6">
<description>Widget 6</description>
<label>$LOCALIZE[31445] 6</label>
<texturefocus />
</control>
<control type="button" id="7">
<description>Widget 7</description>
<label>$LOCALIZE[31445] 7</label>
<texturefocus />
</control>
<control type="button" id="8">
<description>Widget 8</description>
<label>$LOCALIZE[31445] 8</label>
<texturefocus />
</control>
<control type="button" id="9">
<description>Widget 9</description>
<label>$LOCALIZE[31445] 9</label>
<texturefocus />
</control>
</include>

<include name="widgetsettings_Right_List_Content">
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="9" />
<param name="widget_position" value="1" />
<param name="next_widget_position" value="2" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="1" />
<param name="widget_position" value="2" />
<param name="next_widget_position" value="3" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="2" />
<param name="widget_position" value="3" />
<param name="next_widget_position" value="4" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="3" />
<param name="widget_position" value="4" />
<param name="next_widget_position" value="5" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="4" />
<param name="widget_position" value="5" />
<param name="next_widget_position" value="6" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="5" />
<param name="widget_position" value="6" />
<param name="next_widget_position" value="7" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="6" />
<param name="widget_position" value="7" />
<param name="next_widget_position" value="8" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="7" />
<param name="widget_position" value="8" />
<param name="next_widget_position" value="9" />
</include>
<include content="widgetsettings_Component">
<param name="previous_widget_position" value="8" />
<param name="widget_position" value="9" />
<param name="next_widget_position" value="1" />
</include>
</include>

</includes>
9 changes: 9 additions & 0 deletions 16x9/Content_Settings_Sliders.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@
<!-- Widgets -->
<include name="skinsettings_Widget1_View_Button_Conditions">
<onleft condition="Skin.String(Widget1_View,Grid)">Skin.SetString(Widget1_View,Strip)</onleft>
<onleft condition="Skin.String(Widget1_View,Grid) + Skin.String(Widget1_Display,Spotlight)">Skin.SetString(Widget1_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget1_View,Strip) | !Skin.String(Widget1_View)]">Skin.SetString(Widget1_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget1_View,Strip) | !Skin.String(Widget1_View)] + Skin.String(Widget1_Display,Fanart)">Skin.SetString(Widget1_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget1_IsSquare] + Skin.String(Widget1_View,Showcase)">Skin.SetString(Widget1_View,Billboard)</onleft>
Expand Down Expand Up @@ -448,6 +449,7 @@

<include name="skinsettings_Widget2_View_Button_Conditions">
<onleft condition="Skin.String(Widget2_View,Grid)">Skin.SetString(Widget2_View,Strip)</onleft>
<onleft condition="Skin.String(Widget2_View,Grid) + Skin.String(Widget2_Display,Spotlight)">Skin.SetString(Widget2_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget2_View,Strip) | !Skin.String(Widget2_View)]">Skin.SetString(Widget2_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget2_View,Strip) | !Skin.String(Widget2_View)] + Skin.String(Widget2_Display,Fanart)">Skin.SetString(Widget2_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget2_IsSquare] + Skin.String(Widget2_View,Showcase)">Skin.SetString(Widget2_View,Billboard)</onleft>
Expand Down Expand Up @@ -497,6 +499,7 @@

<include name="skinsettings_Widget3_View_Button_Conditions">
<onleft condition="Skin.String(Widget3_View,Grid)">Skin.SetString(Widget3_View,Strip)</onleft>
<onleft condition="Skin.String(Widget3_View,Grid) + Skin.String(Widget3_Display,Spotlight)">Skin.SetString(Widget3_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget3_View,Strip) | !Skin.String(Widget3_View)]">Skin.SetString(Widget3_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget3_View,Strip) | !Skin.String(Widget3_View)] + Skin.String(Widget3_Display,Fanart)">Skin.SetString(Widget3_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget3_IsSquare] + Skin.String(Widget3_View,Showcase)">Skin.SetString(Widget3_View,Billboard)</onleft>
Expand Down Expand Up @@ -546,6 +549,7 @@

<include name="skinsettings_Widget4_View_Button_Conditions">
<onleft condition="Skin.String(Widget4_View,Grid)">Skin.SetString(Widget4_View,Strip)</onleft>
<onleft condition="Skin.String(Widget4_View,Grid) + Skin.String(Widget4_Display,Spotlight)">Skin.SetString(Widget4_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget4_View,Strip) | !Skin.String(Widget4_View)]">Skin.SetString(Widget4_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget4_View,Strip) | !Skin.String(Widget4_View)] + Skin.String(Widget4_Display,Fanart)">Skin.SetString(Widget4_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget4_IsSquare] + Skin.String(Widget4_View,Showcase)">Skin.SetString(Widget4_View,Billboard)</onleft>
Expand Down Expand Up @@ -595,6 +599,7 @@

<include name="skinsettings_Widget5_View_Button_Conditions">
<onleft condition="Skin.String(Widget5_View,Grid)">Skin.SetString(Widget5_View,Strip)</onleft>
<onleft condition="Skin.String(Widget5_View,Grid) + Skin.String(Widget5_Display,Spotlight)">Skin.SetString(Widget5_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget5_View,Strip) | !Skin.String(Widget5_View)]">Skin.SetString(Widget5_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget5_View,Strip) | !Skin.String(Widget5_View)] + Skin.String(Widget5_Display,Fanart)">Skin.SetString(Widget5_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget5_IsSquare] + Skin.String(Widget5_View,Showcase)">Skin.SetString(Widget5_View,Billboard)</onleft>
Expand Down Expand Up @@ -644,6 +649,7 @@

<include name="skinsettings_Widget6_View_Button_Conditions">
<onleft condition="Skin.String(Widget6_View,Grid)">Skin.SetString(Widget6_View,Strip)</onleft>
<onleft condition="Skin.String(Widget6_View,Grid) + Skin.String(Widget6_Display,Spotlight)">Skin.SetString(Widget6_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget6_View,Strip) | !Skin.String(Widget6_View)]">Skin.SetString(Widget6_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget6_View,Strip) | !Skin.String(Widget6_View)] + Skin.String(Widget6_Display,Fanart)">Skin.SetString(Widget6_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget6_IsSquare] + Skin.String(Widget6_View,Showcase)">Skin.SetString(Widget6_View,Billboard)</onleft>
Expand Down Expand Up @@ -693,6 +699,7 @@

<include name="skinsettings_Widget7_View_Button_Conditions">
<onleft condition="Skin.String(Widget7_View,Grid)">Skin.SetString(Widget7_View,Strip)</onleft>
<onleft condition="Skin.String(Widget7_View,Grid) + Skin.String(Widget7_Display,Spotlight)">Skin.SetString(Widget7_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget7_View,Strip) | !Skin.String(Widget7_View)]">Skin.SetString(Widget7_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget7_View,Strip) | !Skin.String(Widget7_View)] + Skin.String(Widget7_Display,Fanart)">Skin.SetString(Widget7_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget7_IsSquare] + Skin.String(Widget7_View,Showcase)">Skin.SetString(Widget7_View,Billboard)</onleft>
Expand Down Expand Up @@ -742,6 +749,7 @@

<include name="skinsettings_Widget8_View_Button_Conditions">
<onleft condition="Skin.String(Widget8_View,Grid)">Skin.SetString(Widget8_View,Strip)</onleft>
<onleft condition="Skin.String(Widget8_View,Grid) + Skin.String(Widget8_Display,Spotlight)">Skin.SetString(Widget8_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget8_View,Strip) | !Skin.String(Widget8_View)]">Skin.SetString(Widget8_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget8_View,Strip) | !Skin.String(Widget8_View)] + Skin.String(Widget8_Display,Fanart)">Skin.SetString(Widget8_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget8_IsSquare] + Skin.String(Widget8_View,Showcase)">Skin.SetString(Widget8_View,Billboard)</onleft>
Expand Down Expand Up @@ -791,6 +799,7 @@

<include name="skinsettings_Widget9_View_Button_Conditions">
<onleft condition="Skin.String(Widget9_View,Grid)">Skin.SetString(Widget9_View,Strip)</onleft>
<onleft condition="Skin.String(Widget9_View,Grid) + Skin.String(Widget9_Display,Spotlight)">Skin.SetString(Widget9_Display,Fanart)</onleft>
<onleft condition="[Skin.String(Widget9_View,Strip) | !Skin.String(Widget9_View)]">Skin.SetString(Widget9_View,Showcase)</onleft>
<onleft condition="[Skin.String(Widget9_View,Strip) | !Skin.String(Widget9_View)] + Skin.String(Widget9_Display,Fanart)">Skin.SetString(Widget9_Display,Posters)</onleft>
<onleft condition="!$EXP[Widget9_IsSquare] + Skin.String(Widget9_View,Showcase)">Skin.SetString(Widget9_View,Billboard)</onleft>
Expand Down
Loading

0 comments on commit 37c1b96

Please sign in to comment.