🐛 Some fixes for spotlight no categories

jurialmunkey · Mar 9, 2024 · f512349 · f512349
1 parent a7c96ce
commit f512349
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/1080i/Custom_1116_Dialog_Shortcuts.xml b/1080i/Custom_1116_Dialog_Shortcuts.xml
@@ -169,7 +169,7 @@
                                 <onback>29999</onback>
                                 <onclick condition="String.IsEmpty(Container(22001).ListItem.Property(forced)) + !String.IsEqual(Container(22001).ListItem.Property(disabled),True) + !$EXP[Exp_Hubs_Shortcuts_IsWidgetMode]">SetProperty(Shortcuts.Groupings.Links,Links,Home)</onclick>
                                 <onclick condition="String.IsEmpty(Container(22001).ListItem.Property(forced)) + !String.IsEqual(Container(22001).ListItem.Property(disabled),True) + $EXP[Exp_Hubs_Shortcuts_IsWidgetMode]">ClearProperty(Shortcuts.Groupings.Links,Home)</onclick>
-                                <onclick condition="String.IsEmpty(Container(22001).ListItem.Property(forced)) + !String.IsEqual(Container(22001).ListItem.Property(disabled),True)">RunPlugin($INFO[Container(22001).ListItem.Property(url),,&amp;func=do_choose]$VAR[Path_Shortcut_UseRawPath])</onclick>
+                                <onclick condition="String.IsEmpty(Container(22001).ListItem.Property(forced)) + !String.IsEqual(Container(22001).ListItem.Property(disabled),True)">RunPlugin($INFO[Container(22001).ListItem.Property(url),,&amp;func=do_choose]$VAR[Path_Shortcut_UseRawPath]$VAR[Path_Shortcut_UseCategory])</onclick>
                                 <onright>23000</onright>
 
                                 <onclick condition="String.IsEqual(Container(22001).ListItem.Property(disabled),True)">RunPlugin($INFO[Container(22001).ListItem.Property(url),,&amp;func=do_toggle])</onclick>

diff --git a/1080i/Includes_Shortcuts_Window.xml b/1080i/Includes_Shortcuts_Window.xml
@@ -184,6 +184,7 @@
                 <animation effect="slide" end="-240" condition="Integer.IsLess(Container(302).NumItems,3)">Conditional</animation>
                 <onclick>SetFocus(1302)</onclick>
                 <visible>String.IsEmpty(Container(300).ListItem.Property(submenulist_path))</visible>
+                <visible>!String.IsEmpty(Container(300).ListItem.Property(guid))</visible>
                 <content>plugin://script.skinvariables/?info=get_shortcuts_node&amp;edit=True&amp;mode=submenu&amp;skin=$VAR[Path_SkinVariables_SkinFolder]$INFO[Container(300).ListItem.Property(menu),&amp;menu=,]$INFO[Container(300).ListItem.Property(guid),&amp;guid=,]$INFO[Window(Home).Property(SkinVariables.ShortcutsNode.Reload),&amp;reload=,]</content>
             </include>
 
@@ -229,18 +230,6 @@
             <left>160</left>
             <top>600</top>
             <bottom>100</bottom>
-            <!-- <include content="Settings_Label">
-                <top>-20</top>
-                <label>$LOCALIZE[31026] > $INFO[Window.Property(hub_prefix)] > $INFO[Container(300).ListItem.Label,, ]$LOCALIZE[31103]$INFO[Container(304).NumItems, (,)]</label>
-                <visible>!$EXP[Shortcuts_Window_Exp_WidgetsOnly]</visible>
-                <visible>String.IsEmpty(Container(300).ListItem.Property(global_widgets))</visible>
-            </include>
-            <include content="Settings_Label">
-                <top>-20</top>
-                <label>$LOCALIZE[31026] > $INFO[Window.Property(hub_prefix)] > $LOCALIZE[31514]$INFO[Container(304).NumItems, (,)]</label>
-                <visible>!$EXP[Shortcuts_Window_Exp_WidgetsOnly]</visible>
-                <visible>!String.IsEmpty(Container(300).ListItem.Property(global_widgets))</visible>
-            </include> -->
             <include content="List_DialogSelect">
                 <param name="id">304</param>
                 <param name="item_height">100</param>
