Skip to content

Commit

Permalink
globalsearch wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed Apr 27, 2024
1 parent a18e7f1 commit 039e458
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 34 deletions.
25 changes: 18 additions & 7 deletions 16x9/Custom_1180_globalsearch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,33 @@
<!-- global search -->
<defaultcontrol always="true">3000</defaultcontrol>
<controls>

<control type="button" id="3000">
<visible allowhiddenfocus="true">false</visible>
<animation effect="slide" end="0,0" time="360" reversible="false">Focus</animation>
<include content="globalsearch_Focus_Setter">
<param name="bounce_id" value="3001" />
</include>
</control>
<control type="button" id="3001">
<visible allowhiddenfocus="true">false</visible>
<animation effect="slide" end="0,0" time="360" reversible="false">Focus</animation>
<include content="globalsearch_Focus_Setter">
<param name="bounce_id" value="3000" />
</include>
</control>

<control type="group">
<visible>!$EXP[Infoscreen_IsVisible]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<control type="button" id="3000">
<onclick>Skin.SetString(globalsearch)</onclick>
<onfocus>ClearProperty(Infoscreen_Widget,home)</onfocus>
<ondown>3201</ondown>
<include content="globalsearch_Button_Navigation" />
</control>
<include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
<include content="User_Scroll_Delay" />
<include content="globalsearch_Widget_3201_Movies" />
<include content="globalsearch_Widget_3202_TVShows" />
<include content="globalsearch_Widget_3203_Episodes" />
<include content="globalsearch_Widget_3204_Artists" />
<include content="globalsearch_Widget_3205_Albums" />
<include content="globalsearch_Widget_3206_Songs" />
</control>
</control>
</controls>
</window>
15 changes: 13 additions & 2 deletions 16x9/Home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<include content="Trailer_Autoplay_Fade_Delayed_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
</include>
<control type="group">
<visible>[Control.HasFocus(4010) | Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]</visible>
<visible>[Control.HasFocus(4010) | Control.HasFocus(4201) | Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]</visible>
<include content="VisibleHidden_Fade_Animation" />
<include content="Background_Home" />
<include content="Home_Clearlogo" condition="Skin.HasSetting(Home_Screensaver_Enabled)" />
Expand All @@ -52,14 +52,25 @@
<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]</visible>
<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="Horizontal_List">
<param name="hidden_id" value="3000" />
<param name="focused_color" value="$VAR[Light_Color]" />
<param name="unfocused_color" value="$VAR[Light_Color]" />
</include>
<control type="button" id="4201">
<width>120</width>
<height>120</height>
<left>30</left>
<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>
<include content="globalsearch_home_Navigation" />
</control>
<include content="Clock" condition="!Skin.HasSetting(Hide_Home_Clock)">
<param name="textcolor" value="$VAR[Notification_Widget_Label_Color]" />
</include>
Expand Down
53 changes: 29 additions & 24 deletions 16x9/Navigation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<onup condition="Window.Is(home) + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + !Control.IsVisible(3202) + !Control.IsVisible(3201)">3000</onup>
<ondown condition="Window.Is(home)">3000</ondown>
<onback condition="Window.Is(home)">3000</onback>
<onleft condition="Window.Is(home)">4201</onleft>
<onback condition="$EXP[ListView_IsVisible] + !$EXP[Infoscreen_IsVisible]">50</onback>
<onleft condition="$EXP[ListView_IsVisible] + !$EXP[Infoscreen_IsVisible]">50</onleft>
<onright condition="$EXP[ListView_IsVisible] + Integer.IsLessOrEqual(Container.NumItems,11) + !$EXP[Infoscreen_IsVisible] + !$EXP[Hidden_Options_Menu_Disabled]">SetFocus(3000,0,absolute)</onright>
Expand Down Expand Up @@ -225,15 +226,7 @@

<include name="Home_Menu_Navigation">
<onup condition="Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio">SetFocus(3500,1)</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + Control.IsVisible(3209)">3209</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + Control.IsVisible(3208)">3208</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + !Control.IsVisible(3208) + Control.IsVisible(3207)">3207</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + Control.IsVisible(3206)">3206</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + Control.IsVisible(3205)">3205</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + Control.IsVisible(3204)">3204</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + Control.IsVisible(3203)">3203</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + Control.IsVisible(3202)">3202</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + !Control.IsVisible(3202) + Control.IsVisible(3201)">3201</onup>
<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]">4201</onup>
<ondown condition="Control.IsVisible(3201)">3201</ondown>
<ondown condition="!Control.IsVisible(3201) + Control.IsVisible(3202)">3202</ondown>
<ondown condition="!Control.IsVisible(3201) + !Control.IsVisible(3202) + Control.IsVisible(3203)">3203</ondown>
Expand All @@ -246,6 +239,21 @@
<include content="Widget_Reset" />
</include>

<include name="globalsearch_home_Navigation">
<onup condition="Control.IsVisible(3209)">3209</onup>
<onup condition="!Control.IsVisible(3209) + Control.IsVisible(3208)">3208</onup>
<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + Control.IsVisible(3207)">3207</onup>
<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + Control.IsVisible(3206)">3206</onup>
<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + Control.IsVisible(3205)">3205</onup>
<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + Control.IsVisible(3204)">3204</onup>
<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + Control.IsVisible(3203)">3203</onup>
<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + Control.IsVisible(3202)">3202</onup>
<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + !Control.IsVisible(3202) + Control.IsVisible(3201)">3201</onup>
<onright condition="Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio">SetFocus(3500,1)</onright>
<ondown>SetFocus(3000)</ondown>
<onback>SetFocus(3000)</onback>
</include>

<include name="Widget_Reset">
<onfocus condition="!String.IsEqual(Container(3201).CurrentItem,1)">Control.Move(3201,$INFO[Container(3201).CurrentItem,-])</onfocus>
<onfocus condition="!String.IsEqual(Container(3201).CurrentItem,1)">Control.Move(3201,1)</onfocus>
Expand Down Expand Up @@ -480,21 +488,18 @@
<onup condition="Control.HasFocus(3201)">SetFocus(3000)</onup>
</include>

<include name="globalsearch_Button_Navigation">
<ondown condition="Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</ondown>
<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</ondown>
<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</ondown>
<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</ondown>
<onup condition="Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</onup>
<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</onup>
<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</onup>
<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
<include name="globalsearch_Focus_Setter">
<param name="bounce_id" />
<definition>
<onfocus condition="Integer.IsGreater(Container(3201).NumItems,0)">SetFocus(3201)</onfocus>
<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">SetFocus(3202)</onfocus>
<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">SetFocus(3203)</onfocus>
<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">SetFocus(3204)</onfocus>
<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">SetFocus(3205)</onfocus>
<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">SetFocus(3206)</onfocus>
<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">SetFocus(3207)</onfocus>
<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0)">SetFocus($PARAM[bounce_id])</onfocus>
</definition>
</include>

<include name="globalsearch_Navigation">
Expand Down
1 change: 1 addition & 0 deletions 16x9/_IDs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ BUTTONS
4022 Infoscreen star rating down button
410X Set focus away from secondary list
4200 Reset widgets
4201 Global search button
4300 Set focus to screensaver

ANIMATION DELAYS
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<import addon="script.skinshortcuts" version="1.1.5" />
<import addon="service.upnext" version="1.1.9+MATRIX.1" />
</requires>
<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="false">
<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="true">
<res width="1920" height="1080" aspect="16:9" default="true" folder="16x9" />
</extension>
<extension point="xbmc.addon.metadata">
Expand Down

0 comments on commit 039e458

Please sign in to comment.