The branch, frodo has been updated
via 8eee4572991dbf2309ee0e87e02fd48a51832ffd (commit)
via 5a556f1fb6149d87f8cba0c91fa5e20df4057055 (commit)
from 18ea10ddd44b06902d28333518d6ef353dfbc41d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=8eee4572991dbf2309ee0e87e02fd48a51832ffd
commit 8eee4572991dbf2309ee0e87e02fd48a51832ffd
Author: Martijn Kaijser <[email protected]>
Date: Sat Feb 1 14:33:40 2014 +0100
[script.videoextras] 1.0.4
diff --git a/script.videoextras/addon.xml b/script.videoextras/addon.xml
index 41760f7..5314ee8 100644
--- a/script.videoextras/addon.xml
+++ b/script.videoextras/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.videoextras" name="VideoExtras" version="1.0.3"
provider-name="robwebset">
+<addon id="script.videoextras" name="VideoExtras" version="1.0.4"
provider-name="robwebset">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/script.videoextras/changelog.txt b/script.videoextras/changelog.txt
index 3d883c4..8cdd022 100644
--- a/script.videoextras/changelog.txt
+++ b/script.videoextras/changelog.txt
@@ -1,3 +1,7 @@
+v1.0.4
+- Improved default window xml for detailed list to work with most skins
+- Add Video duration to the display listing
+
v1.0.3
- Fix returning from extras list bug
diff --git a/script.videoextras/default.py b/script.videoextras/default.py
index f956e63..dbd0e5a 100644
--- a/script.videoextras/default.py
+++ b/script.videoextras/default.py
@@ -37,6 +37,15 @@ else:
__addon__ = xbmcaddon.Addon(id='script.videoextras')
__addonid__ = __addon__.getAddonInfo('id')
+__cwd__ = __addon__.getAddonInfo('path').decode("utf-8")
+__resource__ = xbmc.translatePath( os.path.join( __cwd__, 'resources'
).encode("utf-8") ).decode("utf-8")
+__lib__ = xbmc.translatePath( os.path.join( __resource__, 'lib'
).encode("utf-8") ).decode("utf-8")
+
+sys.path.append(__resource__)
+sys.path.append(__lib__)
+
+from VideoParser import VideoParser
+
def log(txt):
if __addon__.getSetting( "logEnabled" ) == "true":
@@ -203,6 +212,8 @@ class BaseExtrasItem():
self.fanart = ""
self._loadImages(filename)
+ self.duration = None
+
# Record if the match was by filename rather than in Extras
sub-directory
self.isFileMatchingExtra = isFileMatchExtra
# Check if there is an NFO file to process
@@ -268,6 +279,49 @@ class BaseExtrasItem():
self.fanart = SourceDetails.getFanArt()
return self.fanart
+ # Returns the duration in seconds
+ def getDuration(self):
+ if self.duration == None:
+ try:
+ # Parse the video file for the duration
+ self.duration = VideoParser().getVideoLength(self.filename)
+ log("BaseExtrasItem: Duration retrieved is = %d" %
self.duration)
+ except:
+ log("BaseExtrasItem: Failed to get duration from %s" %
self.filename)
+ log("BaseExtrasItem: %s" % traceback.format_exc())
+ self.duration = 0
+
+ return self.duration
+
+ def getDisplayDuration(self, forcedDuration=0):
+ durationInt = forcedDuration
+ if forcedDuration < 1:
+ durationInt = self.getDuration()
+
+ displayDuration = ""
+ seconds = 0
+ minutes = 0
+ hours = 0
+
+ # Convert the duration into a viewable format
+ if durationInt > 0:
+ seconds = durationInt % 60
+
+ if durationInt > 60:
+ minutes = ((durationInt - seconds) % 3600)/60
+
+ # Default the display to MM:SS
+ displayDuration = "%02d:%02d" % (minutes, seconds)
+
+ # Only add the hours is really needed
+ if durationInt > 3600:
+ hours = (durationInt - (minutes*60) - seconds)/3600
+ displayDuration = "%02d:%s" % (hours, displayDuration)
+
+ # Set the display duration to be the time in minutes
+ return displayDuration
+
+
# Load the Correct set of images for icons and thumbnails
# Image options are
# (NFO - Will overwrite these values)
@@ -532,6 +586,9 @@ class ExtrasItem(BaseExtrasItem):
def getTotalDuration(self):
return self.totalDuration
+ def getDisplayDuration(self):
+ return BaseExtrasItem.getDisplayDuration(self, self.totalDuration)
+
def setResumePoint(self, currentPoint):
# Now set the flag to show if it has been watched
# Consider watched if within 15 seconds of the end
@@ -1018,10 +1075,14 @@ class VideoExtrasWindow(xbmcgui.WindowXML):
for anExtra in self.files:
log("VideoExtrasWindow: filename: %s" % anExtra.getFilename())
- anItem = xbmcgui.ListItem(anExtra.getDisplayName(),
path=SourceDetails.getFilenameAndPath())
+ # Label2 is used to store the duration in HH:MM:SS format
+ anItem = xbmcgui.ListItem(anExtra.getDisplayName(),
anExtra.getDisplayDuration(), path=SourceDetails.getFilenameAndPath())
anItem.setProperty("FileName", anExtra.getFilename())
anItem.setInfo('video', { 'PlayCount': anExtra.getWatched() })
anItem.setInfo('video', { 'Title': SourceDetails.getTitle() })
+ # We store the duration here, but it is only in minutes and does
not
+ # look very good if displayed, so we also set Label2 to a viewable
value
+ anItem.setInfo('video', { 'Duration':
int(anExtra.getDuration()/60) })
if SourceDetails.getTvShowTitle() != "":
anItem.setInfo('video', { 'TvShowTitle':
SourceDetails.getTvShowTitle() })
diff --git a/script.videoextras/resources/language/German/strings.po
b/script.videoextras/resources/language/German/strings.po
index bebf7ab..2775050 100644
--- a/script.videoextras/resources/language/German/strings.po
+++ b/script.videoextras/resources/language/German/strings.po
@@ -2,13 +2,16 @@
# Addon Name: VideoExtras
# Addon id: script.videoextras
# Addon Provider: robwebset
+# Translators:
+# MartinB. <[email protected]>, 2013
+# bitboy <[email protected]>, 2014
msgid ""
msgstr ""
"Project-Id-Version: XBMC Addons\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: XBMC Translation Team\n"
+"PO-Revision-Date: 2014-01-14 14:36+0000\n"
+"Last-Translator: bitboy <[email protected]>\n"
"Language-Team: German
(http://www.transifex.com/projects/p/xbmc-addons/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,8 +19,20 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgctxt "Addon Summary"
+msgid "Add Video Extras to your Movies and TV shows."
+msgstr "Video Extras zu deinen Filmen und TV-Sendungen hinzufügen"
+
+msgctxt "Addon Description"
+msgid ""
+"Provides a way to add Video Extras to your Video library. Look at the wiki "
+"for setup instructions."
+msgstr "Bietet einen Weg um Extras zu deiner Video Bibliothek hinzuzufügen.
Schau ins wiki für eine Installationsanleitung."
+
msgctxt "Addon Disclaimer"
-msgid "Skinners, please see the wiki to know how to integrate it in your skin:
http://wiki.xbmc.org/index.php?title=Add-on:VideoExtras";
+msgid ""
+"Skinners, please see the wiki to know how to integrate it in your skin: "
+"http://wiki.xbmc.org/index.php?title=Add-on:VideoExtras";
msgstr "Skin-Ersteller, bitte schaut für Informationen über die Integration
in euren Skin im Wiki:\nhttp://wiki.xbmc.org/index.php?title=Add-on:VideoExtras";
msgctxt "#32001"
@@ -32,6 +47,18 @@ msgctxt "#32003"
msgid "Search Nested Directories"
msgstr "Verschachtelte Ordner durchsuchen."
+msgctxt "#32004"
+msgid "Enable Extras with File Tag"
+msgstr "Aktiviere Extras mit Datei-Tag"
+
+msgctxt "#32005"
+msgid "Extras File Name Tag"
+msgstr "Extras Datei-Tag"
+
+msgctxt "#32006"
+msgid "Menu to show after playing an extra"
+msgstr "Menü, das nach Abspielen eines Extras angezeigt werden soll"
+
msgctxt "#32007"
msgid "Video Selection"
msgstr "Videoauswahl"
@@ -48,14 +75,38 @@ msgctxt "#32010"
msgid "File System"
msgstr "Dateisystem"
+msgctxt "#32011"
+msgid "Remote Extras Location"
+msgstr "Extras Speicherort"
+
+msgctxt "#32012"
+msgid "Use Custom Extras Location"
+msgstr "Verwende eigenen Extras Speicherort"
+
msgctxt "#32013"
msgid "Path"
msgstr "Pfad"
+msgctxt "#32014"
+msgid "Custom Movies Sub-Folder"
+msgstr "Eigener Unterordner für Filme"
+
+msgctxt "#32015"
+msgid "Custom TV Shows Sub-Folder"
+msgstr "Eigener Unterordner für TV-Sendungen"
+
msgctxt "#32016"
msgid "Advanced"
msgstr "Erweitert"
+msgctxt "#32017"
+msgid "Force Extras Button Display"
+msgstr "Anzeige des Extras-Butons erzwingen"
+
+msgctxt "#32018"
+msgid "Exclude Files Regular Expression"
+msgstr "Regulärer Ausdruck zum AusschlieÃen von Dateien"
+
msgctxt "#32019"
msgid "Debugging"
msgstr "Debugging"
@@ -80,6 +131,14 @@ msgctxt "#32024"
msgid "Clean Database"
msgstr "Datenbank aufräumen"
+msgctxt "#32025"
+msgid "Use Detailed List Screen"
+msgstr "Verwende Detailliste"
+
+msgctxt "#32026"
+msgid "Window to show after exiting detailed list"
+msgstr "Fenster, das beim Verlassen der Detailliste angezeigt werden soll"
+
msgctxt "#32101"
msgid "Play All"
msgstr "Alle wiedergeben"
diff --git a/script.videoextras/resources/language/Hebrew/strings.po
b/script.videoextras/resources/language/Hebrew/strings.po
index c90b14b..5e54a87 100644
--- a/script.videoextras/resources/language/Hebrew/strings.po
+++ b/script.videoextras/resources/language/Hebrew/strings.po
@@ -2,13 +2,15 @@
# Addon Name: VideoExtras
# Addon id: script.videoextras
# Addon Provider: robwebset
+# Translators:
+# dhead666 <[email protected]>, 2014
msgid ""
msgstr ""
"Project-Id-Version: XBMC Addons\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: XBMC Translation Team\n"
+"PO-Revision-Date: 2014-01-15 02:40+0000\n"
+"Last-Translator: dhead666 <[email protected]>\n"
"Language-Team: Hebrew
(http://www.transifex.com/projects/p/xbmc-addons/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,9 +18,49 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgctxt "Addon Summary"
+msgid "Add Video Extras to your Movies and TV shows."
+msgstr "××סף ספ××ש××× (Video Extras) ×סר××× ××ס×ר×ת
ש××."
+
+msgctxt "Addon Description"
+msgid ""
+"Provides a way to add Video Extras to your Video library. Look at the wiki "
+"for setup instructions."
+msgstr "×ספק ×פשר×ת ×××ס××£ ספ××ש××× (Video Extras)
×ספר××ת ×××××× ×©××. ×¤× × ×××××§× ×××ר××ת ×תק×
×."
+
+msgctxt "Addon Disclaimer"
+msgid ""
+"Skinners, please see the wiki to know how to integrate it in your skin: "
+"http://wiki.xbmc.org/index.php?title=Add-on:VideoExtras";
+msgstr "×פת×× ××¢×פ×ת, ×× × ×¤× × ×××××§× ×××× ×
×××¦× ×ש×× ×ת ×סקר××¤× ×××¢×פת ש×××:
http://wiki.xbmc.org/index.php?title=Add-on:VideoExtras";
+
msgctxt "#32001"
msgid "Extras"
-msgstr "פ×× ×ק××"
+msgstr "ספ××ש×××"
+
+msgctxt "#32002"
+msgid "Extras Directory Name"
+msgstr "×©× ×ª×ק××ת ספ××ש×××"
+
+msgctxt "#32003"
+msgid "Search Nested Directories"
+msgstr "×פש ×ת×ק××ת ×ק×× × ×ת"
+
+msgctxt "#32004"
+msgid "Enable Extras with File Tag"
+msgstr "×פשר ××××× ×¡×¤××ש××× ××¤× ×ª××ת ק×××¥"
+
+msgctxt "#32005"
+msgid "Extras File Name Tag"
+msgstr "ת××ת ×©× ×§×××¥ ספ××ש×"
+
+msgctxt "#32006"
+msgid "Menu to show after playing an extra"
+msgstr "תפר×× ××צ×× ×××ר × ×××× ×¡×¤××ש×"
+
+msgctxt "#32007"
+msgid "Video Selection"
+msgstr "×××רת ×××××"
msgctxt "#32008"
msgid "Information"
@@ -28,26 +70,74 @@ msgctxt "#32009"
msgid "Home"
msgstr "××ת"
+msgctxt "#32010"
+msgid "File System"
+msgstr "×ער×ת ק×צ××"
+
+msgctxt "#32011"
+msgid "Remote Extras Location"
+msgstr "××ק×× ×¡×¤××ש××× ×ר××ק"
+
+msgctxt "#32012"
+msgid "Use Custom Extras Location"
+msgstr "××ק×× ×¡×¤××ש××× ××ת××"
+
msgctxt "#32013"
msgid "Path"
msgstr "× ×ª××"
+msgctxt "#32014"
+msgid "Custom Movies Sub-Folder"
+msgstr "תת ת×ק××ת סר××× ××ת××ת"
+
+msgctxt "#32015"
+msgid "Custom TV Shows Sub-Folder"
+msgstr "תת ת×ק××ת ס×ר×ת ××ת××ת"
+
msgctxt "#32016"
msgid "Advanced"
msgstr "×תק××"
+msgctxt "#32017"
+msgid "Force Extras Button Display"
+msgstr "×××¥ ×צ×ת ×××¦× ×¡×¤××ש×××"
+
+msgctxt "#32018"
+msgid "Exclude Files Regular Expression"
+msgstr "RegEX ××× ××××ת ק×צ××"
+
msgctxt "#32019"
msgid "Debugging"
msgstr "× ×פ×× ×©××××ת"
msgctxt "#32020"
msgid "Enable debug logging"
-msgstr "××¤×¢× ××× × ×פ×× ×©××××ת"
+msgstr "××¤×¢× ×¨×ש×× ×©××××ת"
msgctxt "#32021"
msgid "Database"
msgstr "××¡× × ×ª×× ××"
+msgctxt "#32022"
+msgid "Enable Database Support"
+msgstr "××¤×¢× ×ª×××× ×××¡× × ×ª×× ××"
+
+msgctxt "#32023"
+msgid "Operations"
+msgstr "פע×××ת"
+
+msgctxt "#32024"
+msgid "Clean Database"
+msgstr "× ×§× ××¡× × ×ª×× ××"
+
+msgctxt "#32025"
+msgid "Use Detailed List Screen"
+msgstr "×שת×ש ×××¡× ×¨×©××× ×פ×ר×ת"
+
+msgctxt "#32026"
+msgid "Window to show after exiting detailed list"
+msgstr "×××× ××צ×× ×××ר ×צ××× ×××¡× ×¨×©×××
×פ×ר×ת"
+
msgctxt "#32101"
msgid "Play All"
msgstr "× ×× ×××"
@@ -56,6 +146,14 @@ msgctxt "#32102"
msgid "Info"
msgstr "××××¢"
+msgctxt "#32103"
+msgid "No extras found"
+msgstr "×× × ×צ×× ×¡×¤××ש×××"
+
+msgctxt "#32104"
+msgid "Resume from"
+msgstr "×××©× ×-"
+
msgctxt "#32105"
msgid "Start from beginning"
-msgstr "×ת×× ××ת×××"
+msgstr "××¤×¢× ××ת×××"
diff --git a/script.videoextras/resources/language/Polish/strings.po
b/script.videoextras/resources/language/Polish/strings.po
index f477535..0dda8fd 100644
--- a/script.videoextras/resources/language/Polish/strings.po
+++ b/script.videoextras/resources/language/Polish/strings.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: XBMC Addons\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2013-12-27 13:21+0000\n"
+"PO-Revision-Date: 2014-01-22 10:10+0000\n"
"Last-Translator: sebf <[email protected]>\n"
"Language-Team: Polish
(http://www.transifex.com/projects/p/xbmc-addons/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/script.videoextras/resources/language/Spanish/strings.po
b/script.videoextras/resources/language/Spanish/strings.po
index cbf80e0..55f8b22 100644
--- a/script.videoextras/resources/language/Spanish/strings.po
+++ b/script.videoextras/resources/language/Spanish/strings.po
@@ -2,13 +2,15 @@
# Addon Name: VideoExtras
# Addon id: script.videoextras
# Addon Provider: robwebset
+# Translators:
+# davidmuma <[email protected]>, 2014
msgid ""
msgstr ""
"Project-Id-Version: XBMC Addons\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: XBMC Translation Team\n"
+"PO-Revision-Date: 2014-01-30 11:40+0000\n"
+"Last-Translator: davidmuma <[email protected]>\n"
"Language-Team: Spanish
(http://www.transifex.com/projects/p/xbmc-addons/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,10 +18,50 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgctxt "Addon Summary"
+msgid "Add Video Extras to your Movies and TV shows."
+msgstr "Añadir extras de vÃdeo para sus pelÃculas y programas de
televisión."
+
+msgctxt "Addon Description"
+msgid ""
+"Provides a way to add Video Extras to your Video library. Look at the wiki "
+"for setup instructions."
+msgstr "Proporciona una manera de añadir extras de vÃdeos a su biblioteca.
Mira el wiki para instrucciones de instalación."
+
+msgctxt "Addon Disclaimer"
+msgid ""
+"Skinners, please see the wiki to know how to integrate it in your skin: "
+"http://wiki.xbmc.org/index.php?title=Add-on:VideoExtras";
+msgstr "Skinners, por favor ver el wiki para saber cómo integrarlo en tu
piel: http://wiki.xbmc.org/index.php?title=Add-on:VideoExtras";
+
msgctxt "#32001"
msgid "Extras"
msgstr "Extras"
+msgctxt "#32002"
+msgid "Extras Directory Name"
+msgstr "Nombre de carpeta para extras"
+
+msgctxt "#32003"
+msgid "Search Nested Directories"
+msgstr "Buscar en carpetas anidadas"
+
+msgctxt "#32004"
+msgid "Enable Extras with File Tag"
+msgstr "Habilitar extras con la etiqueta del archivo"
+
+msgctxt "#32005"
+msgid "Extras File Name Tag"
+msgstr "Extras con el nombre de la etiqueta del archivo"
+
+msgctxt "#32006"
+msgid "Menu to show after playing an extra"
+msgstr "Mostra menú después de reproducir un extra"
+
+msgctxt "#32007"
+msgid "Video Selection"
+msgstr "Selección de vÃdeo"
+
msgctxt "#32008"
msgid "Information"
msgstr "Información"
@@ -28,14 +70,42 @@ msgctxt "#32009"
msgid "Home"
msgstr "Inicio"
+msgctxt "#32010"
+msgid "File System"
+msgstr "Sistema de archivos"
+
+msgctxt "#32011"
+msgid "Remote Extras Location"
+msgstr "Ubicación remota de extras"
+
+msgctxt "#32012"
+msgid "Use Custom Extras Location"
+msgstr "Usar ubicación por defecto para extras "
+
msgctxt "#32013"
msgid "Path"
msgstr "Ruta"
+msgctxt "#32014"
+msgid "Custom Movies Sub-Folder"
+msgstr "Subcarpeta por defecto para pelÃculas"
+
+msgctxt "#32015"
+msgid "Custom TV Shows Sub-Folder"
+msgstr "Subcarpeta por defecto para series"
+
msgctxt "#32016"
msgid "Advanced"
msgstr "Avanzado"
+msgctxt "#32017"
+msgid "Force Extras Button Display"
+msgstr "Forzar visualización del botón de extras"
+
+msgctxt "#32018"
+msgid "Exclude Files Regular Expression"
+msgstr "Excluir archivos de expresiones regulares"
+
msgctxt "#32019"
msgid "Debugging"
msgstr "Depuración"
@@ -48,10 +118,26 @@ msgctxt "#32021"
msgid "Database"
msgstr "Base de Datos"
+msgctxt "#32022"
+msgid "Enable Database Support"
+msgstr "Habilitar el soporte de base de datos"
+
+msgctxt "#32023"
+msgid "Operations"
+msgstr "Operaciones"
+
msgctxt "#32024"
msgid "Clean Database"
msgstr "Limpiar base de datos"
+msgctxt "#32025"
+msgid "Use Detailed List Screen"
+msgstr "Usar pantalla de lista detallada"
+
+msgctxt "#32026"
+msgid "Window to show after exiting detailed list"
+msgstr "Mostar ventana después de salir de la lista detallada"
+
msgctxt "#32101"
msgid "Play All"
msgstr "Reproducir todo"
@@ -60,6 +146,14 @@ msgctxt "#32102"
msgid "Info"
msgstr "Info"
+msgctxt "#32103"
+msgid "No extras found"
+msgstr "Ningún extra encontrado"
+
+msgctxt "#32104"
+msgid "Resume from"
+msgstr "Volver a empezar desde"
+
msgctxt "#32105"
msgid "Start from beginning"
msgstr "Comenzar desde el principio"
diff --git
a/script.videoextras/resources/skins/Default/720p/script-videoextras-main.xml
b/script.videoextras/resources/skins/Default/720p/script-videoextras-main.xml
index 969259a..468c6db 100644
---
a/script.videoextras/resources/skins/Default/720p/script-videoextras-main.xml
+++
b/script.videoextras/resources/skins/Default/720p/script-videoextras-main.xml
@@ -7,25 +7,65 @@
<defaultcontrol always="true">51</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
- <include>CommonBackground</include>
- <include>ContentPanelBackgrounds</include>
+ <!-- include: CommonBackground -->
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>1280</width>
+ <height>720</height>
+ <aspectratio>scale</aspectratio>
+ <texture
background="true">$INFO[ListItem.Art(fanart)]</texture>
+ <visible>!Skin.HasSetting(HideBackGroundFanart) +
!IsEmpty(ListItem.Property(Fanart_Image))</visible>
+ <!-- include: Window_OpenClose_Animation -->
+ <animation effect="fade"
time="250">WindowOpen</animation>
+ <animation effect="fade"
time="250">WindowClose</animation>
+ </control>
+
<control type="group">
- <include>Window_OpenClose_Animation</include>
+ <!-- include: Window_OpenClose_Animation -->
+ <animation effect="fade"
time="250">WindowOpen</animation>
+ <animation effect="fade"
time="250">WindowClose</animation>
</control>
- <include>CommonPageCount</include>
- <include>CommonNowPlaying</include>
- <include>MainWindowMouseButtons</include>
- <include>BehindDialogFadeOut</include>
- <include>ScrollOffsetLabel</include>
- <control type="image">
- <description>Section header image</description>
- <posx>20</posx>
- <posy>3</posy>
- <width>35</width>
- <height>35</height>
- <aspectratio>keep</aspectratio>
- <texture>icon_video.png</texture>
+ <!-- include: CommonPageCount -->
+ <control type="group">
+ <animation effect="slide" start="0,0" end="-90,0"
time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
+ <control type="label">
+ <description>Page Count Label</description>
+ <posx>40r</posx>
+ <posy>53r</posy>
+ <width>500</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>FFb4b4b4</textcolor>
+ <scroll>false</scroll>
+ <align>right</align>
+ <aligny>center</aligny>
+
<label>$INFO[Container.NumItems,([COLOR=FF0084ff],[/COLOR])
$LOCALIZE[31025]]$INFO[Container.CurrentPage, - $LOCALIZE[31024]
([COLOR=FF0084ff]]$INFO[Container.NumPages,/,[/COLOR])]</label>
+ <!-- include: Window_OpenClose_Animation -->
+ <animation effect="fade"
time="250">WindowOpen</animation>
+ <animation effect="fade"
time="250">WindowClose</animation>
+ </control>
</control>
+
+ <!-- include: ContentPanelBackgrounds -->
+ <control type="group">
+ <!-- include: Window_OpenClose_Animation -->
+ <animation effect="fade"
time="250">WindowOpen</animation>
+ <animation effect="fade"
time="250">WindowClose</animation>
+ <control type="group">
+ <!-- include: VisibleFadeEffect -->
+ <animation effect="fade"
time="300">Visible</animation>
+ <animation effect="fade"
time="300">Hidden</animation>
+ <control type="image">
+ <posx>75</posx>
+ <posy>60</posy>
+ <width>1130</width>
+ <height>600</height>
+ <texture
border="15">ContentPanel.png</texture>
+ </control>
+ </control>
+ </control>
+
<control type="grouplist">
<description>Section header Test Label: "Extras -
Title"</description>
<posx>65</posx>
@@ -36,17 +76,39 @@
<align>left</align>
<itemgap>5</itemgap>
<control type="label">
- <include>WindowTitleCommons</include>
+ <!-- include: WindowTitleCommons -->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width min="0" max="800">auto</width>
+ <height>30</height>
+ <font>font14</font>
+ <textcolor>FFFFFFFF</textcolor>
+ <shadowcolor>FF000000</shadowcolor>
+ <scroll>false</scroll>
+ <align>left</align>
+ <aligny>center</aligny>
<label>$ADDON[script.videoextras 32001]</label>
</control>
<control type="label" id="321">
- <include>WindowTitleCommons</include>
+ <!-- include: WindowTitleCommons -->
+ <posx>0</posx>
+ <posy>0</posy>
+ <width min="0" max="800">auto</width>
+ <height>30</height>
+ <font>font14</font>
+ <textcolor>FFFFFFFF</textcolor>
+ <shadowcolor>FF000000</shadowcolor>
+ <scroll>false</scroll>
+ <align>left</align>
+ <aligny>center</aligny>
<visible>!IsEmpty(ListItem.Title)</visible>
- <label>[COLOR=blue] - [/COLOR]
$INFO[ListItem.Title]</label>
+ <label>[COLOR=FF0084ff] - [/COLOR]
$INFO[ListItem.Title]</label>
</control>
</control>
<control type="group">
- <include>VisibleFadeEffect</include>
+ <!-- include: VisibleFadeEffect -->
+ <animation effect="fade" time="300">Visible</animation>
+ <animation effect="fade" time="300">Hidden</animation>
<control type="list" id="51">
<posx>95</posx>
<posy>78</posy>
@@ -61,13 +123,6 @@
<scrolltime>200</scrolltime>
<itemlayout height="40" width="1080">
<control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>1080</width>
- <height>41</height>
- <texture
border="0,2,0,2">MenuItemNF.png</texture>
- </control>
- <control type="image">
<posx>10</posx>
<posy>4</posy>
<width>40</width>
@@ -80,12 +135,25 @@
<width>950</width>
<height>40</height>
<font>font13</font>
- <textcolor>grey2</textcolor>
-
<selectedcolor>selected</selectedcolor>
+ <textcolor>FF999999</textcolor>
+
<selectedcolor>FFEB9E17</selectedcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
</control>
+ <control type="label">
+ <posx>950</posx>
+ <posy>0</posy>
+ <width>100</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>FF999999</textcolor>
+
<selectedcolor>FFEB9E17</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+
<visible>!IsEmpty(ListItem.Label2)</visible>
+
<label>$INFO[ListItem.Label2]</label>
+ </control>
<control type="image">
<posx>1050</posx>
<posy>14</posy>
@@ -99,30 +167,13 @@
<posy>14</posy>
<width>20</width>
<height>20</height>
+ <!-- Default XBMC Icon -->
<texture>OverlayWatched.png</texture>
<visible>IntegerGreaterThan(ListItem.PlayCount,0)</visible>
</control>
</itemlayout>
<focusedlayout height="40" width="1080">
<control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>1080</width>
- <height>41</height>
- <texture
border="0,2,0,2">MenuItemNF.png</texture>
-
<visible>!Control.HasFocus(51)</visible>
-
<include>VisibleFadeEffect</include>
- </control>
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>1080</width>
- <height>41</height>
- <texture
border="0,2,0,2">MenuItemFO.png</texture>
-
<visible>Control.HasFocus(51)</visible>
-
<include>VisibleFadeEffect</include>
- </control>
- <control type="image">
<posx>10</posx>
<posy>4</posy>
<width>40</width>
@@ -135,12 +186,25 @@
<width>950</width>
<height>40</height>
<font>font13</font>
- <textcolor>white</textcolor>
-
<selectedcolor>selected</selectedcolor>
+ <textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FFEB9E17</selectedcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
</control>
+ <control type="label">
+ <posx>950</posx>
+ <posy>0</posy>
+ <width>100</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FFEB9E17</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+
<visible>!IsEmpty(ListItem.Label2)</visible>
+
<label>$INFO[ListItem.Label2]</label>
+ </control>
<control type="image">
<posx>1050</posx>
<posy>14</posy>
@@ -154,6 +218,7 @@
<posy>14</posy>
<width>20</width>
<height>20</height>
+ <!-- Default XBMC Icon -->
<texture>OverlayWatched.png</texture>
<visible>IntegerGreaterThan(ListItem.PlayCount,0)</visible>
</control>
@@ -164,11 +229,8 @@
<posy>80</posy>
<width>25</width>
<height>550</height>
- <texturesliderbackground
border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
<texturesliderbar
border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
- <texturesliderbarfocus
border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-
<textureslidernib>ScrollBarNib.png</textureslidernib>
-
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+ <texturesliderbarfocus
border="0,14,0,14">ScrollBarV_bar.png</texturesliderbarfocus>
<onleft>51</onleft>
<onright>51</onright>
<showonepage>false</showonepage>
@@ -176,7 +238,5 @@
<visible>Control.IsVisible(51)</visible>
</control>
</control>
-
- <include>Clock</include>
</controls>
</window>
diff --git
a/script.videoextras/resources/skins/Default/720p/script-videoextras-resume.xml
b/script.videoextras/resources/skins/Default/720p/script-videoextras-resume.xml
index 676a1c9..bbfa084 100644
---
a/script.videoextras/resources/skins/Default/720p/script-videoextras-resume.xml
+++
b/script.videoextras/resources/skins/Default/720p/script-videoextras-resume.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="buttonMenu">
<defaultcontrol>9001</defaultcontrol>
- <include>dialogeffect</include>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
<allowoverlay>yes</allowoverlay>
<coordinates>
<system>1</system>
@@ -25,81 +26,51 @@
<onup>9000</onup>
<ondown>2</ondown>
</control>
- <control type="grouplist" id="9000">
+ <control type="image">
+ <description>background image</description>
<posx>470</posx>
- <posy>0</posy>
+ <posy>240</posy>
<width>340</width>
- <height>720</height>
+ <height>120</height>
+ <align>center</align>
+ <texture border="20,19,20,0">ContentPanel.png</texture>
+ </control>
+ <!-- Overlay the buttons on top of the background image with a
20 boarder -->
+ <control type="grouplist" id="9000">
+ <posx>490</posx>
+ <posy>240</posy>
+ <width>300</width>
+ <height>120</height>
<onleft>9000</onleft>
<onright>9000</onright>
<onup>9000</onup>
<ondown>9000</ondown>
<itemgap>0</itemgap>
<align>center</align>
- <control type="group" id="1">
- <width>340</width>
- <height>30</height>
- <control type="image">
- <description>background top
image</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>340</width>
- <height>30</height>
- <texture
border="20,19,20,0">DialogContextTop.png</texture>
- </control>
- <control type="button" id="20">
- <description>Close Window
button</description>
- <posx>260</posx>
- <posy>5</posy>
- <width>64</width>
- <height>32</height>
- <label>-</label>
- <font>-</font>
- <onclick>PreviousMenu</onclick>
-
<texturefocus>DialogCloseButton-focus.png</texturefocus>
-
<texturenofocus>DialogCloseButton.png</texturenofocus>
- <onleft>2</onleft>
- <onright>13</onright>
- <onup>13</onup>
- <ondown>2</ondown>
-
<visible>system.getbool(input.enablemouse)</visible>
- </control>
- </control>
<control type="button" id="2">
<description>Resume button</description>
- <width>340</width>
+ <width>300</width>
<height>40</height>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
+ <textcolor>FF999999</textcolor>
+ <focusedcolor>FFFFFFFF</focusedcolor>
<align>center</align>
<textwidth>290</textwidth>
- <texturefocus
border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
- <texturenofocus
border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
<pulseonselect>no</pulseonselect>
<font>font13</font>
<label>$ADDON[script.videoextras 32104] </label>
</control>
<control type="button" id="40">
<description>Start from beginning
button</description>
- <width>340</width>
+ <width>300</width>
<height>40</height>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
+ <textcolor>FF999999</textcolor>
+ <focusedcolor>FFFFFFFF</focusedcolor>
<align>center</align>
<textwidth>290</textwidth>
- <texturefocus
border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
- <texturenofocus
border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
<pulseonselect>no</pulseonselect>
<font>font13</font>
<label>$ADDON[script.videoextras 32105]</label>
</control>
- <control type="image" id="14">
- <description>background bottom
image</description>
- <posx>0</posx>
- <width>340</width>
- <height>25</height>
- <texture
border="20,0,19,20">DialogContextBottom.png</texture>
- </control>
</control>
</controls>
</window>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=5a556f1fb6149d87f8cba0c91fa5e20df4057055
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
script.service.alarmclock/README.md | 33 +++
script.service.alarmclock/addon.xml | 47 ++++
script.service.alarmclock/changelog.txt | 2 +
script.service.alarmclock/default.py | 109 ++++++++
script.service.alarmclock/fanart.jpg | Bin 0 -> 243732 bytes
script.service.alarmclock/icon.png | Bin 0 -> 18922 bytes
.../resources/language/English/strings.po | 120 +++++++++
.../resources/lib}/__init__.py | 0
.../resources/lib/cronjobs.py | 83 +++++++
script.service.alarmclock/resources/settings.xml | 63 +++++
script.videoextras/addon.xml | 2 +-
script.videoextras/changelog.txt | 4 +
script.videoextras/default.py | 63 +++++-
.../resources/language/German/strings.po | 65 +++++-
.../resources/language/Hebrew/strings.po | 108 ++++++++-
.../resources/language/Polish/strings.po | 2 +-
.../resources/language/Spanish/strings.po | 98 +++++++-
script.videoextras/resources/lib/VideoParser.py | 68 +++++
.../resources/lib/parsers/AVIParser.py | 260 ++++++++++++++++++++
.../resources/lib/parsers/FLVParser.py | 138 +++++++++++
.../resources/lib/parsers/FileAccess.py | 207 ++++++++++++++++
.../resources/lib/parsers/MKVParser.py | 211 ++++++++++++++++
.../resources/lib/parsers/MP4Parser.py | 137 ++++++++++
.../resources/lib/parsers/TSParser.py | 243 ++++++++++++++++++
.../skins/Default/720p/script-videoextras-main.xml | 170 +++++++++----
.../Default/720p/script-videoextras-resume.xml | 71 ++----
.../resources/skins/Default/media/ContentPanel.png | Bin 0 -> 53334 bytes
.../skins/Default/media/OverlayWatching.png | Bin 0 -> 3740 bytes
.../skins/Default}/media/ScrollBarV_bar.png | Bin 3454 -> 3454 bytes
.../720p/script-videoextras-main.xml | 210 ++++++++++++++++
.../720p/script-videoextras-resume.xml | 0
32 files changed, 2396 insertions(+), 118 deletions(-)
copy {script.filecleaner => script.service.alarmclock}/LICENSE.txt (100%)
create mode 100644 script.service.alarmclock/README.md
create mode 100644 script.service.alarmclock/addon.xml
create mode 100644 script.service.alarmclock/changelog.txt
create mode 100644 script.service.alarmclock/default.py
create mode 100644 script.service.alarmclock/fanart.jpg
create mode 100644 script.service.alarmclock/icon.png
create mode 100644
script.service.alarmclock/resources/language/English/strings.po
copy {script.ace.extrapack/resources =>
script.service.alarmclock/resources/lib}/__init__.py (100%)
create mode 100644 script.service.alarmclock/resources/lib/cronjobs.py
create mode 100644 script.service.alarmclock/resources/settings.xml
create mode 100644 script.videoextras/resources/lib/VideoParser.py
create mode 100644 script.videoextras/resources/lib/parsers/AVIParser.py
create mode 100644 script.videoextras/resources/lib/parsers/FLVParser.py
create mode 100644 script.videoextras/resources/lib/parsers/FileAccess.py
create mode 100644 script.videoextras/resources/lib/parsers/MKVParser.py
create mode 100644 script.videoextras/resources/lib/parsers/MP4Parser.py
create mode 100644 script.videoextras/resources/lib/parsers/TSParser.py
create mode 100644
script.videoextras/resources/skins/Default/media/ContentPanel.png
create mode 100644
script.videoextras/resources/skins/Default/media/OverlayWatching.png
copy {script.linux.nm/resources/skins/default =>
script.videoextras/resources/skins/Default}/media/ScrollBarV_bar.png (100%)
create mode 100644
script.videoextras/resources/skins/skin.confluence/720p/script-videoextras-main.xml
copy script.videoextras/resources/skins/{Default =>
skin.confluence}/720p/script-videoextras-resume.xml (100%)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable
security intelligence. It gives you real-time visual feedback on key
security issues and trends. Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
