[globalsearch] bump version to 9.0.4 and adjust skin files

xperience1080 · Nov 15, 2023 · b43b946 · b43b946
1 parent 8e37388
commit b43b946
Show file tree

Hide file tree

Showing 10 changed files with 1,274 additions and 3,945 deletions.
diff --git a/1080i/DialogFavourites.xml b/1080i/DialogFavourites.xml
@@ -7,7 +7,7 @@
     <onload condition="!Control.IsVisible(63)">PreviousMenu</onload>
     <controls>
         <control type="group" id="63">
-            <visible>!Window.IsActive(movieinformation) + !Window.IsActive(musicinformation) + !Window.IsActive(songinformation) + !Window.IsActive(addoninformation) + !Window.IsActive(script-globalsearch-main.xml) + !Window.IsActive(fullscreenvideo) + !Window.IsActive(visualisation) + !Window.IsActive(selectdialog) + !Window.IsActive(filebrowser) + !Window.IsActive(yesnodialog) + !Window.IsActive(progressdialog) + !Window.IsActive(virtualkeyboard) + ![Window.IsActive(contextmenu) + !Control.IsVisible(63)] + !Window.IsActive(numericinput) + !Window.IsActive(playercontrols) + !Window.IsActive(networksetup) + !Window.IsActive(mediasource) + !Window.IsActive(locksettings) + !Window.IsActive(contentsettings) + !Window.IsActive(visualisation) + !Window.IsActive(smartplaylisteditor) + !Window.IsActive(pictureinfo) + !Window.IsActive(addonsettings) + !Window.IsActive(sliderdialog) + !Window.IsActive(textviewer) + !Window.IsActive(mediafilter) + !Window.IsActive(pvrguideinfo) + !Window.IsActive(pvrrecordinginfo) + !Window.IsActive(pvrtimersetting) + !Window.IsActive(pvrgroupmanager) + !Window.IsActive(pvrchannelmanager) + !Window.IsActive(pvrguidesearch) + !Window.IsActive(okdialog) + !Window.IsActive(1122) + !Window.IsActive(3020) + !Window.IsActive(3021) + !Window.IsActive(3022) + !Window.IsActive(3023) + !Window.IsActive(3001) + !Window.IsActive(3002) + !Window.IsActive(3003) + !Window.IsActive(3006)</visible>
+            <visible>!Window.IsActive(movieinformation) + !Window.IsActive(musicinformation) + !Window.IsActive(songinformation) + !Window.IsActive(addoninformation) + !Window.IsActive(script-globalsearch.xml) + !Window.IsActive(fullscreenvideo) + !Window.IsActive(visualisation) + !Window.IsActive(selectdialog) + !Window.IsActive(filebrowser) + !Window.IsActive(yesnodialog) + !Window.IsActive(progressdialog) + !Window.IsActive(virtualkeyboard) + ![Window.IsActive(contextmenu) + !Control.IsVisible(63)] + !Window.IsActive(numericinput) + !Window.IsActive(playercontrols) + !Window.IsActive(networksetup) + !Window.IsActive(mediasource) + !Window.IsActive(locksettings) + !Window.IsActive(contentsettings) + !Window.IsActive(visualisation) + !Window.IsActive(smartplaylisteditor) + !Window.IsActive(pictureinfo) + !Window.IsActive(addonsettings) + !Window.IsActive(sliderdialog) + !Window.IsActive(textviewer) + !Window.IsActive(mediafilter) + !Window.IsActive(pvrguideinfo) + !Window.IsActive(pvrrecordinginfo) + !Window.IsActive(pvrtimersetting) + !Window.IsActive(pvrgroupmanager) + !Window.IsActive(pvrchannelmanager) + !Window.IsActive(pvrguidesearch) + !Window.IsActive(okdialog) + !Window.IsActive(1122) + !Window.IsActive(3020) + !Window.IsActive(3021) + !Window.IsActive(3022) + !Window.IsActive(3023) + !Window.IsActive(3001) + !Window.IsActive(3002) + !Window.IsActive(3003) + !Window.IsActive(3006)</visible>
             <control type="group">
                 <posx>75</posx>
                 <posy>26</posy>

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
@@ -22,7 +22,6 @@
     <include file="Includes_DialogConfirm.xml" />
     <include file="Includes_Dialogs.xml" />
     <include file="Includes_DialogSettings.xml" />
