diff --git a/core/support.py b/core/support.py index acc5a7a7..fa579b43 100755 --- a/core/support.py +++ b/core/support.py @@ -1295,6 +1295,7 @@ def addQualityTag(item, itemlist, data, patron): itemlist.insert(0,Item(channel=item.channel, action="", title=typo(qualityStr, '[] color kod bold'), + fulltitle=qualityStr, plot=descr, folder=False, thumbnail=thumb('info'))) diff --git a/platformcode/globalsearch.py b/platformcode/globalsearch.py index b45e63ba..258fed8c 100644 --- a/platformcode/globalsearch.py +++ b/platformcode/globalsearch.py @@ -26,7 +26,7 @@ def set_workers(): def Search(item): xbmc.executebuiltin('Dialog.Close(all,true)') SearchWindow('GlobalSearch.xml', config.get_runtime_path()).start(item) - xbmc.sleep(700) + xbmc.sleep(600) # Actions LEFT = 1 @@ -55,6 +55,7 @@ COUNT = 501 MENU = 502 BACK = 503 CLOSE = 504 +QUALITYTAG = 505 # Servers EPISODESLIST = 200 @@ -378,12 +379,12 @@ class SearchWindow(xbmcgui.WindowXML): if action in [CONTEXT] and focus in [RESULTS, EPISODESLIST, SERVERLIST]: self.context() - elif action in [SWIPEUP]: + elif action in [SWIPEUP] and self.CHANNELS.isVisible() : self.setFocusId(CHANNELS) pos = self.CHANNELS.getSelectedPosition() self.CHANNELS.selectItem(pos) - elif action in [LEFT, RIGHT] and focus in [CHANNELS]: + elif action in [LEFT, RIGHT] and focus in [CHANNELS] and self.CHANNELS.isVisible(): items = [] name = self.CHANNELS.getSelectedItem().getLabel() subpos = int(self.CHANNELS.getSelectedItem().getProperty('position')) @@ -460,7 +461,6 @@ class SearchWindow(xbmcgui.WindowXML): else: self.pos = self.EPISODESLIST.getSelectedPosition() item = self.episodes[self.pos] - # dbg() try: self.channel = __import__('channels.%s' % item.channel, fromlist=["channels.%s" % item.channel]) self.itemsResult = getattr(self.channel, item.action)(item) @@ -470,7 +470,7 @@ class SearchWindow(xbmcgui.WindowXML): logger.error(traceback.format_exc()) self.itemsResult = [] - if self.itemsResult and self.itemsResult[0].action in ['play']: + if self.itemsResult and self.itemsResult[0].action in ['play', '']: if config.get_setting('checklinks') and not config.get_setting('autoplay'): self.itemsResult = servertools.check_list_links(self.itemsResult, config.get_setting('checklinks_number')) @@ -500,6 +500,9 @@ class SearchWindow(xbmcgui.WindowXML): else: it.setProperty('quality', '') unknown.append(it) + elif not item.action: + self.getControl(QUALITYTAG).setText(item.fulltitle) + uhd.sort(key=lambda it: it.getProperty('index')) fhd.sort(key=lambda it: it.getProperty('index')) diff --git a/resources/skins/Default/720p/GlobalSearch.xml b/resources/skins/Default/720p/GlobalSearch.xml index 7fda3151..3354a16b 100644 --- a/resources/skins/Default/720p/GlobalSearch.xml +++ b/resources/skins/Default/720p/GlobalSearch.xml @@ -44,7 +44,7 @@ Search Group - Control.IsVisible(1) + Control.IsVisible(1) Title @@ -55,14 +55,14 @@ FFFFFFFF 00000000 - Integer.IsGreater(Container(101).NumItems, 0) + Integer.IsGreater(Container(101).NumItems, 0) left center Search Result Group - Integer.IsGreater(Container(102).NumItems, 0) + Integer.IsGreater(Container(102).NumItems, 0) Visible @@ -271,7 +271,7 @@ Episodes Group - Control.IsVisible(2) + Control.IsVisible(2) Poster @@ -345,7 +345,7 @@ Servers Group - Control.IsVisible(3) + Control.IsVisible(3) Poster @@ -493,7 +493,7 @@ right center Conditional - Control.IsVisible(500) + Control.IsVisible(500) @@ -508,7 +508,7 @@ center center - Control.IsVisible(4) + Control.IsVisible(4) @@ -523,7 +523,7 @@ center center - Control.IsVisible(5) + Control.IsVisible(5) @@ -563,5 +563,17 @@ close.png + + Load Channels + 680 + 20 + 200 + 40 + FFFFFFFF + 00000000 + right + center + +