Menu RApido Multilivello

2020-05-14 18:01:46 +02:00
parent f6daf71b46
commit ae031e3793
3 changed files with 69 additions and 20 deletions
--- a/platformcode/keymaptools.py
+++ b/platformcode/keymaptools.py
@@ -81,32 +81,37 @@ def delete_key():

    config.set_setting("shortcut_key", '')

-MAIN_MENU = channelselector.getmainlist()
+

 class Main(xbmcgui.WindowXMLDialog):
    def __init__(self, *args, **kwargs):
        self.items = []
+        logger.info(str(args))
+        logger.info(str(kwargs))

    def onInit(self):
        #### Compatibilidad con Kodi 18 ####
        if config.get_platform(True)['num_version'] < 18:
            self.setCoordinateResolution(2)

-        for menuentry in MAIN_MENU:
+        for menuentry in menu:
            item = xbmcgui.ListItem(menuentry.title)
-            item.setProperty("thumb", menuentry.thumbnail)
-            action = {"channel" : menuentry.channel, "action" : menuentry.action}
-            item.setProperty("action", base64.b64encode(json.dumps(action).encode()))
-            self.items.append(item)
+            if not submenu and menuentry.channel in ['news', 'channelselector', 'search', 'videolibrary']:
+                item.setProperty('sub', 'Controls/spinUp-Focus.png')
+            if menuentry.title != 'Redirect':
+                for key, value in json.loads(menuentry.tojson()).items():
+                    item.setProperty(key, str(value))
+                item.setProperty('run', menuentry.tojson())
+                self.items.append(item)

        self.getControl(32500).addItems(self.items)
        self.setFocusId(32500)

    def onClick(self, control_id):
        if control_id == 32500:
-            action = self.getControl(32500).getSelectedItem().getProperty("action")
+            action = self.getControl(32500).getSelectedItem().getProperty('run')
            xbmc.executebuiltin('Dialog.Close(all,true)')
-            xbmc.executebuiltin('ActivateWindow(10025, "plugin://plugin.video.kod/?' + action + '")')
+            xbmc.executebuiltin('ActivateWindow(10025, "plugin://plugin.video.kod/?' + base64.b64encode(action) + '")')



@@ -114,15 +119,42 @@ class Main(xbmcgui.WindowXMLDialog):
        # exit
        if action.getId() in [xbmcgui.ACTION_PREVIOUS_MENU, xbmcgui.ACTION_NAV_BACK]:
            xbmc.executebuiltin('Dialog.Close(all,true)')
+            if submenu: open_shortcut_menu()

        if action.getId() == xbmcgui.ACTION_CONTEXT_MENU:
            config.open_settings()

+        if action == 3:
+            if submenu:
+                xbmc.executebuiltin('Dialog.Close(all,true)')
+                open_shortcut_menu()
+            elif self.getControl(32500).getSelectedItem().getProperty('channel') in ['news', 'channelselector', 'search', 'videolibrary']:
+                channel_name = self.getControl(32500).getSelectedItem().getProperty('channel')
+                if channel_name == 'channelselector':
+                    import channelselector
+                    xbmc.executebuiltin('Dialog.Close(all,true)')
+                    open_shortcut_menu(channelselector.getchanneltypes())
+                else:
+                    from core.item import Item
+                    channel = __import__('specials.%s' % channel_name, fromlist=["specials.%s" % channel_name])
+                    xbmc.executebuiltin('Dialog.Close(all,true)')
+                    open_shortcut_menu(channel.mainlist(Item().fromjson(action)))

-def open_shortcut_menu():
+
+
+def open_shortcut_menu(newmenu=''):
+    global menu
+    global submenu
+    if newmenu:
+        menu = newmenu
+        submenu = True
+    else:
+        menu = channelselector.getmainlist()
+        submenu = False
    XML =  'ShortCutMenu.xml'
    if config.get_setting('icon_set') == 'dark':
        XML = 'Dark' + XML
+    xbmc.executebuiltin('Dialog.Close(all,true)')
    main = Main(XML, config.get_runtime_path())
    main.doModal()
    del main
