From 2344409faa4aaccdafb3434d4abf58ab8617a020 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 15 Feb 2020 18:56:18 +0100 Subject: [PATCH] =?UTF-8?q?Nuova=20Modalit=C3=A0=20di=20Visualizzazione=20?= =?UTF-8?q?per=20Next=20Ep.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/language/English/strings.po | 14 +- resources/language/Italian/strings.po | 16 ++- resources/settings.xml | 3 +- resources/skins/Default/720p/NextDialog.xml | 2 +- .../skins/Default/720p/NextDialogCompact.xml | 2 +- .../skins/Default/720p/NextDialogExtended.xml | 125 ++++++++++++++++++ .../media/NextDialog/background-play.png | Bin 0 -> 3409 bytes specials/nextep.py | 38 ++++-- 8 files changed, 186 insertions(+), 14 deletions(-) create mode 100644 resources/skins/Default/720p/NextDialogExtended.xml create mode 100644 resources/skins/Default/media/NextDialog/background-play.png diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index e64770fb..5afba248 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -5738,7 +5738,19 @@ msgid "Playback" msgstr "" msgctxt "#70754" -msgid "Compact mode" +msgid "Display mode" +msgstr "" + +msgctxt "#70755" +msgid "Default" +msgstr "" + +msgctxt "#70756" +msgid "Extended" +msgstr "" + +msgctxt "#70757" +msgid "Compact" msgstr "" # DNS start [ settings and declaration ] diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index e9098e55..7aa2497c 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5742,8 +5742,20 @@ msgid "Playback" msgstr "Riproduzione" msgctxt "#70754" -msgid "Compact mode" -msgstr "Modalità compatta" +msgid "Display mode" +msgstr "Modalità visualizzazione" + +msgctxt "#70755" +msgid "Default" +msgstr "Predefinita" + +msgctxt "#70756" +msgid "Extended" +msgstr "Estesa" + +msgctxt "#70757" +msgid "Compact" +msgstr "Compatta" # DNS start [ settings and declaration ] msgctxt "#707401" diff --git a/resources/settings.xml b/resources/settings.xml index 19711b58..62c9c475 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -59,7 +59,8 @@ - + + diff --git a/resources/skins/Default/720p/NextDialog.xml b/resources/skins/Default/720p/NextDialog.xml index 5de2f868..4b5fbbb9 100644 --- a/resources/skins/Default/720p/NextDialog.xml +++ b/resources/skins/Default/720p/NextDialog.xml @@ -42,7 +42,7 @@ 0 right - + SendClick(3012) 40 auto diff --git a/resources/skins/Default/720p/NextDialogCompact.xml b/resources/skins/Default/720p/NextDialogCompact.xml index bad59a9f..dd348317 100644 --- a/resources/skins/Default/720p/NextDialogCompact.xml +++ b/resources/skins/Default/720p/NextDialogCompact.xml @@ -42,7 +42,7 @@ 0 right - + SendClick(3012) 40 diff --git a/resources/skins/Default/720p/NextDialogExtended.xml b/resources/skins/Default/720p/NextDialogExtended.xml new file mode 100644 index 00000000..1b1ce6e8 --- /dev/null +++ b/resources/skins/Default/720p/NextDialogExtended.xml @@ -0,0 +1,125 @@ + + + 20 + Dialog.Close(fullscreeninfo,true) + Dialog.Close(videoosd,true) + + + + + + + + + + + + 0 + 20 + 220 + 326 + + + 0 + 0 + 326 + 180 + $INFO[Window.Property(next_img)] + + + 0 + 0 + 100% + + + -1000 + -1000 + 1 + 1 + + + vertical + 220 + 326 + 0 + 0 + + + SendClick(3012) + 180 + 326 + 0 + font30_title + 20 + FFFFFFFF + FFFFFFFF + FFFFFFFF + 22000000 + top + center + NextDialog/background-play.png + NextDialog/background-diffuse.png + no + + + + 40 + 326 + font30_title + 20 + 80FFFFFF + FFFFFFFF + 80FFFFFF + 22000000 + center + center + NextDialog/background-diffuse.png + NextDialog/background-diffuse.png + no + + + + 60 + 40 + center + true + center + true + 50 + FFFFFFFF + ff000000 + Window.Property(title) + font30_title + + + 40 + 40 + center + true + center + true + 50 + FFFFFFFF + ff000000 + Window.Property(ep_title) + font20_title + + + 20 + 20 + auto + top + true + left + true + 50 + FFFFFFFF + ff000000 + Player.TimeRemaining(secs),, + font30_title + + + + + + \ No newline at end of file diff --git a/resources/skins/Default/media/NextDialog/background-play.png b/resources/skins/Default/media/NextDialog/background-play.png new file mode 100644 index 0000000000000000000000000000000000000000..f5a4b8c1541d80816e7f67767fe94822107e72d6 GIT binary patch literal 3409 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 0 and item.contentType != 'movie' else False @@ -46,7 +52,7 @@ def next_ep(item): time_over = False time_limit = time() + 30 - time_steps = [20,30,40,50,60] + time_steps = [20,30,40,50,60,70,80,90,100,110,120] TimeFromEnd = time_steps[config.get_setting('next_ep_seconds')] # wait until the video plays @@ -84,6 +90,7 @@ def next_ep(item): next_file = None else: next_file = fileList[nextIndex] + logger.info('NEXTFILE' + next_file) # start next episode window afther x time if next_file: @@ -102,8 +109,9 @@ def next_ep(item): infoLabels= {'episode': episode, 'mediatype': 'tvshow', 'season': season, 'title': next_ep}, strm_path= filetools.join(base_path, next_file)) - global ITEM - ITEM = item + global INFO + INFO = filetools.join(path, next_file.replace("strm", "nfo")) + logger.info('NEXTINFO' + INFO) nextDialog = NextDialog(ND, config.get_runtime_path()) nextDialog.show() @@ -142,9 +150,23 @@ class NextDialog(xbmcgui.WindowXMLDialog): def __init__(self, *args, **kwargs): logger.info() - self.action_exitkeys_id = [10, 13] + self.action_exitkeys_id = [xbmcgui.ACTION_STOP, xbmcgui.ACTION_BACKSPACE, xbmcgui.ACTION_PREVIOUS_MENU, xbmcgui.ACTION_NAV_BACK] self.progress_control = None - self.item = ITEM + + # set info + with open(INFO, 'r') as f: + full_info = f.readlines() + full_info = full_info[1:] + full_info = "".join(full_info) + info = jsontools.load(full_info) + info = info["infoLabels"] + self.setProperty("title", info["tvshowtitle"]) + self.setProperty("ep_title", "%dx%02d - %s" % (info["season"], info["episode"], info["title"])) + if "episodio_imagen" in info: + img = info["episodio_imagen"] + else: + img = filetools.join(config.get_runtime_path(), "resources", "noimage.png") + self.setProperty("next_img", img) def set_still_watching(self, stillwatching): self.stillwatching = stillwatching @@ -175,6 +197,6 @@ class NextDialog(xbmcgui.WindowXMLDialog): def onAction(self, action): logger.info() - if action == PLAYER_STOP: + if action in self.action_exitkeys_id: self.set_continue_watching(False) self.close()