✨ Proper indication of more groups available

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

Hide file tree

Showing 6 changed files with 70 additions and 6 deletions.
diff --git a/1080i/Custom_1181_VideoInfo_Recommendations.xml b/1080i/Custom_1181_VideoInfo_Recommendations.xml
@@ -95,8 +95,12 @@
                         <visible>!Integer.IsEqual(Container(5000).NumItems,0)</visible>
                         <visible>!Integer.IsEqual(Container(5000).NumItems,1) | !Control.HasFocus(5098) | ControlGroup(5000).HasFocus()</visible>
                         <visible>!$EXP[Exp_InfoDialogs]</visible>
-                        <include>Furniture_Bottom_Left</include>
-                        <include>Furniture_Bottom_Right</include>
+                        <!-- <include>Furniture_Bottom_Left</include>
+                        <include>Furniture_Bottom_Right</include> -->
+                        <include content="Furniture_Bottom_WidgetGroups">
+                            <param name="toplabel">[CAPITALIZE]$LOCALIZE[19320][/CAPITALIZE]: $LOCALIZE[16018]</param>
+                            <param name="sublabel">$LOCALIZE[31339]</param>
+                        </include>
                     </control>
                 </control>
 

diff --git a/1080i/Includes_Furniture.xml b/1080i/Includes_Furniture.xml
@@ -68,6 +68,41 @@
         </definition>
     </include>
 
+    <include name="Furniture_Bottom_WidgetGroups">
+        <param name="toplabel">$VAR[Label_NextWidget_Top]</param>
+        <param name="sublabel">$VAR[Label_NextWidget_Sub]</param>
+        <definition>
+            <include content="Furniture_Bottombar_Group">
+                <include content="Furniture_Gutters">
+                    <control type="group">
+                        <control type="group">
+                            <top>-5</top>
+                            <height>35</height>
+                            <include content="Info_Viewline">
+                                <param name="sort_condition">false</param>
+                                <param name="library_condition">false</param>
+                                <param name="label">$PARAM[toplabel]</param>
+                                <top>0</top>
+                                <left>0</left>
+                                <animation effect="fade" start="100" end="30" time="200" condition="True">Conditional</animation>
+                            </include>
+                        </control>
+                        <control type="group">
+                            <bottom>-10</bottom>
+                            <height>40</height>
+                            <control type="label">
+                                <font>font_tiny</font>
+                                <textcolor>main_fg_30</textcolor>
+                                <label>$PARAM[sublabel]</label>
+                                <height>35</height>
+                            </control>
+                        </control>
+                    </control>
+                </include>
+            </include>
+        </definition>
+    </include>
+
     <include name="Furniture_NowPlaying">
         <control type="group">
             <visible>Player.HasMedia</visible>

diff --git a/1080i/Includes_Hubs.xml b/1080i/Includes_Hubs.xml
@@ -523,8 +523,9 @@
                     <visible>!Integer.IsEqual(Container($PARAM[id]).NumItems,1) | [!Control.HasFocus($PARAM[topid]) + !Control.HasFocus($PARAM[bottomid])]</visible>
                     <visible>!Integer.IsEqual(Container($PARAM[id]).NumItems,2) | ControlGroup($PARAM[id]).HasFocus()</visible>
                     <visible>!$EXP[Exp_InfoDialogs]</visible>
-                    <include condition="!Skin.HasSetting(Hubs.WidgetSelector)">Furniture_Bottom_Left</include>
-                    <include>Furniture_Bottom_Right</include>
+                    <!-- <include condition="!Skin.HasSetting(Hubs.WidgetSelector)">Furniture_Bottom_Left</include> -->
+                    <!-- <include>Furniture_Bottom_Right</include> -->
+                    <include>Furniture_Bottom_WidgetGroups</include>
                 </control>
             </control>
         </control>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -14,6 +14,18 @@
         <value condition="String.IsEqual(Window(Home).Property(ColorPicker_Type),mid_season_finale)">$LOCALIZE[31218]</value>
     </variable>
 
