The branch, dharma-pre has been updated
via ad7426d4c6602ae0edafe8574aa97609ae7373bb (commit)
from 40e5a59914c112f9877d2bd64b9d08e8103af78c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=ad7426d4c6602ae0edafe8574aa97609ae7373bb
commit ad7426d4c6602ae0edafe8574aa97609ae7373bb
Author: Zeljko Ametovic <[email protected]>
Date: Tue Nov 2 14:26:13 2010 +0400
[script.xbmc.subtitles]
2.0.7
- fix: ability select Addic7ed as default service
2.0.6
- fix: new window + mouse should work now
- fix: Addic7ed would fail if the sub is not found
2.0.5
- added: Addic7ed service
diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index a718d0f..d3ad05e 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.0.4"
+ version="2.0.7"
provider-name="Amet">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt
b/script.xbmc.subtitles/changelog.txt
index ba10168..52c32c0 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,13 @@
+2.0.7
+- fix: ability select Addic7ed as default service
+
+2.0.6
+- fix: new window + mouse should work now
+- fix: Addic7ed would fail if the sub is not found
+
+2.0.5
+- added: Addic7ed service
+
2.0.4
- added: right arrow to indicate where the services have been hiding
- added: new icon, thanks freezy3k
diff --git a/script.xbmc.subtitles/resources/lib/gui.py
b/script.xbmc.subtitles/resources/lib/gui.py
index a6bd867..9b84eea 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -162,7 +162,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
def_movie_service = __settings__.getSetting( "defmovieservice")
def_tv_service = __settings__.getSetting( "deftvservice")
service_list = []
- standard_service_list = ['Titulky','OpenSubtitles', 'Podnapisi',
'Sublight', 'Bierdopje', 'Subscene', 'Ondertitel', 'Undertexter',
'Napiprojekt', 'Titlovi', 'LegendasTV', 'Subdivx']
+ standard_service_list = ['Titulky','OpenSubtitles', 'Podnapisi',
'Sublight', 'Bierdopje', 'Subscene', 'Ondertitel', 'Undertexter',
'Napiprojekt', 'Titlovi', 'LegendasTV', 'Subdivx', 'Addic7ed']
service = ""
for name in os.listdir(SERVICE_DIR):
@@ -558,9 +558,6 @@ class GUI( xbmcgui.WindowXMLDialog ):
try:
if controlId == 8999:
self.setFocusId( 150 )
- self.getControl( 8999 ).setVisible( False )
- else:
- self.getControl( 8999 ).setVisible( True )
except:
pass
diff --git a/script.xbmc.subtitles/resources/lib/utilities.py
b/script.xbmc.subtitles/resources/lib/utilities.py
index a681fc7..3c259e6 100644
--- a/script.xbmc.subtitles/resources/lib/utilities.py
+++ b/script.xbmc.subtitles/resources/lib/utilities.py
@@ -97,67 +97,74 @@ def regex_tvshow(compare, file, sub = ""):
def toOpenSubtitles_two( id ):
languages = {
- "None" : "none",
- "Albanian" : "sq",
- "Arabic" : "ar",
- "Belarusian" : "hy",
- "Bosnian" : "bs",
- "BosnianLatin" : "bs",
- "Bulgarian" : "bg",
- "Catalan" : "ca",
- "Chinese" : "zh",
- "Croatian" : "hr",
- "Czech" : "cs",
- "Danish" : "da",
- "Dutch" : "nl",
- "English" : "en",
- "Esperanto" : "eo",
- "Estonian" : "et",
- "Farsi" : "fa",
- "Persian" : "fa",
- "Finnish" : "fi",
- "French" : "fr",
- "Galician" : "gl",
- "Georgian" : "ka",
- "German" : "de",
- "Greek" : "el",
- "Hebrew" : "he",
- "Hindi" : "hi",
- "Hungarian" : "hu",
- "Icelandic" : "is",
- "Indonesian" : "id",
- "Italian" : "it",
- "Japanese" : "ja",
- "Kazakh" : "kk",
- "Korean" : "ko",
- "Latvian" : "lv",
- "Lithuanian" : "lt",
- "Luxembourgish" : "lb",
- "Macedonian" : "mk",
- "Malay" : "ms",
- "Norwegian" : "no",
- "Occitan" : "oc",
- "Polish" : "pl",
- "Portuguese" : "pt",
- "PortugueseBrazil" : "pb",
- "Portuguese (Brazil)" : "pb",
- "Brazilian" : "pb",
- "Romanian" : "ro",
- "Russian" : "ru",
- "SerbianLatin" : "sr",
- "Serbian" : "sr",
- "Slovak" : "sk",
- "Slovenian" : "sl",
- "Spanish" : "es",
- "Swedish" : "sv",
- "Syriac" : "syr",
- "Thai" : "th",
- "Turkish" : "tr",
- "Ukrainian" : "uk",
- "Urdu" : "ur",
- "Vietnamese" : "vi",
- "English (US)" : "en",
- "All" : "all"
+ "None" : "none",
+ "Albanian" : "sq",
+ "Arabic" : "ar",
+ "Belarusian" : "hy",
+ "Bosnian" : "bs",
+ "BosnianLatin" : "bs",
+ "Bulgarian" : "bg",
+ "Catalan" : "ca",
+ "Chinese" : "zh",
+ "Croatian" : "hr",
+ "Czech" : "cs",
+ "Danish" : "da",
+ "Dutch" : "nl",
+ "English" : "en",
+ "Esperanto" : "eo",
+ "Estonian" : "et",
+ "Farsi" : "fa",
+ "Persian" : "fa",
+ "Finnish" : "fi",
+ "French" : "fr",
+ "Galician" : "gl",
+ "Georgian" : "ka",
+ "German" : "de",
+ "Greek" : "el",
+ "Hebrew" : "he",
+ "Hindi" : "hi",
+ "Hungarian" : "hu",
+ "Icelandic" : "is",
+ "Indonesian" : "id",
+ "Italian" : "it",
+ "Japanese" : "ja",
+ "Kazakh" : "kk",
+ "Korean" : "ko",
+ "Latvian" : "lv",
+ "Lithuanian" : "lt",
+ "Luxembourgish" : "lb",
+ "Macedonian" : "mk",
+ "Malay" : "ms",
+ "Norwegian" : "no",
+ "Occitan" : "oc",
+ "Polish" : "pl",
+ "Portuguese" : "pt",
+ "PortugueseBrazil" : "pb",
+ "Portuguese (Brazil)" : "pb",
+ "Brazilian" : "pb",
+ "Romanian" : "ro",
+ "Russian" : "ru",
+ "SerbianLatin" : "sr",
+ "Serbian" : "sr",
+ "Slovak" : "sk",
+ "Slovenian" : "sl",
+ "Spanish" : "es",
+ "Swedish" : "sv",
+ "Syriac" : "syr",
+ "Thai" : "th",
+ "Turkish" : "tr",
+ "Ukrainian" : "uk",
+ "Urdu" : "ur",
+ "Vietnamese" : "vi",
+ "English (US)" : "en",
+ u"English (UK)" : "en",
+ u"Portuguese (Brazilian)" : "pt-br",
+ u"Español (Latinoamérica)" : "es",
+ u"Español (España)" : "es",
+ u"Spanish (Latin America)" : "es",
+ u"Español" : "es",
+ u"Spanish (Spain)" : "es",
+ "All" : "all"
}
return languages[ id ]
diff --git a/script.xbmc.subtitles/resources/settings.xml
b/script.xbmc.subtitles/resources/settings.xml
index e73875d..e1e0a2c 100755
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -6,8 +6,8 @@
<setting id="Lang03" type="enum" label="30111" default="11"
lvalues="30201|30202|30203|30204|30205|30206|30207|30208|30209|30210|30211|30212|30213|30247|30214|30215|30216|30217|30218|30219|30220|30221|30222|30224|30225|30226|30227|30228|30229|30230|30232|30233|30234|30235|30236|30237|30238|30239|30240|30242|30243|30244|30245|30246"
/>
</category>
<category label="30103">
- <setting id="defmovieservice" type="labelenum" label="30113"
default="Sublight"
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx"
/>
- <setting id="deftvservice" type="labelenum" label="30114"
default="Sublight"
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx"
/>
+ <setting id="defmovieservice" type="labelenum" label="30113"
default="Sublight"
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx|Addic7ed"
/>
+ <setting id="deftvservice" type="labelenum" label="30114"
default="Sublight"
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx|Addic7ed"
/>
<setting id="Sublight" type="bool" label="- Sublight.si" default="true"/>
<setting id="Podnapisi" type="bool" label="- Podnapisi.net"
default="false"/>
<setting id="PNuser" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30104" default=""/>
@@ -24,6 +24,7 @@
<setting id="Titlovi" type="bool" label="- Titlovi.com"
default="false"/>
<setting id="Titulky" type="bool" label="- Titulky.com (Czech and Slovak
subs only)" default="false"/>
<setting id="Subdivx" type="bool" label="- Subdivx.com (Spanish subs
only)" default="false"/>
+ <setting id="Addic7ed" type="bool" label="- Addic7ed.com"
default="false"/>
</category>
<category label="30106">
<setting id="subfolder" type="bool" label="30107" default="true" />
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 816d521..6215f72 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
@@ -16,7 +16,7 @@
<controls>
<control type="button" id="8999">
<description>Fake button for mouse control</description>
- <posx>1270</posx>
+ <posx>1200</posx>
<posy>0</posy>
<width>265</width>
<height>720</height>
@@ -28,7 +28,7 @@
</control>
<control type="group" id="250">
<animation type="Conditional" condition="Control.HasFocus(150)"
reversible="true">
- <effect type="slide" end="-100,0" time="200" />
+ <effect type="slide" end="-60,0" time="400" />
</animation>
<control type="image">
<description>background image</description>
@@ -262,9 +262,7 @@
</control>
</control>
<control type="group" id="250">
- <animation type="Focus" reversible="false">
- <effect type="slide" end="-300,0" time="400" />
- </animation>
+ <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>
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.subtitles/addon.xml | 2 +-
script.xbmc.subtitles/changelog.txt | 10 ++
script.xbmc.subtitles/resources/lib/gui.py | 5 +-
.../resources/lib/services/Addic7ed}/__init__.py | 0
.../resources/lib/services/Addic7ed/logo.png | Bin 0 -> 11162 bytes
.../resources/lib/services/Addic7ed/service.py | 99 +++++++++++++++
script.xbmc.subtitles/resources/lib/utilities.py | 129 ++++++++++---------
script.xbmc.subtitles/resources/settings.xml | 5 +-
.../Default/720p/script-XBMC-Subtitles-main.xml | 8 +-
9 files changed, 185 insertions(+), 73 deletions(-)
copy {script.lrclyrics/resources/lib/scrapers =>
script.xbmc.subtitles/resources/lib/services/Addic7ed}/__init__.py (100%)
create mode 100644
script.xbmc.subtitles/resources/lib/services/Addic7ed/logo.png
create mode 100644
script.xbmc.subtitles/resources/lib/services/Addic7ed/service.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