--- a/resources/skins/Default/720p/DarkShortCutMenu.xml
+++ b/resources/skins/Default/720p/DarkShortCutMenu.xml
@@ -7,12 +7,12 @@
 	</coordinates>
 	<defaultcontrol always="true">32500</defaultcontrol>
 	<animation type="WindowOpen" reversible="false">
-		<effect type="zoom" start="80" end="100" center="440,110" delay="160" tween="back" time="240" />
-		<effect type="fade" delay="160" end="100" time="240" />
+		<effect type="slide" start="0,100" end="0,0" center="640,225" delay="160" tween="cubic" time="200" />
+		<effect type="fade" delay="160" end="100" time="220" />
 	</animation>
 	<animation type="WindowClose" reversible="false">
-		<effect type="zoom" start="100" end="80" center="440,110" easing="in" tween="back" time="240" />
-		<effect type="fade" start="100" end="0" time="240" />
+		<effect type="slide" start="0,0" end="0,-100" center="640,225" delay="160" tween="cubic" time="200" />
+		<effect type="fade" start="100" end="0" time="200" />
 	</animation>
 	<controls>
 	<control type="button">
@@ -136,6 +136,15 @@
 								<align>center</align>
 								<aligny>center</aligny>
 							</control>
+							<control type="image">
+								<left>100</left>
+								<top>5</top>
+								<width>20</width>
+								<height>20</height>
+								<texture colordiffuse="FF232323">$INFO[ListItem.Property(sub)]</texture>
+								<aspectratio>keep</aspectratio>
+								<align>center</align>
+							</control>
 						</control>
 					</focusedlayout>
 				</control>
--- a/resources/skins/Default/720p/ShortCutMenu.xml
+++ b/resources/skins/Default/720p/ShortCutMenu.xml
@@ -7,12 +7,12 @@
 	</coordinates>
 	<defaultcontrol always="true">32500</defaultcontrol>
 	<animation type="WindowOpen" reversible="false">
-		<effect type="zoom" start="80" end="100" center="440,110" delay="160" tween="back" time="240" />
-		<effect type="fade" delay="160" end="100" time="240" />
+		<effect type="slide" start="0,100" end="0,0" center="640,225" delay="160" tween="cubic" time="200" />
+		<effect type="fade" delay="160" end="100" time="220" />
 	</animation>
 	<animation type="WindowClose" reversible="false">
-		<effect type="zoom" start="100" end="80" center="440,110" easing="in" tween="back" time="240" />
-		<effect type="fade" start="100" end="0" time="240" />
+		<effect type="slide" start="0,0" end="0,-100" center="640,225" delay="160" tween="cubic" time="200" />
+		<effect type="fade" start="100" end="0" time="200" />
 	</animation>
 	<controls>
 	<control type="button">
@@ -53,7 +53,6 @@
 					<animation effect="slide" start="0,0" end="10,0" time="0" condition="true">Conditional</animation>
 					<animation effect="slide" end="120,0" time="0" condition="!Control.IsVisible(5)">Conditional</animation>
 					<itemlayout height="220" width="220">
-						<!-- <top>2</top> -->
 						<control type="image">
 							<top>0</top>
 							<left>0</left>
@@ -71,7 +70,7 @@
 						<control type="image">
 							<width>220</width>
 							<height>220</height>
-							<texture>$INFO[ListItem.Property(thumb)]</texture>
+							<texture>$INFO[ListItem.Property(thumbnail)]</texture>
 							<aspectratio>keep</aspectratio>
 							<align>center</align>
 						</control>
@@ -119,7 +118,7 @@
 							<control type="image">
 								<width>220</width>
 								<height>220</height>
-								<texture>$INFO[ListItem.Property(thumb)]</texture>
+								<texture>$INFO[ListItem.Property(thumbnail)]</texture>
 								<aspectratio>keep</aspectratio>
 								<align>center</align>
 							</control>
@@ -134,6 +133,15 @@
 								<align>center</align>
 								<aligny>center</aligny>
 							</control>
+							<control type="image">
+								<left>100</left>
+								<top>5</top>
+								<width>20</width>
+								<height>20</height>
+								<texture>$INFO[ListItem.Property(sub)]</texture>
+								<aspectratio>keep</aspectratio>
+								<align>center</align>
+							</control>
 						</control>
 					</focusedlayout>
 				</control>