From 039a82945a3bf32e6c1bacd86f921bbc54f9cd3c Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Tue, 22 Dec 2020 11:28:56 +0100 Subject: [PATCH] Assegna tasto per Menu Rapido senza riavviare --- platformcode/keymaptools.py | 12 ++++++++---- platformcode/platformtools.py | 4 ++-- .../language/resource.language.it_it/strings.po | 2 +- service.py | 3 ++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/platformcode/keymaptools.py b/platformcode/keymaptools.py index 106fc211..72ad41eb 100644 --- a/platformcode/keymaptools.py +++ b/platformcode/keymaptools.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from builtins import map -import sys, xbmc, xbmcaddon, xbmcgui, base64, json +import sys, xbmc, xbmcaddon, xbmcgui, base64, json, os PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int from threading import Timer @@ -9,7 +9,7 @@ from threading import Timer from channelselector import get_thumb from platformcode import config, logger import channelselector - +addon_icon = os.path.join( config.__settings__.getAddonInfo( "path" ),'resources', 'media', 'logo.png' ) class KeyListener(xbmcgui.WindowXMLDialog): TIMEOUT = 10 @@ -29,9 +29,12 @@ class KeyListener(xbmcgui.WindowXMLDialog): def onInit(self): try: + logger.debug('ICONA',addon_icon) + self.getControl(400).setImage(addon_icon) self.getControl(401).addLabel(config.get_localized_string(70698)) self.getControl(402).addLabel(config.get_localized_string(70699) % self.TIMEOUT) except AttributeError: + self.getControl(400).setImage(addon_icon) self.getControl(401).setLabel(config.get_localized_string(70698)) self.getControl(402).setLabel(config.get_localized_string(70699) % self.TIMEOUT) @@ -68,7 +71,7 @@ def set_key(): file_xml = "special://profile/keymaps/kod.xml" data = '' % new_key + 'runplugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAia2V5bWFwIiwNCiAgICAib3BlbiI6IHRydWUNCn0=)' filetools.write(xbmc.translatePath(file_xml), data) - platformtools.dialog_notification(config.get_localized_string(70700),config.get_localized_string(70702)) + # platformtools.dialog_notification(config.get_localized_string(70700),config.get_localized_string(70702),4) config.set_setting("shortcut_key", new_key) @@ -81,9 +84,10 @@ def delete_key(): import xbmc filetools.remove(xbmc.translatePath( "special://profile/keymaps/kod.xml")) - platformtools.dialog_notification(config.get_localized_string(70701),config.get_localized_string(70702)) + # platformtools.dialog_notification(config.get_localized_string(70701),config.get_localized_string(70702),4) config.set_setting("shortcut_key", '') + xbmc.executebuiltin('Action(reloadkeymaps)') class Main(xbmcgui.WindowXMLDialog): diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 68cd0921..74c33340 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -22,7 +22,7 @@ from core.item import Item from platformcode import logger, config addon = config.__settings__ -addon_icon = os.path.join( addon.getAddonInfo( "path" ), "logo.png" ) +addon_icon = os.path.join( addon.getAddonInfo( "path" ),'resources', 'media', "logo.png" ) class XBMCPlayer(xbmc.Player): @@ -41,7 +41,7 @@ def dialog_ok(heading, message): def dialog_notification(heading, message, icon=3, time=5000, sound=True): dialog = xbmcgui.Dialog() try: - l_icono = xbmcgui.NOTIFICATION_INFO, xbmcgui.NOTIFICATION_WARNING, xbmcgui.NOTIFICATION_ERROR, addon_icon + l_icono = [xbmcgui.NOTIFICATION_INFO, xbmcgui.NOTIFICATION_WARNING, xbmcgui.NOTIFICATION_ERROR, addon_icon] dialog.notification(heading, message, l_icono[icon], time, sound) except: dialog_ok(heading, message) diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po index b8c72df9..61ff8037 100644 --- a/resources/language/resource.language.it_it/strings.po +++ b/resources/language/resource.language.it_it/strings.po @@ -1501,7 +1501,7 @@ msgstr "Premere il tasto da utilizzare per aprire la finestra" msgctxt "#60324" msgid "You have %s seconds" -msgstr "Hai %s segcondi" +msgstr "Hai %s secondi" msgctxt "#60325" msgid "Saved key" diff --git a/service.py b/service.py index 0f8bc7c7..378efb86 100644 --- a/service.py +++ b/service.py @@ -393,7 +393,8 @@ class AddonMonitor(xbmc.Monitor): if self.settings_pre.get('elementum_on_seed') != settings_post.get('elementum_on_seed') and settings_post.get('elementum_on_seed'): if not platformtools.dialog_yesno(config.get_localized_string(70805), config.get_localized_string(70806)): config.set_setting('elementum_on_seed', False) - + if self.settings_pre.get("shortcut_key", '') != settings_post.get("shortcut_key", ''): + xbmc.executebuiltin('Action(reloadkeymaps)') self.settings_pre = settings_post def onScreensaverActivated(self):