diff --git a/platformcode/globalsearch.py b/platformcode/globalsearch.py index 1bdda521..d3af101a 100644 --- a/platformcode/globalsearch.py +++ b/platformcode/globalsearch.py @@ -298,7 +298,7 @@ class SearchWindow(xbmcgui.WindowXML): for elem in results: if elem.infoLabels['tmdb_id'] == searched_id: elem.from_channel = channel - elem.verified ='ok.png' + elem.verified = 1 valid.append(elem) else: other.append(elem) @@ -315,9 +315,9 @@ class SearchWindow(xbmcgui.WindowXML): thumb = item.thumbnail if item.thumbnail else 'Infoplus/' + item.contentType.replace('show', '') + '.png' logger.info('THUMB', thumb) it = xbmcgui.ListItem(item.title) - it.setProperties({'thumb': thumb, 'fanart': item.fanart, 'verified': item.verified, 'plot': item.plot, + it.setProperties({'thumb': thumb, 'fanart': item.fanart, 'plot': item.plot, 'year': '[' + str(item.year if item.year else item.infoLabels.get('year', '')) + ']', - 'item': url, 'channel':channelParams['title']}) + 'item': url, 'verified': item.verified, 'channel':channelParams['title'], 'channelthumb': channelParams['thumbnail'] if item.verified else ''}) if item.server: color = scrapertools.find_single_match(item.alive, r'(FF[^\]]+)') it.setProperties({'channel': channeltools.get_channel_parameters(item.channel).get('title', ''), diff --git a/resources/skins/Default/720p/GlobalSearch.xml b/resources/skins/Default/720p/GlobalSearch.xml index c5db8fed..9fecaad3 100644 --- a/resources/skins/Default/720p/GlobalSearch.xml +++ b/resources/skins/Default/720p/GlobalSearch.xml @@ -117,51 +117,110 @@ horizontal 300 - - Item Poster + 300 - 0 - 180 - 270 - $INFO[ListItem.Property(thumb)] - !Control.HasFocus(102) - 10 - scale + String.IsEmpty(ListItem.Property(channelthumb)) + + Item Poster + 0 + 0 + 180 + 270 + $INFO[ListItem.Property(thumb)] + !Control.HasFocus(102) + 10 + scale + + + Item Poster + 0 + 0 + 180 + 270 + $INFO[ListItem.Property(thumb)] + Control.HasFocus(102) + 10 + scale + - - Item Poster - 300 - 0 - 180 - 270 - $INFO[ListItem.Property(thumb)] - Control.HasFocus(102) - 10 - scale + + 390 + !String.IsEmpty(ListItem.Property(channelthumb)) + + Item Poster + 0 + 0 + 180 + 180 + $INFO[ListItem.Property(channelthumb)] + !Control.HasFocus(102) + 10 + scale + + + Item Poster + 0 + 0 + 180 + 180 + $INFO[ListItem.Property(channelthumb)] + Control.HasFocus(102) + 10 + scale + - - Item Poster - 0 - 0 - 380 - 570 - $INFO[ListItem.Property(thumb)] - !Control.HasFocus(102) - 10 - scale + + + Item Poster + 0 + 0 + 380 + 570 + $INFO[ListItem.Property(thumb)] + !Control.HasFocus(102) + 10 + scale + + + Item Poster + 0 + 0 + 380 + 570 + $INFO[ListItem.Property(thumb)] + Control.HasFocus(102) + 10 + scale + - - Item Poster - 0 - 0 - 380 - 570 - $INFO[ListItem.Property(thumb)] - Control.HasFocus(102) - 10 - scale + + 420 + 230 + !String.IsEmpty(ListItem.Property(channelthumb)) + + Item Poster + 0 + 0 + 150 + 150 + $INFO[ListItem.Property(channelthumb)] + !Control.HasFocus(102) + 10 + scale + + + Item Poster + 0 + 0 + 150 + 150 + $INFO[ListItem.Property(channelthumb)] + Control.HasFocus(102) + 10 + scale +