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 00000000..f5a4b8c1
Binary files /dev/null and b/resources/skins/Default/media/NextDialog/background-play.png differ
diff --git a/specials/nextep.py b/specials/nextep.py
index e2403011..351f5acd 100644
--- a/specials/nextep.py
+++ b/specials/nextep.py
@@ -6,8 +6,14 @@ from core import scrapertools
from core import jsontools, filetools
from lib.concurrent import futures
-PLAYER_STOP = 13
-ND = 'NextDialogCompact.xml' if config.get_setting('next_ep_type') else 'NextDialog.xml'
+next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml']
+next_ep_type = config.get_setting('next_ep_type')
+
+# compatibility with previous version
+if type(next_ep_type) == bool:
+ ND = 'NextDialogCompact.xml' if config.get_setting('next_ep_type') else 'NextDialog.xml'
+else:
+ ND = next_dialogs[next_ep_type]
def check(item):
return True if config.get_setting('next_ep') > 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()