-    <include file="Includes_GlobalSearch.xml" />
     <include file="Includes_Weather.xml" />
     <include file="Includes_PVR.xml" />
 

diff --git a/1080i/Includes_GlobalSearch.xml b/1080i/Includes_GlobalSearch.xml
diff --git a/1080i/Includes_HomeCommons.xml b/1080i/Includes_HomeCommons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <expression name="HomeHideOnActiveDialog">!Window.IsActive(movieinformation) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) + !Window.IsActive(script-globalsearch-main.xml) + !Window.IsActive(script-globalsearch-infodialog.xml) + !Window.IsActive(script-globalsearch-contextmenu.xml) + ![Window.IsVisible(virtualkeyboard) + !String.IsEmpty(Window.Property(HomeSearch))]</expression>
+    <expression name="HomeHideOnActiveDialog">!Window.IsActive(movieinformation) + !Window.IsActive(musicinformation) + !Window.IsActive(favourites) + !Window.IsActive(script-globalsearch.xml) + ![Window.IsVisible(virtualkeyboard) + !String.IsEmpty(Window.Property(HomeSearch))]</expression>
 
     <include name="FocusPosition">
         <focusposition>$PARAM[value]</focusposition>
@@ -81,7 +81,7 @@
                 <onclick>ActivateWindow(ShutdownMenu)</onclick>
                 <include>Animation_ShutdownButton</include>
                 <include>homebuttonsanim</include>
