global search wip

realcopacetic · Apr 26, 2024 · a18e7f1 · a18e7f1
1 parent cec0a6d
commit a18e7f1
Show file tree

Hide file tree

Showing 10 changed files with 259 additions and 39 deletions.
diff --git a/16x9/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1180">
   <!-- global search -->
-  <defaultcontrol always="true">100</defaultcontrol>
+  <defaultcontrol always="true">3000</defaultcontrol>
   <controls>
-    <control type="button" id="100">
-      <onclick>Skin.SetString(globalsearch)</onclick>
-      <ondown>3201</ondown>
-    </control>
-    <include content="User_Scroll_Delay" />
-    <include content="globalsearch_Widget_3201_Movies" />
-    <control type="label">
-      <label>$INFO[Window(home).Property(Infoscreen_Widget)]</label>
-      <align>right</align>
+    <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="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>
   </controls>
 </window>
diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml
@@ -2,17 +2,18 @@
 <includes>
 
 	<!-- Windows -->
-	<expression name="Home_HasBackground">Window.IsVisible(home) + [String.IsEmpty(Window(home).Property(Home_Widget)) | $EXP[BillboardView_Display_IsFanart_Widget_Home]]</expression>
+	<expression name="Home_HasBackground">Window.IsVisible(home) + [String.IsEmpty(Window(home).Property(Home_Widget)) | $EXP[BillboardView_Display_IsFanart_Widget_Home]] + !$EXP[globalsearch_IsVisible]</expression>
 	<expression name="Settings_Window_IsVisible">Window.IsVisible(settings) | Window.IsVisible(skinsettings) | Window.IsVisible(appearancesettings) | Window.IsVisible(mediasettings) | Window.IsVisible(playersettings) | Window.IsVisible(servicesettings) | Window.IsVisible(systemsettings) | Window.IsVisible(pvrsettings) | Window.IsVisible(gamesettings) | Window.IsVisible(profiles) | Window.IsVisible(systeminfo) | Window.IsVisible(filemanager)</expression>
 	<expression name="Window_HasBackground">Window.IsVisible(addonsettings) + !String.IsEmpty(ListItem.Art(fanart))] | [Window.IsVisible(addonbrowser) + !Container.Content(addons)] | Window.IsVisible(favouritesbrowser) | Window.IsVisible(loginscreen) | Window.IsVisible(musicplaylisteditor)</expression>
 	<expression name="Container_HasBackground">$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible] | $EXP[ShowcaseView_Display_HasBackground]</expression>
 	<expression name="Content_HasBackground">Container.Content(videoversions) | Container.Content(genres) | Container.Content(years) | Container.Content(playlists) | Container.Content(sources) | Container.Content(studios) | Container.Content(directors) | Container.Content(tags) | Container.Content(countries) | Container.Content(roles)</expression>
 	<expression name="Infoscreen_HasBackground">[Window.IsVisible(movieinformation) + [Window.IsVisible(1104) | Window.IsVisible(1150) | !String.IsEmpty(Window(movieinformation).Property(Focused_Button)) | String.IsEqual(Window(home).Property(Infoscreen_Widget),3205)]] | [Window.IsVisible(musicinformation) + String.IsEqual(Window(musicinformation).Property(Info_Type),artist) + [Window.IsVisible(1104) | Window.IsVisible(1150) | !String.IsEmpty(Window(musicinformation).Property(Focused_Button))]] | [Window.IsVisible(musicinformation) + String.IsEqual(Window(musicinformation).Property(Focused_Button),$LOCALIZE[21891])]</expression>
 	<expression name="Background_IsVisible">$EXP[Home_HasBackground] | $EXP[Settings_Window_IsVisible] | $EXP[Container_HasBackground] | $EXP[Content_HasBackground] | $EXP[Infoscreen_HasBackground] | [Container.Content() + $EXP[ListView_Display_IsBackground] + [Window.IsVisible(videos) | Window.IsVisible(music)]]</expression>
 
