From cec0a6d088e6496957289ae6478f5314fe9687a2 Mon Sep 17 00:00:00 2001
From: realcopacetic <ahekmat400@googlemail.com>
Date: Thu, 25 Apr 2024 16:59:04 +0100
Subject: [PATCH] 1180 wip

---
 16x9/Custom_1180_globalsearch.xml | 10 ++++++----
 16x9/Expressions.xml              |  2 +-
 16x9/Templates_Widgets.xml        | 16 +++++++++-------
 16x9/Variables_Paths_Widgets.xml  |  1 -
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/16x9/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml
index 24623300..cafb244e 100644
--- a/16x9/Custom_1180_globalsearch.xml
+++ b/16x9/Custom_1180_globalsearch.xml
@@ -3,13 +3,15 @@
   <!-- global search -->
   <defaultcontrol always="true">100</defaultcontrol>
   <controls>
-    <control type="image">
-      <texture colordiffuse="$VAR[AccentColor]">views/white_100.png</texture>
-      <width>200</width>
-    </control>
     <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>
   </controls>
 </window>
\ No newline at end of file
diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml
index e89508ee..deba5e90 100644
--- a/16x9/Expressions.xml
+++ b/16x9/Expressions.xml
@@ -10,7 +10,7 @@
 	<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)</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_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>
 
diff --git a/16x9/Templates_Widgets.xml b/16x9/Templates_Widgets.xml
index 0ccc8af8..7214781f 100644
--- a/16x9/Templates_Widgets.xml
+++ b/16x9/Templates_Widgets.xml
@@ -29,7 +29,7 @@
 			<control type="fixedlist" id="$PARAM[id]">
 				<visible>Integer.IsGreaterOrEqual(Container($PARAM[id]).NumItems,$PARAM[min_items]) | Container($PARAM[id]).IsUpdating | $PARAM[bypass_min_items]</visible>
 				<onfocus condition="Window.Is(home)">SetProperty(Home_Widget,$PARAM[id],home)</onfocus>
-				<onfocus condition="Window.Is(movieinformation) | Window.Is(musicinformation) | Window.Is(songinformation) | Window.Is(addoninformation)">SetProperty(Infoscreen_Widget,$PARAM[id],home)</onfocus>
+				<onfocus condition="Window.Is(movieinformation) | Window.Is(musicinformation) | Window.Is(songinformation) | Window.Is(addoninformation) | Window.Is(1180)">SetProperty(Infoscreen_Widget,$PARAM[id],home)</onfocus>
 				<onfocus>ClearProperty(Focused_Button,movieinformation)</onfocus>
 				<onfocus>ClearProperty(Focused_Button,musicinformation)</onfocus>
 				<onfocus>ClearProperty(Focused_Button,addoninformation)</onfocus>
@@ -791,19 +791,21 @@
 	<include name="globalsearch_Widget_3201_Movies">
 		<include content="Infoscreen_Widget_Template">
 			<param name="widget_view" value="Strip" />
-			<param name="widget_display" value="Fanart" />
+			<param name="widget_display" value="Posters" />
 			<param name="id" value="3201" />
 			<param name="widget_position" value="1" />
 			<param name="target" value="videos" />
 			<param name="sortby" value="random" />
 			<param name="sortorder" value="ascending" />
-			<param name="content" value="videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D" />
-			<param name="click_action" value="Open_More_From_Studio" />
+			<param name="content" value="videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22plot%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22director%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D" />
+			<!--<param name="click_action" value="Open_More_From_Studio" />-->
 			<param name="limit" value="50" />
-			<param name="widget_header" value="$INFO[Window(home).Property(StudioSplit.0)]" />
-			<param name="widget_info" value="$VAR[Copacetic_Divider_Bold,, ]$LOCALIZE[31211]" />
+			<param name="widget_header" value="hello" />
+			<param name="widget_info" value="how are you?" />
 		</include>
 	</include>
-	
 
+	<!--{"rules":{"or":[{"field":"title","operator":"contains","value":["XXXX"]},{"field":"plot","operator":"contains","value":["XXXX"]},{"field":"studio","operator":"contains","value":["XXXX"]},{"field":"plot","operator":"contains","value":["XXXX"]},{"field":"director","operator":"contains","value":["XXXX"]}]},"type":"movies"}-->
+
+	
 </includes>
\ No newline at end of file
diff --git a/16x9/Variables_Paths_Widgets.xml b/16x9/Variables_Paths_Widgets.xml
index 55a732aa..50aa8185 100644
--- a/16x9/Variables_Paths_Widgets.xml
+++ b/16x9/Variables_Paths_Widgets.xml
@@ -93,7 +93,6 @@
 		<value condition="!String.IsEmpty(Window(home).Property(RandomGenre)) + String.IsEqual(ListItem.DBType,song)">musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[Window(home).Property(RandomGenre)]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Artist]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A</value>
 		<value condition="!String.IsEmpty(ListItem.Genre) + String.IsEqual(ListItem.DBType,artist)">musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Label]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A</value>
 		<value condition="!String.IsEmpty(ListItem.Genre) + String.IsEqual(ListItem.DBType,song)">musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Artist]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A</value>
-
 	</variable>
 
 	<variable name="Path_SimilarAlbums">