The branch, dharma-pre has been updated
via b099118e1c18efabe67a063afef02da9e19e4367 (commit)
via 297fb7e0c2beaab09350a07534897ddc5cc447e4 (commit)
from 0b1f5f277e18dfb42ba04d4a9a1a2ec73568753f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=b099118e1c18efabe67a063afef02da9e19e4367
commit b099118e1c18efabe67a063afef02da9e19e4367
Merge: 297fb7e 0b1f5f2
Author: taxigps <[email protected]>
Date: Wed Oct 13 10:28:56 2010 +0800
Merge branch 'dharma-pre' of
ssh://xbmc.git.sourceforge.net/gitroot/xbmc/scripts into dharma-pre
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=297fb7e0c2beaab09350a07534897ddc5cc447e4
commit 297fb7e0c2beaab09350a07534897ddc5cc447e4
Author: taxigps <[email protected]>
Date: Wed Oct 13 10:27:28 2010 +0800
[script.lrclyrics] v1.3.3 - added: settings to load same name lyrics from
sub folder
diff --git a/script.lrclyrics/addon.xml b/script.lrclyrics/addon.xml
index bb806df..c463440 100644
--- a/script.lrclyrics/addon.xml
+++ b/script.lrclyrics/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.lrclyrics"
name="LRC Lyrics"
- version="1.3.2"
+ version="1.3.3"
provider-name="Taxigps">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.lrclyrics/changelog.txt b/script.lrclyrics/changelog.txt
index 854a277..38b3b0d 100644
--- a/script.lrclyrics/changelog.txt
+++ b/script.lrclyrics/changelog.txt
@@ -1,4 +1,7 @@
-[B]1.3.2 (2010.10.12)[/B]
+[B]1.3.3 (2010.10.13)[/B]
+added: settings to load same name lyrics from sub folder
+
+[B]1.3.2 (2010.10.12)[/B]
removed: unused codes
Initial import into official addons repository
diff --git a/script.lrclyrics/default.py b/script.lrclyrics/default.py
index b7824e5..18df781 100644
--- a/script.lrclyrics/default.py
+++ b/script.lrclyrics/default.py
@@ -8,9 +8,9 @@ import xbmcaddon
__scriptname__ = "LRC Lyrics"
__scriptid__ = "script.lrclyrics"
__author__ = "Taxigps"
-__url__ = "http://code.google.com/p/xbmc-scripting/";
+__url__ = "http://code.google.com/p/xbmc-addons-chinese/";
__credits__ = "EnderW,Nuka1195"
-__version__ = "1.3.2"
+__version__ = "1.3.3"
__XBMC_Revision__ = "30001"
# Shared resources
diff --git a/script.lrclyrics/resources/language/Chinese (Simple)/strings.xml
b/script.lrclyrics/resources/language/Chinese (Simple)/strings.xml
index 08ddf87..2583f4b 100644
--- a/script.lrclyrics/resources/language/Chinese (Simple)/strings.xml
+++ b/script.lrclyrics/resources/language/Chinese (Simple)/strings.xml
@@ -17,4 +17,6 @@
<string id="30108">%A - %T</string>
<string id="30109">%A\%B\%T</string>
<string id="30110">%A\%B\%N %T</string>
+ <string id="30111">读åååæè¯æ件äºåç®å½</string>
+ <string id="30112">- åç®å½å</string>
</strings>
\ No newline at end of file
diff --git a/script.lrclyrics/resources/language/English/strings.xml
b/script.lrclyrics/resources/language/English/strings.xml
index 1118736..4582476 100644
--- a/script.lrclyrics/resources/language/English/strings.xml
+++ b/script.lrclyrics/resources/language/English/strings.xml
@@ -17,4 +17,6 @@
<string id="30108">%A - %T</string>
<string id="30109">%A\%B\%T</string>
<string id="30110">%A\%B\%N %T</string>
+ <string id="30111">Load same name lyrics from sub folder</string>
+ <string id="30112">- Sub folder name</string>
</strings>
\ No newline at end of file
diff --git a/script.lrclyrics/resources/lib/gui.py
b/script.lrclyrics/resources/lib/gui.py
index 2c5fadf..5b51c9b 100644
--- a/script.lrclyrics/resources/lib/gui.py
+++ b/script.lrclyrics/resources/lib/gui.py
@@ -140,7 +140,10 @@ class GUI( xbmcgui.WindowXMLDialog ):
dirname = os.path.dirname(path)
basename = os.path.basename(path)
filename = basename.rsplit( ".", 1 )[ 0 ]
- self.song_path = make_legal_filepath( unicode( os.path.join(
dirname, filename + ".lrc" ), "utf-8" ), self.settings[ "compatible" ] )
+ if ( self.settings[ "subfolder" ] ):
+ self.song_path = make_legal_filepath( unicode( os.path.join(
dirname, self.settings[ "subfolder_name" ], filename + ".lrc" ), "utf-8" ),
self.settings[ "compatible" ] )
+ else:
+ self.song_path = make_legal_filepath( unicode( os.path.join(
dirname, filename + ".lrc" ), "utf-8" ), self.settings[ "compatible" ] )
lyrics_file = open( self.song_path, "r" )
lyrics = lyrics_file.read()
lyrics_file.close()
diff --git a/script.lrclyrics/resources/lib/utilities.py
b/script.lrclyrics/resources/lib/utilities.py
index 3492aff..d905c69 100644
--- a/script.lrclyrics/resources/lib/utilities.py
+++ b/script.lrclyrics/resources/lib/utilities.py
@@ -126,4 +126,6 @@ def get_settings():
settings[ "filename_format" ] = __settings__.getSetting( "filename_format"
)
settings[ "compatible" ] = __settings__.getSetting( "compatible" ) ==
"true"
settings[ "artist_folder" ] = __settings__.getSetting( "artist_folder" )
== "true"
+ settings[ "subfolder" ] = __settings__.getSetting( "subfolder" ) == "true"
+ settings[ "subfolder_name" ] = __settings__.getSetting( "subfolder_name" )
return settings
diff --git a/script.lrclyrics/resources/settings.xml
b/script.lrclyrics/resources/settings.xml
index 2ef929b..1adc7db 100644
--- a/script.lrclyrics/resources/settings.xml
+++ b/script.lrclyrics/resources/settings.xml
@@ -10,4 +10,6 @@
<setting id="smooth_scrolling" type="bool" label="30105" default="true"/>
<setting id="use_filename" type="bool" label="30106" default="false"/>
<setting id="filename_format" type="enum" label="30107" default="0"
lvalues="30108|30109|30110" />
+ <setting id="subfolder" type="bool" label="30111" default="false"/>
+ <setting id="subfolder_name" type="text" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30112" default="lyrics"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
script.lrclyrics/addon.xml | 2 +-
script.lrclyrics/changelog.txt | 5 ++++-
script.lrclyrics/default.py | 4 ++--
.../language/Chinese (Simple)/strings.xml | 2 ++
.../resources/language/English/strings.xml | 2 ++
script.lrclyrics/resources/lib/gui.py | 5 ++++-
script.lrclyrics/resources/lib/utilities.py | 2 ++
script.lrclyrics/resources/settings.xml | 2 ++
8 files changed, 19 insertions(+), 5 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
