diff --git a/platformcode/xbmc_config_menu.py b/platformcode/xbmc_config_menu.py index 98a11e9b..3b6e548a 100644 --- a/platformcode/xbmc_config_menu.py +++ b/platformcode/xbmc_config_menu.py @@ -378,8 +378,8 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): textColor=c["color"], font=self.font, isPassword=c["hidden"], window=self) else: - control = xbmcgui.ControlEdit(0, -100, self.controls_width - 5, self.height_control, - c["label"], self.font, c["color"], '', 4, isPassword=c["hidden"], + control = xbmcgui.ControlEdit(0, -100, self.controls_width, self.height_control, + c["label"], self.font, c["color"], '', 1 | 4, isPassword=c["hidden"], focusTexture=os.path.join(self.mediapath, 'Controls', 'MenuItemFO.png'), noFocusTexture=os.path.join(self.mediapath, 'Controls', 'MenuItemNF.png')) @@ -393,7 +393,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): s = '' control.setText(s) # control.setText(self.values[c["id"]]) - control.setWidth(self.controls_width - 5) + control.setWidth(self.controls_width + 10) control.setHeight(self.height_control) c["control"] = control @@ -446,8 +446,8 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): self.getControl(10006).setLabel(self.custom_button['label']) else: self.getControl(10006).setVisible(False) - self.getControl(10004).setPosition(self.getControl(10004).getPosition()[0] + 80, self.getControl(10004).getPosition()[1]) - self.getControl(10005).setPosition(self.getControl(10005).getPosition()[0] + 80, self.getControl(10005).getPosition()[1]) + # self.getControl(10004).setPosition(self.getControl(10004).getPosition()[0], self.getControl(10004).getPosition()[1]) + # self.getControl(10005).setPosition(self.getControl(10005).getPosition()[0], self.getControl(10005).getPosition()[1]) # Control Area Dimensions self.controls_width = self.getControl(10007).getWidth() - 30 diff --git a/specials/community.py b/specials/community.py index c2d9e97c..b7ca1ba5 100644 --- a/specials/community.py +++ b/specials/community.py @@ -174,7 +174,7 @@ def peliculas(item, json='', key='', itemlist=[]): infoLabels = item.infoLabels if item.infoLabels else {} contentType = 'tvshow' if 'tvshow' in key else 'movie' itlist = filterkey = [] - action = 'show_menu' + action = 'findvideos' if inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes', 'search'] and not item.filterkey and not item.disable_pagination: Pagination = int(defp) if defp.isdigit() else '' @@ -192,8 +192,8 @@ def peliculas(item, json='', key='', itemlist=[]): title = option['title'] if 'title' in option else '' - # if 'tvshows_list' in key and 'links' not in option: - # action = 'episodios' + if 'tvshows_list' in key and 'links' not in option: + action = 'episodios' # filter elements if (not item.filter or item.filter.lower() in filterkey) and item.search.lower() in title.lower() and title: @@ -236,7 +236,9 @@ def get_seasons(item): support.log() itemlist = [] infoLabels = item.infoLabels - json = item.url['seasons_list'] if type(item.url) == dict else item.url + json = item.url if type(item.url) == dict else item.url + if 'seasons_list' in json: json = json['seasons_list'] + elif 'tvshows_list' in json: return show_menu(item) for option in json: infoLabels['season'] = option['season'] title = config.get_localized_string(60027) % option['season'] @@ -274,11 +276,20 @@ def episodios(item, json ='', key='', itemlist =[]): if type(item.url) == dict: if 'seasons_list' in item.url: return get_seasons(item) + elif 'tvshows_list' in item.url: + return peliculas(item, item.url, 'tvshows_list') else: json = {} json = item.url['episodes_list'] else: - json = load_json(item)['episodes_list'] + json = load_json(item) + if 'episodes_list' in json: + json = json['episodes_list'] + elif 'seasons_list' in json: + item.url = json['episodes_list'] + return get_seasons(item) + elif 'tvshows_list' in json: + return peliculas(item, json, 'tvshows_list') # set variable ep = 1 diff --git a/specials/news.py b/specials/news.py index f4a4b225..870731df 100644 --- a/specials/news.py +++ b/specials/news.py @@ -124,7 +124,7 @@ def set_category_context(item): "extra": item.extra, "action": "setting_channel", "channel": item.channel}] - item.category = config.get_localized_string(60679) % item.extra + item.category = config.get_localized_string(60679) % re.sub('\[[^\]]+\]','',item.title).strip() def get_channels_list():