From 6b12a2c893e8366aa2641265a050d89588a7791d Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Fri, 27 Aug 2021 17:41:41 +0200 Subject: [PATCH] Menu Rapido: Piccole Correzioni --- platformcode/keymaptools.py | 12 ++- resources/skins/Default/720p/ShortCutMenu.xml | 93 ++++++++++-------- resources/skins/Default/media/dd.png | Bin 0 -> 2526 bytes resources/skins/Default/media/uu.png | Bin 0 -> 2487 bytes 4 files changed, 62 insertions(+), 43 deletions(-) create mode 100644 resources/skins/Default/media/dd.png create mode 100644 resources/skins/Default/media/uu.png diff --git a/platformcode/keymaptools.py b/platformcode/keymaptools.py index 88f2cd15..ac98cfac 100644 --- a/platformcode/keymaptools.py +++ b/platformcode/keymaptools.py @@ -10,12 +10,14 @@ import channelselector addon_icon = filetools.join( config.__settings__.getAddonInfo( "path" ),'resources', 'media', 'logo.png' ) background = 'FF232323' +overlay = '77232323' text = 'FFFFFFFF' select = 'FF0082C2' if config.get_setting('icon_set') == 'dark': background = 'FFDCDCDC' + overlay = '77DCDCDC' text = 'FF232323' - select = '880082C2' + select = 'FF78BDDF' class KeyListener(xbmcgui.WindowXMLDialog): TIMEOUT = 10 @@ -122,13 +124,15 @@ class Main(xbmcgui.WindowXMLDialog): def menulist(self, menu): itemlist = [] + self.getControl(200).setLabel(background) + self.getControl(201).setLabel(overlay) + self.getControl(202).setLabel(select) + self.getControl(203).setLabel(text) for menuentry in menu: # if not menuentry.channel: menuentry.channel = 'news' + title = re.sub(r'(\[[/]?COLOR[^\]]*\])','',menuentry.title) item = xbmcgui.ListItem(title) - item.setProperty('background', background) - item.setProperty('text', text) - item.setProperty('select', select) item.setProperty('channel', menuentry.channel) item.setProperty('focus', '0') item.setProperty('thumbnail', menuentry.thumbnail) diff --git a/resources/skins/Default/720p/ShortCutMenu.xml b/resources/skins/Default/720p/ShortCutMenu.xml index c7b53108..5df800e4 100644 --- a/resources/skins/Default/720p/ShortCutMenu.xml +++ b/resources/skins/Default/720p/ShortCutMenu.xml @@ -6,14 +6,31 @@ 0 + + Background Color + False + + + Overlay Color + False + + + Selection Color + False + + + Text Color + False + + Close Button 0 0 100% 100% - white.png - white.png + white.png + white.png WindowOpen WindowClose Action(close) @@ -44,7 +61,7 @@ 0 100% 100% - white.png + white.png @@ -52,7 +69,7 @@ 0 0 100% - 220 + 100% vertical @@ -68,6 +85,7 @@ 61 + Icon 220 220 $INFO[ListItem.Property(thumbnail)] @@ -77,12 +95,15 @@ - 1 - 220 - 218 - white.png + Selection + 0 + 0 + 100% + 100% + white.png + Icon 220 220 $INFO[ListItem.Property(thumbnail)] @@ -90,13 +111,13 @@ center - Selected Item + Item Title 0 180 100% 40 font13 - FFFFFFFF + Control.GetLabel(203) center center @@ -117,6 +138,7 @@ 61 + Icon 220 220 $INFO[ListItem.Property(thumbnail)] @@ -126,12 +148,15 @@ - 1 - 220 - 218 - white.png + Selection + 0 + 0 + 100% + 100% + white.png + Icon 220 220 $INFO[ListItem.Property(thumbnail)] @@ -139,13 +164,13 @@ center - Selected Item + Item Title 0 180 100% 40 font13 - FFFFFFFF + Control.GetLabel(203) center center @@ -155,38 +180,28 @@ + Row Down !String.IsEmpty(Container(1).ListItem.Property(sub)) + !Control.HasFocus(2) + !Control.HasFocus(102) Conditional - - 520 - 240 - 60 - 60 - down.png - down.png + 540 + 260 + 20 + 20 + dd.png + dd.png keep + Row Up !Control.HasFocus(1) + !Control.HasFocus(101) Conditional - - 520 + 540 -80 - 60 - 60 - up.png - up.png + 20 + 20 + uu.png + uu.png keep diff --git a/resources/skins/Default/media/dd.png b/resources/skins/Default/media/dd.png new file mode 100644 index 0000000000000000000000000000000000000000..8fff328842bc382cae1ad23505afb80f52728263 GIT binary patch literal 2526 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 literal 0 HcmV?d00001