-	<expression name="Infoscreen_IsVisible">Window.IsVisible(movieinformation) | Window.IsVisible(musicinformation) | Window.IsVisible(songinformation) | Window.IsVisible(addoninformation) | $EXP[Infoscreen_Widget_Transition] | Window.IsVisible(pvrguideinfo) | Window.IsVisible(pvrrecordinginfo) | Window.IsVisible(1180)</expression>
+	<expression name="Infoscreen_IsVisible">Window.IsVisible(movieinformation) | Window.IsVisible(musicinformation) | Window.IsVisible(songinformation) | Window.IsVisible(addoninformation) | $EXP[Infoscreen_Widget_Transition] | Window.IsVisible(pvrguideinfo) | Window.IsVisible(pvrrecordinginfo)</expression>
 	<expression name="Infoscreen_Widget_HasFocus">$EXP[Infoscreen_IsVisible] + [String.IsEmpty(Window(movieinformation).Property(Focused_Button)) + String.IsEmpty(Window(musicinformation).Property(Focused_Button)) + String.IsEmpty(Window(addoninformation).Property(Focused_Button)) + String.IsEmpty(Window(pvrguideinfo).Property(Focused_Button))]</expression>
 	<expression name="Infoscreen_Widget_Transition">Control.HasFocus(6001) | Control.HasFocus(6002) | String.IsEqual(Window(home).Property(Infoscreen_Transition),true)</expression>
+	<expression name="globalsearch_IsVisible">Window.IsVisible(1180)</expression>
 
 	<expression name="PanelDialog_IsVisible">Window.IsVisible(selectdialog) | Window.IsVisible(selectvideoversion) | !String.IsEmpty(Window(home).Property(SelectDialog)) | Window.IsVisible(filebrowser) | Window.IsVisible(virtualkeyboard) | Window.IsVisible(numericinput) | Window.IsVisible(mediasource) | Window.IsVisible(mediafilter) | Window.IsVisible(smartplaylistrule) | Window.IsVisible(addonsettings) | Window.IsVisible(osdsubtitlesettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(networksetup) | Window.IsVisible(profilesettings) | Window.IsVisible(locksettings) | Window.IsVisible(contentsettings) | Window.IsVisible(libexportsettings) | Window.IsVisible(peripheralsettings) | Window.IsVisible(osdcmssettings) | Window.IsVisible(infoprovidersettings) | Window.IsVisible(pvrtimersetting) | Window.IsVisible(gamevideofilter) | Window.IsVisible(visualisationpresetlist) | Window.IsVisible(managevideoversions) | Window.IsVisible(managevideoextras)</expression>
 	<expression name="NoPanelDialog_IsVisible">String.IsEqual(Window(home).Property(OptionsMenu),Active) | Window.IsVisible(shutdownmenu) | Window.IsVisible(contextmenu) | Window.IsVisible(okdialog) | Window.IsVisible(yesnodialog) | Window.IsVisible(progressdialog) | Window.IsVisible(10148) | Window.IsVisible(dialogcolorpicker)</expression>

diff --git a/16x9/Home.xml b/16x9/Home.xml
@@ -35,14 +35,14 @@
 			<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]</visible>
+			<visible>[Control.HasFocus(4010) | 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)" />
 		</control>
 		<!-- Video player -->
 		<include content="Embedded_VideoPlayer">
-			<param name="visible" value="[VideoPlayer.Content(livetv) + [Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible]] | String.IsEqual(Window(home).Property(Trailer_Autoplay),true)" />
+			<param name="visible" value="[VideoPlayer.Content(livetv) + [Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]] | String.IsEqual(Window(home).Property(Trailer_Autoplay),true)" />
 		</include>
 		<include content="Trailer_Autoplay_Mask" condition="Skin.HasSetting(Trailer_Autoplay)">
 			<param name="timer" value="trailer_autoplay_home" />
@@ -53,7 +53,7 @@
 			<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			<control type="group">
 				<visible>Control.HasFocus(3000) | $EXP[Music_Player_HasFocus]</visible>
-				<visible>!$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible]</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" />