globalsearch

realcopacetic · Apr 29, 2024 · 7ab6142 · 7ab6142
1 parent 0916d6c
commit 7ab6142
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 54 deletions.
diff --git a/16x9/Actions.xml b/16x9/Actions.xml
@@ -26,15 +26,15 @@
 		<param name="type" default="videos" />
 		<param name="method" default="from_here" />
 		<definition>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3201)">RunScript(script.copacetic.helper,action=play_items,id=3201,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3202)">RunScript(script.copacetic.helper,action=play_items,id=3202,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3203)">RunScript(script.copacetic.helper,action=play_items,id=3203,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3204)">RunScript(script.copacetic.helper,action=play_items,id=3204,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3205)">RunScript(script.copacetic.helper,action=play_items,id=3205,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3206)">RunScript(script.copacetic.helper,action=play_items,id=3206,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3207)">RunScript(script.copacetic.helper,action=play_items,id=3207,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3208)">RunScript(script.copacetic.helper,action=play_items,id=3208,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3209)">RunScript(script.copacetic.helper,action=play_items,id=3209,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3201)">RunScript(script.copacetic.helper,action=play_items,id=3201,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3202)">RunScript(script.copacetic.helper,action=play_items,id=3202,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3203)">RunScript(script.copacetic.helper,action=play_items,id=3203,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3204)">RunScript(script.copacetic.helper,action=play_items,id=3204,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3205)">RunScript(script.copacetic.helper,action=play_items,id=3205,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3206)">RunScript(script.copacetic.helper,action=play_items,id=3206,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3207)">RunScript(script.copacetic.helper,action=play_items,id=3207,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3208)">RunScript(script.copacetic.helper,action=play_items,id=3208,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3209)">RunScript(script.copacetic.helper,action=play_items,id=3209,type=$PARAM[type],method=$PARAM[method])</onclick>
 		</definition>
 	</include>
 
@@ -110,6 +110,11 @@
 		<onclick>ActivateWindow(music,musicdb://albums/$INFO[Container.ListItem.DBID]/-2/?albumid=$INFO[Container.ListItem.DBID],return)</onclick>
 	</include>
 
+	<include name="ClickAction_Play_All_Videos">
+		<onclick>Dialog.Close(all)</onclick>
+		<include content="Default_Play_Items" />
+	</include>
+
 	<include name="ClickAction_Play_All_Songs">
 		<include content="Default_Play_Items">
 			<param name="type" value="music" />
@@ -123,16 +128,33 @@
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0) + !String.IsEqual(Container(3201).ListItem.DBID,window(movieinformation).property(SelectedItem))">PlayMedia($ESCINFO[ListItem.Filenameandpath])</onclick>
 	</include>
 
+	<include name="ClickAction_Play_File">
+		<onclick>Dialog.Close(all)</onclick>
+		<onclick>PlayMedia($ESCINFO[ListItem.Filenameandpath])</onclick>
+	</include>
+
 	<include name="ClickAction_Open_Season_Folder">
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0)">Dialog.Close(all)</onclick>
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0)">SetProperty(SentFromInfo,true,movieinformation)</onclick>
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0)">ActivateWindow(Videos,$INFO[Container(3202).ListItem.FolderPath]/,return)</onclick>
 	</include>
 