-                <visible allowhiddenfocus="true">!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch-main.xml) + !Window.IsVisible(script-globalsearch-infodialog.xml) + !Window.IsVisible(script-globalsearch-contextmenu.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
+                <visible allowhiddenfocus="true">!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
             </control>
             <control type="label">
                 <description>Shutdown Label</description>
@@ -96,7 +96,7 @@
                 <scroll>false</scroll>
                 <include>Animation_ShutdownButton</include>
                 <include>homebuttonsanim2</include>
-                <visible>!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch-main.xml) + !Window.IsVisible(script-globalsearch-infodialog.xml) + !Window.IsVisible(script-globalsearch-contextmenu.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
+                <visible>!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
             </control>
             <control type="button" id="22">
                 <description>Favourites Button</description>
@@ -132,7 +132,7 @@
                 <include>Animation_FavButton</include>
                 <include>homebuttonsanim3</include>
                 <visible>!Skin.HasSetting(KioskMode)</visible>
-                <visible allowhiddenfocus="true">!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch-main.xml) + !Window.IsVisible(script-globalsearch-infodialog.xml) + !Window.IsVisible(script-globalsearch-contextmenu.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
+                <visible allowhiddenfocus="true">!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
             </control>
             <control type="label">
                 <description>Favourites Label</description>
@@ -148,7 +148,7 @@
                 <include>Animation_FavButton</include>
                 <include>homebuttonsanim4</include>
                 <visible>!Skin.HasSetting(KioskMode)</visible>
-                <visible>!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch-main.xml) + !Window.IsVisible(script-globalsearch-infodialog.xml) + !Window.IsVisible(script-globalsearch-contextmenu.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
+                <visible>!Window.IsVisible(favourites) + !Window.IsVisible(script-globalsearch.xml) + !Window.IsVisible(virtualkeyboard) + String.IsEmpty(Window.Property(HomeSearch)) + !Window.IsVisible(playercontrols) + !Window.IsActive(movieinformation)</visible>
             </control>
         </control>
     </include>

diff --git a/1080i/Includes_WindowContents.xml b/1080i/Includes_WindowContents.xml
@@ -214,7 +214,7 @@
             <texture background="true">fade/overlay.png</texture>
             <animation effect="fade" time="300" start="0" end="100" tween="sine" easing="out">Visible</animation>
             <animation effect="fade" time="300" start="100" end="0" tween="sine" easing="in">Hidden</animation>
-            <visible>[Window.IsActive(songinformation) | Window.IsActive(contentsettings) | Window.IsActive(addonsettings) | Window.IsActive(filebrowser) | [Window.IsActive(virtualkeyboard) + String.IsEmpty(Window(Home).Property(HomeSearch))] | Window.IsActive(playercontrols) | Window.IsActive(profilesettings) | Window.IsActive(selectdialog) | Window.IsActive(progressdialog) | Window.IsActive(mediasource) | Window.IsActive(screencalibration) | Window.IsActive(numericinput) | Window.IsActive(LockSettings) | Window.IsActive(smartplaylisteditor) | Window.IsActive(smartplaylistrule) | Window.IsActive(pictureinfo) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(3001) | Window.IsActive(3002) | Window.IsActive(3003) | Window.IsActive(3006) | Window.IsActive(peripheralsettings) | Window.IsActive(mediafilter) | Window.IsActive(mediafilter) | Window.IsActive(pvrgroupmanager) | Window.IsActive(pvrtimersetting) | Window.IsActive(pvrguidesearch) | Window.IsActive(pvrchannelmanager) | Window.IsActive(DialogSelect.xml) | Window.IsActive(yesnodialog) | Window.IsActive(okdialog) | ControlGroup(9000).HasFocus() | [Window.IsActive(contextmenu) + [Window.IsActive(favourites) | [!Window.IsActive(filemanager) + !Window.IsActive(home)]]]] + !Window.IsActive(movieinformation) + !Window.IsActive(1122) + !Window.IsActive(addoninformation) + !Window.IsActive(musicinformation) + !Window.IsActive(script-globalsearch-infodialog.xml) + !Window.IsActive(musicplaylisteditor) + !Window.IsActive(DialogPVRInfo.xml)</visible>
+            <visible>[Window.IsActive(songinformation) | Window.IsActive(contentsettings) | Window.IsActive(addonsettings) | Window.IsActive(filebrowser) | [Window.IsActive(virtualkeyboard) + String.IsEmpty(Window(Home).Property(HomeSearch))] | Window.IsActive(playercontrols) | Window.IsActive(profilesettings) | Window.IsActive(selectdialog) | Window.IsActive(progressdialog) | Window.IsActive(mediasource) | Window.IsActive(screencalibration) | Window.IsActive(numericinput) | Window.IsActive(LockSettings) | Window.IsActive(smartplaylisteditor) | Window.IsActive(smartplaylistrule) | Window.IsActive(pictureinfo) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(3001) | Window.IsActive(3002) | Window.IsActive(3003) | Window.IsActive(3006) | Window.IsActive(peripheralsettings) | Window.IsActive(mediafilter) | Window.IsActive(mediafilter) | Window.IsActive(pvrgroupmanager) | Window.IsActive(pvrtimersetting) | Window.IsActive(pvrguidesearch) | Window.IsActive(pvrchannelmanager) | Window.IsActive(DialogSelect.xml) | Window.IsActive(yesnodialog) | Window.IsActive(okdialog) | ControlGroup(9000).HasFocus() | [Window.IsActive(contextmenu) + [Window.IsActive(favourites) | [!Window.IsActive(filemanager) + !Window.IsActive(home)]]]] + !Window.IsActive(movieinformation) + !Window.IsActive(1122) + !Window.IsActive(addoninformation) + !Window.IsActive(musicinformation) + !Window.IsActive(musicplaylisteditor) + !Window.IsActive(DialogPVRInfo.xml)</visible>
         </control>
     </include>
     <include name="FadeBackgroundPVRInfo">

diff --git a/1080i/script-globalsearch-contextmenu.xml b/1080i/script-globalsearch-contextmenu.xml
diff --git a/1080i/script-globalsearch-infodialog.xml b/1080i/script-globalsearch-infodialog.xml