+    <variable name="Label_NextWidget_Top">
+        <value condition="!String.IsEmpty(Container(303).ListItemNoWrap(1).Label) + Window.IsVisible(Home) + Skin.HasSetting(Hub.Home.DisableSubmenu) + !Skin.HasSetting(Hub.Home.DisableMoveBetweenGroups)">[CAPITALIZE]$LOCALIZE[19320][/CAPITALIZE]: $INFO[Container(303).ListItemNoWrap(1).Label]</value>
+        <value condition="Skin.String(Navigation.OnDown,Explore)">[CAPITALIZE]$LOCALIZE[19320][/CAPITALIZE]: $LOCALIZE[31148]</value>
+        <value>[CAPITALIZE]$LOCALIZE[19320][/CAPITALIZE]: $LOCALIZE[16018]</value>
+    </variable>
+
+    <variable name="Label_NextWidget_Sub">
+        <value condition="!String.IsEmpty(Container(303).ListItemNoWrap(1).Label) + Window.IsVisible(Home) + Skin.HasSetting(Hub.Home.DisableSubmenu) + !Skin.HasSetting(Hub.Home.DisableMoveBetweenGroups)">$LOCALIZE[31333]</value>
+        <value condition="Skin.String(Navigation.OnDown,Explore)">$LOCALIZE[31276]</value>
+        <value>$LOCALIZE[31339]</value>
+    </variable>
+
     <variable name="Label_SkinVariables_FilterPath">
         <value condition="String.IsEqual(Window(Home).Property(Shortcuts.Category),Global)">$LOCALIZE[31313]</value>
         <value condition="String.StartsWith(Window(Home).Property(Shortcuts.Category),guid-)">$LOCALIZE[31317]</value>

diff --git a/1080i/Includes_Settings.xml b/1080i/Includes_Settings.xml
@@ -126,17 +126,18 @@
         <param name="dialog">false</param>
         <param name="left">0</param>
         <param name="centerbottom">20</param>
+        <param name="visible">true</param>
         <definition>
             <control type="group">
                 <height>80</height>
                 <centerbottom>$PARAM[centerbottom]</centerbottom>
                 <left>$PARAM[left]</left>
+                <visible>$PARAM[visible]</visible>
                 <include content="Info_FooterItemIcon">
                     <param name="icon">special://skin/extras/icons/kodi.png</param>
                     <param name="centered">false</param>
                     <param name="size">50</param>
                     <param name="bordersize">1</param>
-                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <control type="label">
                     <left>80</left>
@@ -145,7 +146,6 @@
                         <param name="textcolor">dialog_fg_90</param>
                     </include>
                     <include>Defs_Label_FooterItem</include>
-                    <visible>$PARAM[visible]</visible>
                 </control>
             </control>
         </definition>
@@ -155,9 +155,11 @@
         <param name="dialog">false</param>
         <param name="left">0</param>
         <param name="centerbottom">20</param>
+        <param name="visible">true</param>
         <definition>
             <control type="group">
                 <height>80</height>
+                <visible>$PARAM[visible]</visible>
                 <centerbottom>$PARAM[centerbottom]</centerbottom>
                 <left>$PARAM[left]</left>
                 <include>Info_KodiLogo_Image</include>

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
@@ -1577,6 +1577,11 @@ msgctxt "#31332"
 msgid "New search"
 msgstr ""
 
+#: /1080i/Includes_Labels.xml
+msgctxt "#31333"
+msgid "Press down to view next widget group"
+msgstr ""
+
 msgctxt "#31334"
 msgid "Comments"
 msgstr ""
@@ -1601,6 +1606,11 @@ msgctxt "#31338"
 msgid "Select + Right Stick"
 msgstr ""
 
+#: /1080i/Includes_Labels.xml
+msgctxt "#31339"
+msgid "No further widget groups available"
+msgstr ""
+
 #: /1080i/SkinSettings.xml
 msgctxt "#31340"
 msgid "Reset skin to defaults"