updated script.rss.editor to 1.6.0 from official repo

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35515 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
FernetMenta · Nov 29, 2010 · d265120 · d265120
1 parent f643531
commit d265120
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/addons/script.rss.editor/addon.xml b/addons/script.rss.editor/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.rss.editor"
        name="RSS Editor"
-       version="1.5.9"
+       version="1.6.0"
        provider-name="rwparris2">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
@@ -16,6 +16,6 @@
     <summary lang="de">Skript zum Bearbeiten des XBMC internen RSS Tickers</summary>
     <description lang="en">A Script for editing XBMC's built in RSS Ticker</description>
     <description lang="hu">A szkript képes szerkeszteni az XBMC beépített RSS forrás készletét</description>
-        <description lang="de">Skript zum Bearbeiten des XBMC internen RSS Tickers</description>
+    <description lang="de">Skript zum Bearbeiten des XBMC internen RSS Tickers</description>
   </extension>
 </addon>
diff --git a/addons/script.rss.editor/default.py b/addons/script.rss.editor/default.py
@@ -5,18 +5,19 @@
 
 # Script constants
 __scriptname__ = "RSS Editor"
-__author__ = "rwparris2"
-__url__ = "http://code.google.com/p/xbmc-addons/"
-__credits__ = "Team XBMC"
-__version__ = "1.5.6"
-__settings__ = xbmcaddon.Addon(id='script.rss.editor')
-__language__ = __settings__.getLocalizedString
+__author__     = "rwparris2"
+__url__        = "http://code.google.com/p/xbmc-addons/"
+__credits__    = "Team XBMC"
+__version__    = "1.5.6"
+__settings__   = xbmcaddon.Addon(id='script.rss.editor')
+__language__   = __settings__.getLocalizedString
+__cwd__        = __settings__.getAddonInfo('path')
 
 print "[SCRIPT] '%s: version %s' initialized!" % (__scriptname__, __version__, )
 
 if (__name__ == "__main__"):
     import resources.lib.rssEditor as rssEditor
-    ui = rssEditor.GUI("script-RSS_Editor-rssEditor.xml", os.getcwd(), "default", setNum = 'set1')
+    ui = rssEditor.GUI("script-RSS_Editor-rssEditor.xml", __cwd__, "default", setNum = 'set1')
     del ui
 
 sys.modules.clear()
diff --git a/addons/script.rss.editor/resources/lib/rssEditor.py b/addons/script.rss.editor/resources/lib/rssEditor.py
@@ -4,8 +4,8 @@
 from xmlParser import XMLParser
 
 #enable localization
-getLS = sys.modules[ "__main__" ].__language__
-
+getLS   = sys.modules[ "__main__" ].__language__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
 
 class GUI(xbmcgui.WindowXMLDialog):
 
@@ -79,7 +79,7 @@ def onClick(self, controlId):
         #change/modify set
         elif controlId == self.control_changeSet_button_id:
             import setEditor
-            setEditorUI = setEditor.GUI("script-RSS_Editor-setEditor.xml", os.getcwd(), "default", setNum = self.setNum)
+            setEditorUI = setEditor.GUI("script-RSS_Editor-setEditor.xml", __cwd__, "default", setNum = self.setNum)
             self.close()
             del setEditorUI
         #save xml

diff --git a/addons/script.rss.editor/resources/lib/setEditor.py b/addons/script.rss.editor/resources/lib/setEditor.py
@@ -1,10 +1,11 @@
 import xbmc
 import xbmcgui
-import os
+import os, sys
 from xmlParser import XMLParser
 
 #enable localization
-getLS = xbmc.Language(os.getcwd()).getLocalizedString
+getLS   = sys.modules[ "__main__" ].__language__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
 
 
 class GUI(xbmcgui.WindowXMLDialog):
@@ -57,7 +58,7 @@ def showDialog(self):
     def closeDialog(self):
         """Close the Set Editor Dialog and open RSS Editor Dialog"""
         import rssEditor
-        rssEditorUI = rssEditor.GUI("script-RSS_Editor-rssEditor.xml", os.getcwd(), "default", setNum = self.setNum)
+        rssEditorUI = rssEditor.GUI("script-RSS_Editor-rssEditor.xml", __cwd__, "default", setNum = self.setNum)
         self.close()
         del rssEditorUI