fix: return emby nodes in skinshortcuts dialog

This commit is contained in:
marcelveldt 2016-01-18 09:45:39 +01:00
parent 016db1c755
commit b0120aefd5
2 changed files with 10 additions and 3 deletions

View file

@ -68,7 +68,11 @@ def doMainListing():
path = utils.window('Emby.nodes.%s.content' % i) path = utils.window('Emby.nodes.%s.content' % i)
label = utils.window('Emby.nodes.%s.title' % i) label = utils.window('Emby.nodes.%s.title' % i)
type = utils.window('Emby.nodes.%s.type' % i) type = utils.window('Emby.nodes.%s.type' % i)
if path and ((xbmc.getCondVisibility("Window.IsActive(Pictures)") and type=="photos") or (xbmc.getCondVisibility("Window.IsActive(VideoLibrary)") and type != "photos")): #because we do not use seperate entrypoints for each content type, we need to figure out which items to show in each listing.
#if skinshortcuts is active, we just show all nodes
if path and ((xbmc.getCondVisibility("Window.IsActive(Pictures)") and type=="photos")
or (xbmc.getCondVisibility("Window.IsActive(VideoLibrary)") and type != "photos")
or xbmc.getCondVisibility("Window.IsActive(script-skinshortcuts.xml)")):
addDirectoryItem(label, path) addDirectoryItem(label, path)
# some extra entries for settings and stuff. TODO --> localize the labels # some extra entries for settings and stuff. TODO --> localize the labels

View file

@ -57,12 +57,15 @@ def settings(setting, value=None):
if value is not None: if value is not None:
addon.setSetting(setting, value) addon.setSetting(setting, value)
else: else:
return addon.getSetting(setting) return addon.getSetting(setting) #returns unicode object
def language(stringid): def language(stringid):
# Central string retrieval # Central string retrieval
addon = xbmcaddon.Addon(id='plugin.video.emby') addon = xbmcaddon.Addon(id='plugin.video.emby')
string = addon.getLocalizedString(stringid) string = addon.getLocalizedString(stringid) #returns unicode object
if isinstance(string, unicode): print "EMBY LANGUAGE STRING IS UNICODE !"
elif isinstance(string, txt): print "EMBY LANGUAGE STRING IS TEXT !"
else: print "EMBY LANGUAGE STRING IS UNKNOWN !"
return string return string