The branch, eden-pre has been updated
via 789e68033849ba04359438cb54bead12a5f50629 (commit)
from 552033c88d272ec7be20cf3edcd72751b3a35c7f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=789e68033849ba04359438cb54bead12a5f50629
commit 789e68033849ba04359438cb54bead12a5f50629
Author: amet <[email protected]>
Date: Tue Jun 14 13:09:03 2011 +0400
[script.xbmc.subtitles] -v 2.9.12
- fixed: ordering of OpenSubtitles results, thx to cidus
- fixed: Undertexter, it will now find Swedish subs
- fixed: Legendas-Zone.org version 0.1.7
- fixed: LegendasDivx.com v0.2.3
- new default window, thx ronie
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index fad0b42..b0ec04b 100644
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.xbmc.subtitles"
name="XBMC Subtitles"
- version="2.9.11"
+ version="2.9.12"
provider-name="Amet, mr_blobby">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt
b/script.xbmc.subtitles/changelog.txt
index 9da887b..4590229 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,5 +1,13 @@
+2.9.12
+- fixed: ordering of OpenSubtitles results, thx to cidus
+- fixed: Undertexter, it will now find Swedish subs
+- fixed: Legendas-Zone.org version 0.1.7
+- fixed: LegendasDivx.com v0.2.3
+- new default window, thx ronie
+
2.9.11
- fixed: broken settings file
+
2.9.10
- added: extra regex for "sXXepXX"
- added: New Service Legendas-Zone.org, thx HiGhLaNdR
diff --git
a/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
b/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
index be7702c..16631ca 100644
--- a/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/LegendasDivx/service.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Service LegendasDivx.com version 0.2.1
+# Service LegendasDivx.com version 0.2.3
# Code based on Undertext service
# Coded by HiGhLaNdR@OLDSCHOOL
# Help by VaRaTRoN
@@ -8,6 +8,10 @@
# http://www.teknorage.com
# License: GPL v2
#
+# NEW on Service LegendasDivx.com v0.2.3:
+# Fixed typo on the version.
+# Added built-in notifications.
+#
# NEW on Service LegendasDivx.com v0.2.2:
# Fixed pathnames using (os.sep). For sure :)
#
@@ -50,6 +54,7 @@ from utilities import log
_ = sys.modules[ "__main__" ].__language__
__scriptname__ = sys.modules[ "__main__" ].__scriptname__
__settings__ = sys.modules[ "__main__" ].__settings__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
main_url = "http://www.legendasdivx.com/";
debug_pretext = "LegendasDivx"
@@ -104,6 +109,10 @@ subtitle_pattern =
"<div\sclass=\"sub_box\">[\r\n\t]{2}<div\sclass=\"sub_header\
#====================================================================================================================
# Functions
#====================================================================================================================
+def msg(text, timeout):
+ icon = os.path.join(__cwd__,"icon.png")
+ xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,timeout,icon))
+
def getallsubs(searchstring, languageshort, languagelong, file_original_path,
subtitles_list, searchstring_notclean):
@@ -113,6 +122,7 @@ def getallsubs(searchstring, languageshort, languagelong,
file_original_path, su
content = geturl(url)
log( __name__ ,"%s Getting '%s' subs ..." % (debug_pretext,
languageshort))
+ msg("Searching Title... Please wait!", 6000)
while re.search(subtitle_pattern, content, re.IGNORECASE | re.DOTALL |
re.MULTILINE | re.UNICODE | re.VERBOSE) and page < 6:
for matches in re.finditer(subtitle_pattern, content,
re.IGNORECASE | re.DOTALL | re.MULTILINE | re.UNICODE | re.VERBOSE):
hits = matches.group(5)
@@ -171,6 +181,11 @@ def getallsubs(searchstring, languageshort, languagelong,
file_original_path, su
url = main_url +
"modules.php?name=Downloads&file=jz&d_op=search_next&order=&form_cat=28&page="
+ str(page) + "&query=" + urllib.quote_plus(searchstring)
content = geturl(url)
+ if subtitles_list != []:
+ msg("Finished Searching. Choose One!", 3000)
+ else:
+ msg("No Results! Try Parent Dir Or Manual!", 4000)
+
# Bubble sort, to put syncs on top
for n in range(0,len(subtitles_list)):
for i in range(1, len(subtitles_list)):
@@ -267,6 +282,7 @@ def recursive_glob(treeroot, pattern):
def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir,
sub_folder, session_id): #standard input
+ msg("Downloading... Please Wait!", 6000)
id = subtitles_list[pos][ "id" ]
sync = subtitles_list[pos][ "sync" ]
log( __name__ ,"%s Fetching id using url %s" % (debug_pretext, id))
@@ -326,6 +342,7 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
max_mtime = mtime
init_max_mtime = max_mtime
time.sleep(2) # wait 2 seconds so that the unpacked
files are at least 1 second newer
+ msg("Extracting... Please Wait!", 6000)
xbmc.executebuiltin("XBMC.Extract(" + local_tmp_file +
"," + tmp_sub_dir +")")
waittime = 0
while (filecount == init_filecount) and (waittime < 20)
and (init_max_mtime == max_mtime): # nothing yet extracted
@@ -343,6 +360,7 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
if waittime == 20:
log( __name__ ,"%s Failed to unpack subtitles
in '%s'" % (debug_pretext, tmp_sub_dir))
else:
+ msg("Done Extracting!", 3000)
log( __name__ ,"%s Unpacked files in '%s'" %
(debug_pretext, tmp_sub_dir))
searchrars = recursive_glob(tmp_sub_dir,
packext)
searchrarcount = len(searchrars)
@@ -422,5 +440,7 @@ def download_subtitles (subtitles_list, pos, zip_subs,
tmp_sub_dir, sub_folder,
if subs_file ==
tmp_sub_dir+"/": subs_file = ""
elif sub_tmp:
subs_file = sub_tmp[0]
-
+
+ msg("Playing Title!", 3000)
+
return False, language, subs_file #standard output
\ No newline at end of file
diff --git
a/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/os_utilities.py
b/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/os_utilities.py
index e291380..953dd58 100644
--- a/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/os_utilities.py
+++ b/script.xbmc.subtitles/resources/lib/services/OpenSubtitles/os_utilities.py
@@ -14,9 +14,6 @@ BASE_URL_XMLRPC = u"http://api.opensubtitles.org/xml-rpc";
BASE_URL_HASH =
u"http://www.opensubtitles.org/en/search/sublanguageid-%s/moviebytesize-%s/moviehash-%s/simplexml";
BASE_URL_NAME =
u"http://www.opensubtitles.com/en/search/sublanguageid-%s/moviename-%s/simplexml";
-def compare_columns(b,a):
- return cmp( b["language_name"], a["language_name"] ) or cmp(
a["sync"], b["sync"] )
-
class OSDBServer:
###-------------------------- Merge Subtitles All -------------################
@@ -29,12 +26,13 @@ class OSDBServer:
if item["format"].find( "srt" ) == 0 or item["format"].find( "sub" )
== 0:
self.subtitles_list.append( item )
if( len ( self.subtitles_list ) > 0 ):
- self.subtitles_list = sorted(self.subtitles_list, compare_columns)
+ self.subtitles_list.sort(key=lambda x: [not x['sync'],x['lang_index']])
###-------------------------- Sort Subtitles -------------################
def sortsubtitles(self, subtitle, hashed, url_base):
filename = movie = lang_name = subtitle_id = lang_id = link = ""
+ lang_index = 3
flag_image = "-.gif"
if subtitle.getElementsByTagName("releasename")[0].firstChild:
filename =
subtitle.getElementsByTagName("releasename")[0].firstChild.data
@@ -49,14 +47,19 @@ class OSDBServer:
subtitle_id =
subtitle.getElementsByTagName("idsubtitle")[0].firstChild.data
if subtitle.getElementsByTagName("iso639")[0].firstChild:
lang_id = subtitle.getElementsByTagName("iso639")[0].firstChild.data
- flag_image = "flags/%s.gif" % (lang_id,)
+ flag_image = "flags/%s.gif" % (lang_id,)
+ lang_index=0
+ for user_lang_id in self.langs_ids:
+ if user_lang_id == lang_id:
+ break
+ lang_index+=1
if subtitle.getElementsByTagName("download")[0].firstChild:
link = subtitle.getElementsByTagName("download")[0].firstChild.data
link = url_base + link
if subtitle.getElementsByTagName("subrating")[0].firstChild:
rating = subtitle.getElementsByTagName("subrating")[0].firstChild.data
-
self.subtitles_hash_list.append({'filename':filename,'link':link,'language_name':lang_name,'language_id':lang_id,'language_flag':flag_image,'movie':movie,"ID":subtitle_id,"rating":str(
int( rating[0] ) ),"format":format,"sync":hashed})
+
self.subtitles_hash_list.append({'lang_index':lang_index,'filename':filename,'link':link,'language_name':lang_name,'language_id':lang_id,'language_flag':flag_image,'movie':movie,"ID":subtitle_id,"rating":str(
int( rating[0] ) ),"format":format,"sync":hashed})
def get_results ( self, search_url ):
@@ -75,6 +78,7 @@ class OSDBServer:
search_url2 = None
self.subtitles_list =[]
self.subtitles_hash_list = []
+ self.langs_ids = [languageTranslate(lang1,0,2),
languageTranslate(lang2,0,2), languageTranslate(lang3,0,2)]
language = languageTranslate(lang1,0,3)
if lang1 != lang2:
language += "," + languageTranslate(lang2,0,3)
diff --git
a/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py
b/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py
index 06dc0d8..11fe852 100644
--- a/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py
@@ -14,9 +14,18 @@ debug_pretext = ""
# subtitle pattern example:
"""
-<a href="http://www.engsub.net/86981/"; alt=....
-or
-<a href="http://www.undertexter.se/22743/"; alt="Dexter S05E01 - My Bad"
title="Dexter S05E01 - My Bad"><b>
+sv:
+<a style="text-decoration: none;" title="Ladda ner undertext till 127 Hours "
alt="Ladda ner undertext till 127 Hours "
href="http://www.undertexter.se/laddatext.php?id=24255 ">
+ <img src="http://www.undertexter.se/bilder/ladda_codec_mini.gif";
width="70" height="18" border="0" align="right"></a>
+ (1 cd)
+
<br> <img src="http://www.undertexter.se/bilder/spacer.gif";
height="2"><br>
+ Nedladdningar: 1154<br>
+ <img
src="http://www.undertexter.se/bilder/spacer.gif"; height="3"><br>
+ 127
Hours_2010_HD_720p_x264_SAG_screener [mf34inc]</td>
+
+
+en:
+<a href="http://www.engsub.net/86981/"; alt="Dexter S05E01 - My Bad"
title="Dexter S05E01 - My Bad"><b>
Dexter S05E01 - My Bad</b>
</a></td>
</tr>
@@ -28,8 +37,8 @@ or
<img
src="http://www.undertexter.se/bilder/spacer.gif"; height="3"><br>
Dexter.S05E01.720p.HDTV.x264-ORENJI</td>
"""
-sv_subtitle_pattern = "<a href=\"http://www.undertexter.se/(\d{1,10})/\"
alt=\"[^\r\n\t]*?\" title=\"[^\r\n\t]*?\"><b>\
-[ \r\n]*?[^\r\n\t]*?</b>.{400,500}?\(1 cd\).{250,550}?[
\r\n]*([^\r\n\t]*?)</td>[ \r\n]*?[^\r\n\t]*?</tr>"
+sv_subtitle_pattern =
"href=\"http://www.undertexter.se/laddatext.php\?id=(\d{1,10}) \">\
+[ \r\n]*?.{100,200}?\(1 cd\)[ \r\n]*?.{200,300}?height=\"3\"><br>[
\r\n]*?([^\r\n\t]*?)</td>"
# group(1) = id, group(2) = filename
en_subtitle_pattern = "<a href=\"http://www.engsub.net/(\d{1,10})/\"
alt=\"[^\r\n\t]*?\" title=\"[^\r\n\t]*?\"><b>\
diff --git
a/script.xbmc.subtitles/resources/skins/Default/720p/script-XBMC-Subtitles-main.xml
b/script.xbmc.subtitles/resources/skins/Default/720p/script-XBMC-Subtitles-main.xml
index e545bae..600ea35 100644
---
a/script.xbmc.subtitles/resources/skins/Default/720p/script-XBMC-Subtitles-main.xml
+++
b/script.xbmc.subtitles/resources/skins/Default/720p/script-XBMC-Subtitles-main.xml
@@ -2,408 +2,429 @@
<allowoverlay>no</allowoverlay>
<coordinates>
<system>1</system>
- <posx>0</posx>
+ <posx>380</posx>
<posy>0</posy>
</coordinates>
- <animation type="WindowOpen" reversible="false">
- <effect type="zoom" start="80" end="100" center="640,360"
easing="out" tween="back" time="300" />
- <effect type="fade" start="0" end="100" time="300" />
- </animation>
- <animation type="WindowClose" reversible="false">
- <effect type="zoom" start="100" end="80" center="640,360"
easing="in" tween="back" time="300" />
- <effect type="fade" start="100" end="0" time="300" />
- </animation>
<controls>
- <control type="button" id="8999">
- <description>Fake button for mouse control</description>
- <posx>1200</posx>
- <posy>0</posy>
- <width>265</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
<control type="group" id="250">
- <animation type="Conditional" condition="Control.HasFocus(150)"
reversible="true">
- <effect type="slide" end="-60,0" time="400" />
- </animation>
- <control type="image">
- <description>background image</description>
- <posx>200</posx>
- <posy>70</posy>
- <width>880</width>
- <height>540</height>
- <texture
border="20,20,20,20">default-panel.png</texture>
- </control>
- <control type="image">
- <posx>1038</posx>
- <posy>330</posy>
- <width>32</width>
- <height>24</height>
- <texture>nav-right.png</texture>
- <colordiffuse>FF009CFF</colordiffuse>
- </control>
- <!-- ** Required ** Do not change <id>or<type>-->
- <control type="group">
- <posx>200</posx>
- <posy>74</posy>
- <control type="image" id="110">
- <description>Service Logo</description>
- <posx>20</posx>
- <posy>18</posy>
- <width>250</width>
- <height>40</height>
- <aspectratio>keep</aspectratio>
- </control>
- <control type="label">
- <description>XBMC Subtitles label</description>
- <posx>250</posx>
- <posy>28</posy>
- <width>380</width>
- <height>20</height>
- <label>[B]XBMC SUBTITLES[/B]</label>
- <font>font13</font>
- <align>center</align>
- <textcolor>FF009CFF</textcolor>
- <shadowcolor>AA000000</shadowcolor>
- </control>
- <control type="group" id="111">
- <control type="grouplist">
- <posx>525</posx>
- <posy>16</posy>
- <width>305</width>
- <height>40</height>
- <align>right</align>
- <orientation>horizontal</orientation>
- <itemgap>5</itemgap>
- <control type="image">
- <width>40</width>
- <height>40</height>
-
<texture>default_icon_info.png</texture>
- </control>
- <control type="label">
-
<description>notification</description>
- <width min="10"
max="260">auto</width>
- <height>40</height>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
-
<label>$LOCALIZE[SCRIPT655]</label>
- <aligny>center</aligny>
-
<wrapmultiline>true</wrapmultiline>
- </control>
- </control>
+ <animation effect="slide" start="900,0" end="0,0"
time="400" tween="quadratic" easing="out">WindowOpen</animation>
+ <animation effect="slide" start="0,0" end="900,0"
time="200" tween="quadratic" easing="out">WindowClose</animation>
+ <animation type="Conditional"
condition="Control.HasFocus(150)" reversible="true">
+ <effect type="slide" end="-250,0" time="400" />
+ </animation>
+ <control type="button" id="8999">
+ <description>Fake button for mouse
control</description>
+ <posx>880</posx>
+ <posy>0</posy>
+ <width>20</width>
+ <height>720</height>
+ <label>-</label>
+ <font>-</font>
+ <texturenofocus>-</texturenofocus>
+ <texturefocus>-</texturefocus>
+ <visible>true</visible>
</control>
<control type="image">
- <description>separator</description>
- <posx>50</posx>
- <posy>60</posy>
- <width>780</width>
- <height>1</height>
- <texture>default-separatorOSD.png</texture>
- <colordiffuse>DDFFFFFF</colordiffuse>
- </control>
- <control type="label" id="100">
- <description>textarea</description>
- <posx>50</posx>
- <posy>60</posy>
- <width>780</width>
- <height>40</height>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
- <align>center</align>
- <aligny>center</aligny>
- <wrapmultiline>true</wrapmultiline>
+ <description>media info background
image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>1150</width>
+ <height>720</height>
+ <colordiffuse>BBFFFFFF</colordiffuse>
+ <texture border="20,0,0,0"
flipx="true">MediaBladeSub.png</texture>
</control>
- <control type="image">
- <description>separator</description>
- <posx>50</posx>
- <posy>100</posy>
- <width>780</width>
- <height>1</height>
- <texture>default-separatorOSD.png</texture>
- <colordiffuse>DDFFFFFF</colordiffuse>
+ <control type="button">
+ <description>Close Window button</description>
+ <posx>20</posx>
+ <posy>0</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>PreviousMenu</onclick>
+
<texturefocus>DialogCloseButton-focus.png</texturefocus>
+
<texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>101</onleft>
+ <onright>101</onright>
+ <onup>101</onup>
+ <ondown>101</ondown>
+
<visible>system.getbool(input.enablemouse)</visible>
</control>
- </control>
- <!-- ** Required ** Do not change <id>or<type>-->
- <control type="list" id="120">
- <posx>250</posx>
- <posy>190</posy>
- <width>780</width>
- <height>370</height>
- <onleft>150</onleft>
- <onright>150</onright>
- <onup>120</onup>
- <ondown>120</ondown>
- <viewtype label="535">list</viewtype>
- <pagecontrol>121</pagecontrol>
- <scrolltime>200</scrolltime>
- <itemlayout width="780" height="36">
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>780</width>
- <height>38</height>
-
<texture>default-list-nofocus.png</texture>
- </control>
- <control type="image">
- <posx>5</posx>
- <posy>11</posy>
- <width>26</width>
- <height>17</height>
- <info>Listitem.Thumb</info>
- </control>
+ <control type="group">
<control type="label">
- <posx>40</posx>
- <posy>0</posy>
- <width>90</width>
- <height>38</height>
- <font>font18</font>
+ <description>header label</description>
+ <posx>880</posx>
+ <posy>80</posy>
+ <width>550</width>
+ <height>30</height>
+ <font>font30_title</font>
+ <label>[B]XBMC SUBTITLES[/B]</label>
+ <align>right</align>
<aligny>center</aligny>
- <textcolor>white</textcolor>
- <selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label</info>
- </control>
- <control type="image">
- <posx>135</posx>
- <posy>13</posy>
- <width>40</width>
- <height>12</height>
- <texture>icon_sync.png</texture>
-
<visible>ListItem.property(sync)</visible>
+ <textcolor>FFFFFFFF</textcolor>
+ <shadowcolor>FF000000</shadowcolor>
</control>
<control type="label">
- <posx>180</posx>
- <posy>0</posy>
- <width>500</width>
- <height>38</height>
- <font>font18</font>
+ <description>Video label</description>
+ <posx>880</posx>
+ <posy>110</posy>
+ <width>550</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>$INFO[VideoPlayer.Title]</label>
+ <align>right</align>
<aligny>center</aligny>
- <textcolor>white</textcolor>
- <selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label2</info>
+ <textcolor>grey</textcolor>
+ <shadowcolor>FF000000</shadowcolor>
</control>
<control type="image">
- <posx>690</posx>
- <posy>11</posy>
- <width>90</width>
- <height>17</height>
-
<texture>info_window_icon_rating_star_$INFO[ListItem.ActualIcon].png</texture>
+ <posx>30</posx>
+ <posy>140</posy>
+ <width>820</width>
+ <height>4</height>
+
<texture>default-separatorOSD.png</texture>
</control>
- </itemlayout>
- <focusedlayout width="780" height="36">
- <control type="image">
+ <control type="image" id="110">
+ <description>Service Logo</description>
<posx>0</posx>
- <posy>0</posy>
- <width>780</width>
- <height>38</height>
-
<texture>default-list-nofocus.png</texture>
+ <posy>80</posy>
+ <width>250</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
</control>
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
+ <control type="label" id="100">
+ <description>textarea</description>
+ <posx>50</posx>
+ <posy>140</posy>
<width>780</width>
- <height>38</height>
-
<texture>default-list-focus.png</texture>
- <visible>Control.HasFocus(120)</visible>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>FFFFFFFF</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ <wrapmultiline>true</wrapmultiline>
</control>
<control type="image">
- <posx>5</posx>
- <posy>11</posy>
- <width>26</width>
- <height>17</height>
- <info>Listitem.Thumb</info>
+ <posx>30</posx>
+ <posy>176</posy>
+ <width>820</width>
+ <height>4</height>
+
<texture>default-separatorOSD.png</texture>
</control>
- <control type="label">
- <posx>40</posx>
- <posy>0</posy>
- <width>90</width>
- <height>38</height>
- <font>font18</font>
+ </control>
+ <!-- ** Required ** Do not change <id>or<type>-->
+ <control type="group">
+ <control type="list" id="120">
+ <posx>50</posx>
+ <posy>206</posy>
+ <width>800</width>
+ <height>434</height>
+ <onleft>121</onleft>
+ <onright>150</onright>
+ <onup>120</onup>
+ <ondown>120</ondown>
+ <viewtype label="535">list</viewtype>
+ <pagecontrol>121</pagecontrol>
+ <scrolltime>200</scrolltime>
+ <itemlayout width="800" height="36">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>780</width>
+ <height>38</height>
+
<texture>default-list-nofocus.png</texture>
+ </control>
+ <control type="image">
+ <posx>5</posx>
+ <posy>11</posy>
+ <width>26</width>
+ <height>17</height>
+
<info>Listitem.Thumb</info>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>0</posy>
+ <width>90</width>
+ <height>38</height>
+ <font>font18</font>
+ <aligny>center</aligny>
+
<textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label</info>
+ </control>
+ <control type="image">
+ <posx>135</posx>
+ <posy>13</posy>
+ <width>40</width>
+ <height>12</height>
+
<texture>icon_sync.png</texture>
+
<visible>ListItem.property(sync)</visible>
+ </control>
+ <control type="label">
+ <posx>180</posx>
+ <posy>0</posy>
+ <width>520</width>
+ <height>38</height>
+ <font>font18</font>
+ <aligny>center</aligny>
+
<textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label2</info>
+ </control>
+ <control type="image">
+ <posx>710</posx>
+ <posy>11</posy>
+ <width>90</width>
+ <height>17</height>
+
<texture>info_window_icon_rating_star_$INFO[ListItem.ActualIcon].png</texture>
+ </control>
+ </itemlayout>
+ <focusedlayout width="800" height="36">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>780</width>
+ <height>38</height>
+
<texture>default-list-nofocus.png</texture>
+ </control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>780</width>
+ <height>38</height>
+
<texture>default-list-focus.png</texture>
+
<visible>Control.HasFocus(120)</visible>
+ </control>
+ <control type="image">
+ <posx>5</posx>
+ <posy>11</posy>
+ <width>26</width>
+ <height>17</height>
+
<info>Listitem.Thumb</info>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>0</posy>
+ <width>90</width>
+ <height>38</height>
+ <font>font18</font>
+ <aligny>center</aligny>
+
<textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label</info>
+ </control>
+ <control type="image">
+ <posx>135</posx>
+ <posy>13</posy>
+ <width>40</width>
+ <height>12</height>
+
<texture>icon_sync.png</texture>
+
<visible>ListItem.property(sync)</visible>
+ </control>
+ <control type="label">
+ <posx>180</posx>
+ <posy>0</posy>
+ <width>520</width>
+ <height>38</height>
+ <font>font18</font>
+ <aligny>center</aligny>
+
<textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label2</info>
+ </control>
+ <control type="image">
+ <posx>710</posx>
+ <posy>11</posy>
+ <width>90</width>
+ <height>17</height>
+
<texture>info_window_icon_rating_star_$INFO[ListItem.ActualIcon].png</texture>
+ </control>
+ </focusedlayout>
+ </control>
+ <control type="spincontrol" id="121">
+ <description>Next page
button</description>
+ <posx>808</posx>
+ <posy>664</posy>
+ <width>20</width>
+ <height>20</height>
+ <font>font13</font>
+ <align>right</align>
<aligny>center</aligny>
- <textcolor>white</textcolor>
- <selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label</info>
+ <subtype>page</subtype>
+ <textcolor>FFFFFFFF</textcolor>
+ <onleft>120</onleft>
+ <onright>120</onright>
+ <ondown>120</ondown>
+ <onup>120</onup>
+ <textoffsetx>10</textoffsetx>
+
<textureup>default-scroll-up.png</textureup>
+
<texturedown>default-scroll-down.png</texturedown>
+
<textureupfocus>default-scroll-up-focus.png</textureupfocus>
+
<texturedownfocus>default-scroll-down-focus.png</texturedownfocus>
+ <showonepage>false</showonepage>
+
<visible>Control.IsVisible(120)</visible>
</control>
+ <control type="group" id="111">
+ <control type="grouplist">
+ <posx>20</posx>
+ <posy>660</posy>
+ <width>305</width>
+ <height>40</height>
+ <align>right</align>
+
<orientation>horizontal</orientation>
+ <itemgap>5</itemgap>
+ <control type="image">
+ <width>40</width>
+ <height>40</height>
+
<texture>default_icon_info.png</texture>
+ </control>
+ <control type="label">
+
<description>notification</description>
+ <width min="10"
max="260">auto</width>
+ <height>40</height>
+ <font>font13</font>
+
<textcolor>FFFFFFFF</textcolor>
+
<label>$LOCALIZE[SCRIPT655]</label>
+ <aligny>center</aligny>
+
<wrapmultiline>true</wrapmultiline>
+ </control>
+ </control>
+ </control>
+ <control type="image">
+ <posx>866</posx>
+ <posy>348</posy>
+ <width>24</width>
+ <height>24</height>
+ <texture>nav-right.png</texture>
+ </control>
+ </control>
+ <control type="group">
<control type="image">
- <posx>135</posx>
- <posy>13</posy>
- <width>40</width>
- <height>12</height>
- <texture>icon_sync.png</texture>
-
<visible>ListItem.property(sync)</visible>
- <colordiffuse>white</colordiffuse>
+ <description>separator</description>
+ <posx>542</posx>
+ <posy>360</posy>
+ <width>720</width>
+ <height>4</height>
+
<texture>default-separatorOSD.png</texture>
+ <animation effect="rotate" start="0"
end="90" center="auto" time="0" condition="true">Conditional</animation>
</control>
<control type="label">
- <posx>180</posx>
- <posy>0</posy>
- <width>500</width>
- <height>38</height>
- <font>font18</font>
- <aligny>center</aligny>
- <textcolor>white</textcolor>
- <selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label2</info>
+ <description>XBMC Subtitles
label</description>
+ <posx>905</posx>
+ <posy>150</posy>
+ <width>240</width>
+ <height>26</height>
+
<label>[B]$LOCALIZE[SCRIPT760][/B]</label>
+ <font>font13</font>
+ <align>center</align>
+ <aligny>top</aligny>
+ <textcolor>FFEB9E17</textcolor>
+ <shadowcolor>FF000000</shadowcolor>
+ <wrapmultiline>true</wrapmultiline>
</control>
<control type="image">
- <posx>690</posx>
- <posy>11</posy>
- <width>90</width>
- <height>17</height>
-
<texture>info_window_icon_rating_star_$INFO[ListItem.ActualIcon].png</texture>
+ <description>separator</description>
+ <posx>900</posx>
+ <posy>176</posy>
+ <width>240</width>
+ <height>4</height>
+
<texture>default-separatorOSD.png</texture>
+ </control>
+ <control type="list" id="150">
+ <posx>900</posx>
+ <posy>206</posy>
+ <width>250</width>
+ <height>434</height>
+ <onleft>120</onleft>
+ <onright>120</onright>
+ <onup>150</onup>
+ <ondown>150</ondown>
+ <viewtype label="535">list</viewtype>
+ <scrolltime>200</scrolltime>
+ <itemlayout width="400" height="36">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>38</height>
+
<texture>default-list-nofocus.png</texture>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>38</height>
+ <font>font18</font>
+ <aligny>center</aligny>
+
<textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label</info>
+
<visible>!ListItem.property(man)</visible>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>38</height>
+ <font>font10</font>
+ <aligny>center</aligny>
+
<textcolor>FF009CFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label</info>
+
<visible>ListItem.property(man)</visible>
+ </control>
+ </itemlayout>
+ <focusedlayout width="400" height="36">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>38</height>
+
<texture>default-list-nofocus.png</texture>
+ </control>
+ <control type="image">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>38</height>
+
<texture>default-list-focus.png</texture>
+
<visible>Control.HasFocus(150)</visible>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>38</height>
+ <font>font18</font>
+ <aligny>center</aligny>
+
<textcolor>FFFFFFFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label</info>
+
<visible>!ListItem.property(man)</visible>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>38</height>
+ <font>font10</font>
+ <aligny>center</aligny>
+
<textcolor>FF009CFF</textcolor>
+
<selectedcolor>FF0084FF</selectedcolor>
+ <align>left</align>
+
<info>ListItem.Label</info>
+
<visible>ListItem.property(man)</visible>
+ </control>
+ </focusedlayout>
</control>
- </focusedlayout>
- </control>
- </control>
- <control type="group" id="250">
- <animation effect="slide" start="0,0" end="-260,0"
time="400" reversible="true" condition="Control.HasFocus(150) |
Control.HasFocus(122)">Conditional</animation>
- <control type="image">
- <description>background image</description>
- <posx>1300</posx>
- <posy>130</posy>
- <width>250</width>
- <height>460</height>
- <texture
border="20,20,20,20">default-panel.png</texture>
- </control>
- <control type="label">
- <description>XBMC Subtitles label</description>
- <posx>1305</posx>
- <posy>150</posy>
- <width>240</width>
- <height>20</height>
- <label>[B]$LOCALIZE[SCRIPT760][/B]</label>
- <font>font12</font>
- <align>center</align>
- <textcolor>FF009CFF</textcolor>
- <shadowcolor>AA000000</shadowcolor>
- </control>
- <control type="image">
- <description>separator</description>
- <posx>1300</posx>
- <posy>185</posy>
- <width>240</width>
- <height>1</height>
- <texture>default-separatorOSD.png</texture>
- <colordiffuse>DDFFFFFF</colordiffuse>
- </control>
- <control type="list" id="150">
- <posx>1300</posx>
- <posy>190</posy>
- <width>250</width>
- <height>364</height>
- <onleft>120</onleft>
- <onright>120</onright>
- <onup>150</onup>
- <ondown>150</ondown>
- <viewtype label="535">list</viewtype>
- <scrolltime>200</scrolltime>
- <itemlayout width="400" height="36">
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>230</width>
- <height>38</height>
-
<texture>default-list-nofocus.png</texture>
- </control>
- <control type="label">
- <posx>40</posx>
- <posy>0</posy>
- <width>230</width>
- <height>38</height>
- <font>font18</font>
- <aligny>center</aligny>
- <textcolor>white</textcolor>
-
<selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label</info>
-
<visible>!ListItem.property(man)</visible>
- </control>
- <control type="label">
- <posx>40</posx>
- <posy>0</posy>
- <width>230</width>
- <height>38</height>
- <font>font10</font>
- <aligny>center</aligny>
- <textcolor>FF009CFF</textcolor>
-
<selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label</info>
-
<visible>ListItem.property(man)</visible>
- </control>
- </itemlayout>
- <focusedlayout width="400" height="36">
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>230</width>
- <height>38</height>
-
<texture>default-list-nofocus.png</texture>
- </control>
- <control type="image">
- <posx>10</posx>
- <posy>0</posy>
- <width>230</width>
- <height>38</height>
-
<texture>default-list-focus.png</texture>
-
<visible>Control.HasFocus(150)</visible>
- </control>
- <control type="label">
- <posx>40</posx>
- <posy>0</posy>
- <width>230</width>
- <height>38</height>
- <font>font18</font>
- <aligny>center</aligny>
- <textcolor>white</textcolor>
-
<selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label</info>
-
<visible>!ListItem.property(man)</visible>
- </control>
- <control type="label">
- <posx>40</posx>
- <posy>0</posy>
- <width>230</width>
- <height>38</height>
- <font>font10</font>
- <aligny>center</aligny>
- <textcolor>FF009CFF</textcolor>
-
<selectedcolor>green</selectedcolor>
- <align>left</align>
- <info>ListItem.Label</info>
-
<visible>ListItem.property(man)</visible>
- </control>
- </focusedlayout>
</control>
</control>
- <control type="spincontrol" id="121">
- <description>Next page button</description>
- <posx>990</posx>
- <posy>575</posy>
- <width>20</width>
- <height>20</height>
- <font>font13</font>
- <align>right</align>
- <subtype>page</subtype>
- <textcolor>FFFFFFFF</textcolor>
- <onleft>120</onleft>
- <onright>120</onright>
- <ondown>120</ondown>
- <onup>120</onup>
- <textoffsetx>10</textoffsetx>
- <textureup>default-scroll-up.png</textureup>
- <texturedown>default-scroll-down.png</texturedown>
-
<textureupfocus>default-scroll-up-focus.png</textureupfocus>
-
<texturedownfocus>default-scroll-down-focus.png</texturedownfocus>
- <showonepage>false</showonepage>
- <visible>Control.IsVisible(120)</visible>
- </control>
</controls>
</window>
diff --git
a/script.xbmc.subtitles/resources/skins/Default/media/default-separatorOSD.png
b/script.xbmc.subtitles/resources/skins/Default/media/default-separatorOSD.png
index 5b7212a..10141b8 100644
Binary files
a/script.xbmc.subtitles/resources/skins/Default/media/default-separatorOSD.png
and
b/script.xbmc.subtitles/resources/skins/Default/media/default-separatorOSD.png
differ
diff --git a/script.xbmc.subtitles/resources/skins/Default/media/nav-right.png
b/script.xbmc.subtitles/resources/skins/Default/media/nav-right.png
index 60981ca..3546715 100644
Binary files
a/script.xbmc.subtitles/resources/skins/Default/media/nav-right.png and
b/script.xbmc.subtitles/resources/skins/Default/media/nav-right.png differ
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 8 +
.../resources/lib/services/LegendasDivx/service.py | 24 +-
.../lib/services/OpenSubtitles/os_utilities.py | 16 +-
.../resources/lib/services/Undertexter/service.py | 19 +-
.../Default/720p/script-XBMC-Subtitles-main.xml | 763 ++++++++++----------
.../resources/skins/Default/media/HomeBladeSub.png | Bin 0 -> 54149 bytes
.../skins/Default/media/default-panel.png | Bin 53809 -> 0 bytes
.../skins/Default/media/default-separatorOSD.png | Bin 3087 -> 2970 bytes
.../resources/skins/Default/media/nav-right.png | Bin 3382 -> 3367 bytes
10 files changed, 447 insertions(+), 385 deletions(-)
create mode 100644
script.xbmc.subtitles/resources/skins/Default/media/HomeBladeSub.png
delete mode 100644
script.xbmc.subtitles/resources/skins/Default/media/default-panel.png
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://www.undertexter.se/bilder/ladda_codec_mini.gif"](http://www.undertexter.se/bilder/ladda_codec_mini.gif"){kind=link}
![http://www.undertexter.se/bilder/spacer.gif"](http://www.undertexter.se/bilder/spacer.gif"){kind=link}