0.9.10 - rewrite multiwidget code

jurialmunkey · Mar 19, 2019 · 5714c9e · 5714c9e
1 parent bb7aedc
commit 5714c9e
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 121 deletions.
diff --git a/1080i/Home.xml b/1080i/Home.xml
@@ -17,13 +17,31 @@
     <onunload condition="!Control.HasFocus(301) + [Window.Next(VideoFullScreen.xml) | Window.Next(MusicVisualisation.xml)]">SetFocus(301)</onunload>
     <onload condition="Window.Previous(VideoFullScreen.xml) | Window.Previous(MusicVisualisation.xml)">SetFocus(301)</onload>
 
-    <onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;mode=single&amp;group=mainmenu|powermenu)</onload>
+    <onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;levels=1&amp;group=mainmenu|powermenu)</onload>
 
     <onload condition="String.IsEmpty(Window(Home).Property(SkinSplashStarted))">AlarmClock(SkinSplashStarted,SetProperty(SkinSplashStarted,1,home),00:01,silent,false)</onload>
 
     <onunload>ClearProperty(SkinHelper.WidgetContainer)</onunload>
 
     <controls>
+        <control type="list" id="9989">
+            <description>hidden container for widget count</description>
+            <posx>-20</posx>
+            <posy>-20</posy>
+            <width>1</width>
+            <height>1</height>
+            <visible>true</visible>
+            <onup>50</onup>
+            <ondown>50</ondown>
+            <onleft>50</onleft>
+            <onright>50</onright>
+            <autoscroll time="10000">true</autoscroll>
+            <itemlayout width="1" height="1">
+            </itemlayout>
+            <focusedlayout height="1" width="1">
+            </focusedlayout>
+            <content><include>skinshortcuts-submenu-1</include></content>
+        </control>
         <control type="list" id="9988">
             <description>hidden container for playlist background</description>
             <posx>-20</posx>

diff --git a/1080i/Includes_Home.xml b/1080i/Includes_Home.xml
@@ -860,8 +860,8 @@
                         <itemgap>-52</itemgap>
                         <usecontrolcoords>true</usecontrolcoords>
                         <control type="group" id="7999"><height>0</height></control>
-                        <include>skinshortcuts-template-vertical-main</include>
                         <include>skinshortcuts-template-vertical-submenu</include>
+                        <include>skinshortcuts-template-vertical-main</include>
                     </control>
                     <control type="group">
                         <visible>Integer.IsEqual(Container(3000).NumItems,1)</visible>
@@ -880,8 +880,20 @@
                         <control type="group">
                             <width>1500</width>
                             <visible>!ControlGroup(3000).HasFocus()</visible>
+                            <visible>!Control.IsVisible(993100)</visible>
                             <include>skinshortcuts-template-vertical-info</include>
                         </control>
+                        <control type="group">
+                            <width>1500</width>
+                            <visible>!ControlGroup(3000).HasFocus()</visible>
+                            <visible>Control.IsVisible(993100)</visible>
+                            <include content="Home_Vertical_Info">
+                                <param name="font" value="font_title" />
+                                <param name="plotheight" value="160" />
+                                <param name="titleheight" value="60" />
+                                <param name="id" value="993100" />
+                            </include>
+                        </control>
                     </control>
                 </control>
             </control>
@@ -949,8 +961,8 @@
                     <itemgap>-52</itemgap>
                     <usecontrolcoords>true</usecontrolcoords>
                     <control type="group" id="7999"><height>0</height></control>
-                    <include>skinshortcuts-template-vertical-main</include>
                     <include>skinshortcuts-template-vertical-submenu</include>
+                    <include>skinshortcuts-template-vertical-main</include>
                 </control>
                 <control type="group">
                     <visible>Integer.IsEqual(Container(3000).NumItems,1)</visible>
@@ -968,8 +980,19 @@
                     </control>
                     <control type="group">
                         <visible>!ControlGroup(3000).HasFocus()</visible>
+                        <visible>!Control.IsVisible(993100)</visible>
                         <include>skinshortcuts-template-vertical-info</include>
                     </control>
+                    <control type="group">
+                        <visible>!ControlGroup(3000).HasFocus()</visible>
+                        <visible>Control.IsVisible(993100)</visible>
+                        <include content="Home_Vertical_Info">
+                            <param name="font" value="font_title" />
+                            <param name="plotheight" value="160" />
+                            <param name="titleheight" value="60" />
+                            <param name="id" value="993100" />
+                        </include>
+                    </control>
                 </control>
             </control>
         </control>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -18,8 +18,8 @@
     </variable>
 
     <variable name="Label_SkinShortcuts_SubmenuWidget">
-        <value condition="Skin.HasSetting(VerticalHome)">$LOCALIZE[31010]</value>
-        <value>$LOCALIZE[31038]</value>
+        <value condition="String.EndsWith(Window.Property(groupname),.1)">$LOCALIZE[31011]</value>
+        <value>$LOCALIZE[31038] - $LOCALIZE[31011]</value>
     </variable>
 
     <variable name="Label_WidgetName">

diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
@@ -1,7 +1,7 @@
 <window>
     <defaultcontrol always="true">300</defaultcontrol>
     <include>Defs_Settings_OnLoad</include>
-    <onunload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;mode=single&amp;group=mainmenu|powermenu)</onunload>
+    <onunload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;levels=1&amp;group=mainmenu|powermenu)</onunload>
     <onunload condition="System.HasAddon(script.colorbox)">SetProperty(NINE_manual_set,"var=main,set=$INFO[Skin.String(colorbox_main)]|var=comp,set=$INFO[Skin.String(colorbox_comp)]|var=quality,set=$INFO[Skin.String(colorbox_quality)]|var=blursize,set=$INFO[Skin.String(colorbox_blursize)]|var=bitsize,set=$INFO[Skin.String(colorbox_bitsize)]|var=pixelsize,set=$INFO[Skin.String(colorbox_pixelsize)]|var=black,set=$INFO[Skin.String(colorbox_black)]|var=white,set=$INFO[Skin.String(colorbox_white)]|var=blend,set=$INFO[Skin.String(colorbox_blend)]|var=desat,set=$INFO[Skin.String(colorbox_desat)]",home)</onunload> 
     <onload condition="String.IsEmpty(Window.Property(CurrentFocus))">SetProperty(CurrentFocus,$NUMBER[9001])</onload>
     <controls>