@@ -267,6 +256,7 @@
                 <onclick>SetFocus(1304)</onclick>
 
                 <visible>!$EXP[Shortcuts_Window_Exp_WidgetsOnly]</visible>
+                <visible>!String.IsEmpty(Container(300).ListItem.Property(guid))</visible>
 
             </include>
         </control>
@@ -276,27 +266,6 @@
             <top>200</top>
             <bottom>100</bottom>
 
-            <!-- <include content="Settings_Label">
-                <top>-20</top>
-                <label>$LOCALIZE[31027] > $INFO[Container(303).ListItem.Label]$INFO[Container(304).NumItems, (,)]</label>
-                <visible>$EXP[Shortcuts_Window_Exp_WidgetsOnly]</visible>
-                <visible>[Skin.HasSetting(Hub.Home.DisableSubmenu) + String.IsEqual(Window.Property(categories_menu),menu=homemenu)]</visible>
-                <visible>String.IsEmpty(Container(303).ListItem.Property(global_widgets))</visible>
-            </include>
-            <include content="Settings_Label">
-                <top>-20</top>
-                <label>$LOCALIZE[31027] > $LOCALIZE[31031]$INFO[Container(304).NumItems, (,)]</label>
-                <visible>$EXP[Shortcuts_Window_Exp_WidgetsOnly]</visible>
-                <visible>[Skin.HasSetting(Hub.Home.DisableSubmenu) + String.IsEqual(Window.Property(categories_menu),menu=homemenu)]</visible>
-                <visible>!String.IsEmpty(Container(303).ListItem.Property(global_widgets))</visible>
-            </include>
-            <include content="Settings_Label">
-                <top>-20</top>
-                <label>$LOCALIZE[31027] > $LOCALIZE[31026] $INFO[Window.Property(hub_prefix)]$INFO[Container(304).NumItems, (,)]</label>
-                <visible>$EXP[Shortcuts_Window_Exp_WidgetsOnly]</visible>
-                <visible>![Skin.HasSetting(Hub.Home.DisableSubmenu) + String.IsEqual(Window.Property(categories_menu),menu=homemenu)]</visible>
-            </include> -->
-
             <include content="List_DialogSelect">
                 <param name="id">304</param>
                 <param name="item_height">100</param>

diff --git a/1080i/Includes_Spotlight.xml b/1080i/Includes_Spotlight.xml
@@ -204,7 +204,9 @@
                         <param name="onback">!Control.HasFocus(311)</param>
                     </include>
 
-                    <ondown>300</ondown>
+                    <ondown condition="!Integer.IsEqual(Container(300).NumItems,0)">300</ondown>
+                    <ondown condition="Integer.IsEqual(Container(300).NumItems,0)">SetProperty(List.ViewContainer,$NUMBER[311])</ondown>
+                    <ondown condition="Integer.IsEqual(Container(300).NumItems,0)">333</ondown>
                     <centertop>180</centertop>
                     <left>140</left>
                     <height>256</height>

diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <addon id="skin.arctic.fuse" name="Arctic Fuse" provider-name="jurialmunkey" version="0.5.03~omega">
     <requires>
         <import addon="xbmc.gui" version="5.17.0" />
-        <import addon="script.skinvariables" version="2.1.5" />
+        <import addon="script.skinvariables" version="2.1.6" />
         <import addon="script.texturemaker" version="0.2.9" />
         <import addon="plugin.video.themoviedb.helper" version="5.2.17~nexus" />
         <import addon="resource.images.weathericons.white" version="0.0.1" />