The branch, dharma has been updated
via 18782a968fa2607682e90ed18c010d57b8035018 (commit)
from ab72ec3ad84696ed92183261c0623ccd632efcd5 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=18782a968fa2607682e90ed18c010d57b8035018
commit 18782a968fa2607682e90ed18c010d57b8035018
Author: taxigps <[email protected]>
Date: Thu Jan 5 13:40:19 2012 +0800
[script.lrclyrics] fixed: ATV2 not able to exit lyrics window while song is
playing. Added handling for ATV2 menu button. credits to d744000
diff --git a/script.lrclyrics/addon.xml b/script.lrclyrics/addon.xml
index c463440..86b5aa8 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.3"
+ version="1.3.4"
provider-name="Taxigps">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.lrclyrics/changelog.txt b/script.lrclyrics/changelog.txt
index 38b3b0d..5b319f8 100644
--- a/script.lrclyrics/changelog.txt
+++ b/script.lrclyrics/changelog.txt
@@ -1,4 +1,7 @@
-[B]1.3.3 (2010.10.13)[/B]
+[B]1.3.4 (2012.01.03)[/B]
+fixed: ATV2 not able to exit lyrics window while song is playing. Added
handling for ATV2 menu button.
+
+[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]
diff --git a/script.lrclyrics/default.py b/script.lrclyrics/default.py
index 18df781..268ae00 100644
--- a/script.lrclyrics/default.py
+++ b/script.lrclyrics/default.py
@@ -10,7 +10,7 @@ __scriptid__ = "script.lrclyrics"
__author__ = "Taxigps"
__url__ = "http://code.google.com/p/xbmc-addons-chinese/";
__credits__ = "EnderW,Nuka1195"
-__version__ = "1.3.3"
+__version__ = "1.3.4"
__XBMC_Revision__ = "30001"
# Shared resources
@@ -28,4 +28,4 @@ if ( __name__ == "__main__" ):
ui = gui.GUI( "script-XBMC_Lyrics-main.xml" , os.getcwd(), "Default" )
ui.doModal()
del ui
- sys.modules.clear()
\ No newline at end of file
+ sys.modules.clear()
diff --git a/script.lrclyrics/resources/lib/gui.py
b/script.lrclyrics/resources/lib/gui.py
index 5b51c9b..d59ef7a 100644
--- a/script.lrclyrics/resources/lib/gui.py
+++ b/script.lrclyrics/resources/lib/gui.py
@@ -236,7 +236,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
def onAction( self, action ):
actionId = action.getId()
- if ( actionId in ACTION_EXIT_SCRIPT ):
+ if ( actionId in CANCEL_DIALOG ):
self.exit_script()
def get_artist_from_filename( self, filename ):
diff --git a/script.lrclyrics/resources/lib/utilities.py
b/script.lrclyrics/resources/lib/utilities.py
index d905c69..d28c53a 100644
--- a/script.lrclyrics/resources/lib/utilities.py
+++ b/script.lrclyrics/resources/lib/utilities.py
@@ -19,7 +19,7 @@ BASE_RESOURCE_PATH = sys.modules[ "__main__"
].BASE_RESOURCE_PATH
# special button codes
SELECT_ITEM = ( 11, 256, 61453, )
EXIT_SCRIPT = ( 247, 275, 61467, )
-CANCEL_DIALOG = EXIT_SCRIPT + ( 216, 257, 61448, )
+CANCEL_DIALOG = ( 9, 10, 92, 216, 247, 257, 275, 61467, 61448, )
GET_EXCEPTION = ( 216, 260, 61448, )
SETTINGS_MENU = ( 229, 259, 261, 61533, )
SHOW_CREDITS = ( 195, 274, 61507, )
-----------------------------------------------------------------------
Summary of changes:
script.lrclyrics/addon.xml | 2 +-
script.lrclyrics/changelog.txt | 5 ++++-
script.lrclyrics/default.py | 4 ++--
script.lrclyrics/resources/lib/gui.py | 2 +-
script.lrclyrics/resources/lib/utilities.py | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
