diff --git a/channelselector.py b/channelselector.py index 649772c5..eb806c03 100644 --- a/channelselector.py +++ b/channelselector.py @@ -55,7 +55,7 @@ def getmainlist(view="thumb_"): thumb_setting = "setting_%s.png" % 0 # config.get_setting("plugin_updates_available") itemlist.append(Item(title=config.get_localized_string(30100), channel="setting", action="settings", - thumbnail=get_thumb(thumb_setting, view), category=config.get_localized_string(30100), viewmode="list")) + thumbnail=get_thumb(thumb_setting, view), category=config.get_localized_string(30100), viewmode="list", folder=False)) itemlist.append(Item(title=config.get_localized_string(30104) + " (v" + config.get_addon_version(with_fix=True) + ")", channel="help", action="mainlist", thumbnail=get_thumb("help.png", view), category=config.get_localized_string(30104), viewmode="list")) return itemlist diff --git a/platformcode/keymaptools.py b/platformcode/keymaptools.py index 53a9f053..106fc211 100644 --- a/platformcode/keymaptools.py +++ b/platformcode/keymaptools.py @@ -100,7 +100,7 @@ class Main(xbmcgui.WindowXMLDialog): if not menuentry.channel: menuentry.channel = prevchannel item = xbmcgui.ListItem(menuentry.title) if not submenu and menuentry.channel in ['news', 'channelselector', 'search', 'videolibrary']: - item.setProperty('sub', 'Controls/spinUp-Focus.png') + item.setProperty('sub', 'Shortcut/sub.png') if menuentry.title != 'Redirect': for key , value in json.loads(menuentry.tojson()).items(): item.setProperty(key, str(value)) @@ -115,7 +115,10 @@ class Main(xbmcgui.WindowXMLDialog): if control_id == 32500: action = self.getControl(32500).getSelectedItem().getProperty('run') self.close() - xbmc.executebuiltin('ActivateWindow(10025, "plugin://plugin.video.kod/?' + base64.b64encode(action) + '")') + if self.getControl(32500).getSelectedItem().getProperty('folder') == 'False': + xbmc.executebuiltin('RunPlugin("plugin://plugin.video.kod/?' + base64.b64encode(action) + '")') + else: + xbmc.executebuiltin('ActivateWindow(10025, "plugin://plugin.video.kod/?' + base64.b64encode(action) + '")') diff --git a/resources/skins/Default/720p/DarkShortCutMenu.xml b/resources/skins/Default/720p/DarkShortCutMenu.xml index 037af2a7..919dd2fa 100644 --- a/resources/skins/Default/720p/DarkShortCutMenu.xml +++ b/resources/skins/Default/720p/DarkShortCutMenu.xml @@ -78,27 +78,7 @@ 1 220 218 - white.png - - - 0 - 160 - 220 - 74 - font12 - FFFFFFFF - - center - center - - - 100 - 5 - 20 - 20 - $INFO[ListItem.Property(sub)] - keep - center + white.png 220 @@ -107,6 +87,25 @@ keep center + + 0 + 160 + 220 + 74 + FF232323 + + center + center + + + 90 + 0 + 40 + 40 + $INFO[ListItem.Property(sub)] + keep + center + diff --git a/resources/skins/Default/720p/ShortCutMenu.xml b/resources/skins/Default/720p/ShortCutMenu.xml index bc93587d..7d30389f 100644 --- a/resources/skins/Default/720p/ShortCutMenu.xml +++ b/resources/skins/Default/720p/ShortCutMenu.xml @@ -80,33 +80,32 @@ 218 white.png + + 220 + 220 + $INFO[ListItem.Property(thumbnail)] + keep + center + 0 160 220 74 - font12 FFFFFFFF center center - 100 - 5 - 20 - 20 + 90 + 0 + 40 + 40 $INFO[ListItem.Property(sub)] keep center - - 220 - 220 - $INFO[ListItem.Property(thumbnail)] - keep - center - diff --git a/resources/skins/Default/media/Shortcut/sub.png b/resources/skins/Default/media/Shortcut/sub.png new file mode 100644 index 00000000..38cde77b Binary files /dev/null and b/resources/skins/Default/media/Shortcut/sub.png differ diff --git a/specials/search.py b/specials/search.py index 79bb6d07..0b8a88da 100644 --- a/specials/search.py +++ b/specials/search.py @@ -52,8 +52,8 @@ def mainlist(item): itemlist += [Item(channel=item.channel, title=config.get_localized_string(59995), action='saved_search', thumbnail=get_thumb('search.png')), Item(channel=item.channel, title=config.get_localized_string(60420), action='sub_menu', thumbnail=get_thumb('search.png')), Item(channel="tvmoviedb", title=config.get_localized_string(70274), action="mainlist", thumbnail=get_thumb("search.png")), - Item(channel=item.channel, title=typo(config.get_localized_string(59994), 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting_0.png')), - Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting_0.png'))] + Item(channel=item.channel, title=typo(config.get_localized_string(59994), 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting_0.png'),folder=False), + Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting_0.png'),folder=False)] itemlist = set_context(itemlist) return itemlist diff --git a/specials/videolibrary.py b/specials/videolibrary.py index d379f9dc..723f9c1c 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -28,7 +28,7 @@ def mainlist(item): category=config.get_localized_string(70271), thumbnail=thumb("videolibrary_tvshow"), context=[{"channel":"videolibrary", "action":"update_videolibrary", "title":config.get_localized_string(70269)}]), Item(channel='shortcuts', action="SettingOnPosition", title=typo(config.get_localized_string(70287),'bold color kod'), - category=2, setting=1, thumbnail = thumb("setting_0"))] + category=2, setting=1, thumbnail = thumb("setting_0"),folder=False)] return itemlist