+	<include name="ClickAction_Open_Artist">
+		<onclick>Dialog.Close(all)</onclick>
+		<onclick>SetProperty(SentFromInfo,true,musicinformation)</onclick>
+		<onclick condition="Control.HasFocus(3204)">ActivateWindow(music,musicdb://artists/$INFO[Container(3202).ListItem.DBID]/,return)</onclick>
+	</include>
+
 	<include name="ClickAction_Open_Album">
 		<onclick>Dialog.Close(all)</onclick>
 		<onclick>SetProperty(SentFromInfo,true,musicinformation)</onclick>
-		<onclick>ActivateWindow(music,musicdb://albums/$INFO[Container(3202).ListItem.DBID]/-2/,return)</onclick>
+		<onclick condition="Control.HasFocus(3202)">ActivateWindow(music,musicdb://albums/$INFO[Container(3202).ListItem.DBID]/-2/,return)</onclick>
+		<onclick condition="Control.HasFocus(3205)">ActivateWindow(music,musicdb://albums/$INFO[Container(3205).ListItem.DBID]/-2/,return)</onclick>
+	</include>
+
+	<include name="ClickAction_Open_TVShow">
+		<onclick>Dialog.Close(all)</onclick>
+		<onclick>ActivateWindow(videos,videodb://tvshows/titles/$INFO[ListItem.DBID]/,return)</onclick>
 	</include>
 
 	<include name="ClickAction_Open_Set">

diff --git a/16x9/Buttons_Infoscreen_Path_Tracer.xml b/16x9/Buttons_Infoscreen_Path_Tracer.xml
@@ -59,7 +59,7 @@
 
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">ClearProperty(ContainerPath_1,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">ClearProperty(Breadcrumb_Level,$PARAM[window])</onfocus>
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">Dialog.Close(all,true)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">Dialog.Close</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + !String.IsEmpty(Window(home).Property(Origin))">ActivateWindow(home)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + !String.IsEmpty(Window(home).Property(Origin))">SetFocus(6001)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1)">ClearProperty(Origin,home)</onfocus>
@@ -100,7 +100,7 @@
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10)">ClearProperty(ContainerPath_10,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10)">SetProperty(Breadcrumb_Level,9,$PARAM[window])</onfocus>
 
-				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">Dialog.Close(all,true)</onfocus>
+				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">Dialog.Close</onfocus>
 				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">SetFocus(6001)</onfocus>
 
 			</control>

diff --git a/16x9/Colors.xml b/16x9/Colors.xml
@@ -720,7 +720,7 @@
 		<value>$VAR[Primary_Color]</value>
 	</variable>
 	<variable name="Home_Scroll_Widget_Background_Color">
-		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground]">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground] | Control.HasFocus(4201)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + Skin.String(Widget1_View,Showcase)">$VAR[Alpha_15]$VAR[Dark_Hex]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Posters) + !String.IsEmpty(Container(3201).ListItemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Square) + !String.IsEmpty(Container(3201).ListItemNoWrap(1).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
@@ -788,7 +788,7 @@
 		<value>$VAR[Alpha_15]$VAR[Light_Hex]</value>
 	</variable>
 	<variable name="Home_Scroll_Widget_Focused_Color">
-		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground]">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground] | Control.HasFocus(4201)">$VAR[Light_Color]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + Skin.String(Widget1_View,Showcase)">$VAR[Dark_Grey_Color]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Posters) + !String.IsEmpty(Container(3201).ListItemNoWrap(2).Label)">$VAR[Light_Color]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Square) + !String.IsEmpty(Container(3201).ListItemNoWrap(1).Label)">$VAR[Light_Color]</value>
@@ -854,6 +854,26 @@
 		<value condition="Control.HasFocus(3209) + Skin.String(Widget9_View,Grid) + Skin.String(Widget9_Display,Fanart) + !String.IsEmpty(Container(3209).ListItemNoWrap(3).Label)">$VAR[Light_Color]</value>
 		<value>$VAR[Primary_Color]</value>
 	</variable>
+
+	<variable name="globalsearch_Scroll_Widget_Background_Color">
+		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3201).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3202) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3202).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3203) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3203).ListitemNoWrap(1).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3204) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3204).ListitemNoWrap(1).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3205) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3205).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3206) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3206).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value>$VAR[Alpha_15]$VAR[Dark_Hex]</value>
+	</variable>
+	<variable name="globalsearch_Scroll_Widget_Focused_Color">
+		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3201).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3202) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3202).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3203) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3203).ListitemNoWrap(1).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3204) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3204).ListitemNoWrap(1).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3205) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3205).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3206) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3206).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value>$VAR[Dark_Grey_Color]</value>
+	</variable>
+
 	<variable name="Seekbar_Background_Color">
 		<value condition="Skin.String(Theme,Light) + $EXP[visualisation_Background_IsEmpty] + Skin.String(visualisation_Layout,Large)">$VAR[Alpha_15]$VAR[Dark_Hex]</value>
 		<value>$VAR[Alpha_15]$VAR[Light_Hex]</value>

diff --git a/16x9/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1180">
   <!-- global search -->
+  <include content="Widget_Position_Reset_OnLoad" />
   <defaultcontrol always="true">3000</defaultcontrol>
   <controls>
 
@@ -32,6 +33,7 @@
       <include content="globalsearch_Widget_3205_Albums" />
       <include content="globalsearch_Widget_3206_Songs" />
       <include content="globalsearch_Scrollbar" />
-    </control>   
+    </control>
+
   </controls>
 </window>
diff --git a/16x9/Home.xml b/16x9/Home.xml
@@ -67,8 +67,9 @@
 					<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>Skin.SetString(globalsearch)</onclick> -->
+					<!-- <onclick>ActivateWindow(1180)</onclick> -->
+					<onclick>RunScript(script.copacetic.helper,action=globalsearch_input)</onclick>
 					<include content="globalsearch_home_Navigation" />
 				</control>
 				<include content="Clock" condition="!Skin.HasSetting(Hide_Home_Clock)">