Index: scripts/.modules/script.module.weather/lib/xbmcweather/weather.py
===================================================================
--- scripts/.modules/script.module.weather/lib/xbmcweather/weather.py	(revision 30763)
+++ scripts/.modules/script.module.weather/lib/xbmcweather/weather.py	(working copy)
@@ -35,6 +35,8 @@
     def __init__( self, addon, index, refresh, localize ):
         # set our Addon class
         self.Addon = addon
+        # set addon info
+        self._set_addon_info()
         # get weather.com code, used to fetch proper weather info
         self.location_id = self.Addon.getSetting( "id%s" % ( index, ) )
         # if ip based geo location, fetch location
@@ -49,9 +51,13 @@
         self.localize_text_special = localize.localize_text_special
         # set base path for source
         self.base_path = os.path.join( self.Addon.getAddonInfo( "Profile" ), "source", "weather-%s.xml" % self.location_id )
-        # set addon info
-        self._set_addon_info()
 
+    def _set_addon_info( self ):
+        # set addon's logo, id and name
+        self.WINDOW.setProperty( "Addon.Logo", self.Addon.getAddonInfo( "Icon" ) )# $GROUP[Addon Info] Addon's Icon path
+        self.WINDOW.setProperty( "Addon.Id", self.Addon.getAddonInfo( "Id" ) )# Addon's Id (useful for customized logo's)
+        self.WINDOW.setProperty( "Addon.Name", self.Addon.getAddonInfo( "Name" ) )# Addon's name
+
     def _get_geo_location_id( self ):
         # FIXME: Remove if block and always search for mobile application (eg traveling) maybe have a setting since everytime you change
         # locations it has to fetch ip, if not mobile leave if block.
@@ -65,12 +71,6 @@
             # set window property (ip based geo location)
             self.WINDOW.setProperty( "Location.IP", ip )
 
-    def _set_addon_info( self ):
-        # set addon's logo, id and name
-        self.WINDOW.setProperty( "Addon.Logo", self.Addon.getAddonInfo( "Icon" ) )# $GROUP[Addon Info] Addon's Icon path
-        self.WINDOW.setProperty( "Addon.Id", self.Addon.getAddonInfo( "Id" ) )# Addon's Id (useful for customized logo's)
-        self.WINDOW.setProperty( "Addon.Name", self.Addon.getAddonInfo( "Name" ) )# Addon's name
-
     def fetch_weather( self ):
         try:
             # set success message
Index: scripts/.modules/script.module.weather/media/moon/Thumbs.db
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: scripts/.modules/script.module.weather/media/weather/Thumbs.db
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: scripts/autoexec.py
===================================================================
--- scripts/autoexec.py	(revision 30763)
+++ scripts/autoexec.py	(working copy)
@@ -1,28 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://www.xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-# auto execute scripts when xbmc starts, place this file in xbmchome\scripts\
-# 
-# note: - do not execute more than one script at a time which asks for user input!
-
-#import xbmc
-
-#xbmc.executescript('q:\\scripts\\medusa\\start_medusa.py')
-
Index: scripts/backupsysteminfo.py
===================================================================
--- scripts/backupsysteminfo.py	(revision 30763)
+++ scripts/backupsysteminfo.py	(working copy)
@@ -1,24 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-# will create bios & eeprom backup and XBMCSystemInfo to  /System/Systeminfo/
-import xbmc
-xbmc.executehttpapi("execbuiltin(backupsysteminfo)")
-
Index: scripts/checkmarkexample.py
===================================================================
--- scripts/checkmarkexample.py	(revision 30763)
+++ scripts/checkmarkexample.py	(working copy)
@@ -1,61 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmcgui
-
-def debug( str ):
-    xbmc.output( str )
-
-class Window( xbmcgui.Window ):
-    def __init__( self ):
-        xbmcgui.Window.__init__( self )
-        self.checkMark = None
-
-    def create( self ):
-        self.checkMark = xbmcgui.ControlCheckMark(
-                x=50, y=200,
-                width=200, height=20,
-                label="This is my new check mark",
-                checkWidth=30, checkHeight=30,
-                alignment=0 )
-        self.addControl( self.checkMark )
-        self.setFocus( self.checkMark )
-
-    def onAction( self, action ):
-        debug( "> Window.onAction( action=[%s] )"%action )
-        if action in (9,10):
-            self.close()
-        debug( "< Window.onAction( action=[%s] )"%action )
-
-    def onControl( self, control ):
-        debug( "> Window.onControl( control=[%s] )"%control )
-        if control == self.checkMark:
-            b = self.checkMark.getSelected()
-            if b:
-                xbmcgui.Dialog().ok( "info", "check mark is selected" )
-            else:
-                xbmcgui.Dialog().ok( "info", "check mark is NOT selected" )
-        debug( "< Window.onControl( control=[%s] )"%control )
-
-win = Window()
-win.create()
-win.doModal()
-del win
-
Index: scripts/customdialog.py
===================================================================
--- scripts/customdialog.py	(revision 30763)
+++ scripts/customdialog.py	(working copy)
@@ -1,113 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://www.xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmcgui
-
-# get actioncodes from keymap.xml, if you leave these away and still use something like
-# ACTION_PREVIOUS_MENU, python wil use it as if it was 0 
-
-ACTION_MOVE_LEFT 							= 1	
-ACTION_MOVE_RIGHT							= 2
-ACTION_MOVE_UP								= 3
-ACTION_MOVE_DOWN							= 4
-ACTION_PAGE_UP								= 5
-ACTION_PAGE_DOWN							= 6
-ACTION_SELECT_ITEM						= 7
-ACTION_HIGHLIGHT_ITEM					= 8
-ACTION_PARENT_DIR							= 9
-ACTION_PREVIOUS_MENU					= 10
-ACTION_SHOW_INFO							= 11
-
-ACTION_PAUSE									= 12
-ACTION_STOP										= 13
-ACTION_NEXT_ITEM							= 14
-ACTION_PREV_ITEM							= 15
-
-# NewDialog class with xbmcgui.WindowDialog as it's base class
-# note xbmcgui.WindowDialog has xbmcgui.Window as it's baseclass so we can use this
-# dialog the same as a window
-
-class NewDialog(xbmcgui.WindowDialog):
-	def __init__(self):
-		
-		# create result variable and add some images + buttons to our dialog
-		self.result = 0
-		self.addControl(xbmcgui.ControlImage(177,225,406,140, 'dialog-popup.png'))
-		
-		self.buttonOK = xbmcgui.ControlButton(290, 330, 80, 32, 'OK')
-		self.buttonCancel = xbmcgui.ControlButton(380, 330, 80, 32, 'Cancel')
-		self.addControl(self.buttonOK)
-		self.addControl(self.buttonCancel)
-		
-		# setting up navigation and focus
-		self.setFocus(self.buttonOK)
-		self.buttonOK.controlRight(self.buttonCancel)
-		self.buttonOK.controlLeft(self.buttonCancel)
-		self.buttonCancel.controlRight(self.buttonOK)
-		self.buttonCancel.controlLeft(self.buttonOK)
-		
-		# labels
-		self.lblHeading = xbmcgui.ControlLabel(190, 226, 200, 20, '')
-		
-		self.lblLine = []
-		self.lblLine.append(xbmcgui.ControlLabel(190, 260, 200, 20, ''))
-		self.lblLine.append(xbmcgui.ControlLabel(190, 280, 200, 20, ''))
-		self.lblLine.append(xbmcgui.ControlLabel(190, 300, 200, 20, ''))
-		self.addControl(self.lblHeading)
-		self.addControl(self.lblLine[0])
-		self.addControl(self.lblLine[1])
-		self.addControl(self.lblLine[2])
-		
-	def setHeading(self, text):
-		self.lblHeading.setLabel(text)
- 
- 	def setLine(self, line, text):
-		self.lblLine[line].setLabel(text)
-
-	def onAction(self, action):
-		if action == ACTION_PREVIOUS_MENU:
-			# previous menu action recieved, set result to 0 (cancel / aborted) and close the window
-			self.result = 0
-			self.close()
-	
-	def onControl(self, control):
-		if control == self.buttonOK:
-			# ok butten pressed, set result to 1 and close the dialog
-			self.result = 1
-			self.close()
-		elif control == self.buttonCancel:
-			# ok butten pressed, set result to 0 and close the dialog
-			self.result = 0
-			self.close()
-
-	def ask(self):
-		# show this dialog and wait until it's closed
-		self.doModal()
-		return self.result
-
-dialog = NewDialog()
-dialog.setHeading('Python OK / Cancel Dialog')
-dialog.setLine(0, 'line 0')
-dialog.setLine(1, 'line 1')
-dialog.setLine(2, 'line 2')
-
-print(dialog.ask())
-# print('dialog returned' + str(dialog.ask())
-
Index: scripts/dialogbrowse.py
===================================================================
--- scripts/dialogbrowse.py	(revision 30763)
+++ scripts/dialogbrowse.py	(working copy)
@@ -1,48 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmcgui
-
-"""
-Usage Explained
-
-xbmcgui.Dialog().browse(type,prompt,shares)
-type can be
-    0 for directory
-    1  for files
-    2 for images (eg it will show thumbnails if skin shows it)
-    any other number will do directories
-
-prompt can be text/string
-
-shares can be
-- files
-- videos
-- music
-- programs
-- pictures
-"""
-
-print xbmcgui.Dialog().browse(0,"a Directory","files")
-print xbmcgui.Dialog().browse(1,"a file","files")
-print xbmcgui.Dialog().browse(1,"a music file","music")
-print xbmcgui.Dialog().browse(1,"a image","files")
-
-
Index: scripts/dialognumeric.py
===================================================================
--- scripts/dialognumeric.py	(revision 30763)
+++ scripts/dialognumeric.py	(working copy)
@@ -1,34 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://www.xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmcgui
-
-"""
-Usage Explained
-
-
-xbmcgui.Dialog().numeric(type,heading)
-
-"""
-
-print xbmcgui.Dialog().numeric(0,"Enter a Number")
-print xbmcgui.Dialog().numeric(1,"Enter a Date")
-print xbmcgui.Dialog().numeric(2,"Enter a Time")
-print xbmcgui.Dialog().numeric(3,"Enter a Ip")
Index: scripts/dialogselect.py
===================================================================
--- scripts/dialogselect.py	(revision 30763)
+++ scripts/dialogselect.py	(working copy)
@@ -1,35 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmc, xbmcgui
-
-dialog = xbmcgui.Dialog()
-
-list = ['yes','no','cancel','movies','f:\\music\\test','test','67','true']
-list.append('last item')
-selected = dialog.select('select an item', list)
-dialog.ok('user selected', 'item nr : ' + str(selected), list[selected])
-
-selected = dialog.select('select an action', ['Cancel', 'Reboot', 'Shut Down'])
-
-if selected == 1:
-	xbmc.restart()
-elif selected == 2:
-	xbmc.shutdown()
Index: scripts/dialogyesno.py
===================================================================
--- scripts/dialogyesno.py	(revision 30763)
+++ scripts/dialogyesno.py	(working copy)
@@ -1,30 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmc, xbmcgui
-
-dialog = xbmcgui.Dialog()
-selected = dialog.yesno("header", "doit", "line2", "line3")
-
-dialog.ok("error", "user selected" + str(selected))
-
-if dialog.yesno("restart", "sure?"):
-	xbmc.restart()
-
Index: scripts/download apleasure_zip.py
===================================================================
--- scripts/download apleasure_zip.py	(revision 30763)
+++ scripts/download apleasure_zip.py	(working copy)
@@ -1,63 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-# ftp download script for xbmc
-
-adres = 'ftp.planet.nl'
-remotedir = 'planet/games/quake/maps'
-remotefile = 'apleasure.zip'
-localfile = 'Q:\\apleasure1.zip'
-
-import sys, socket, xbmc, xbmcgui
-from ftplib import FTP
-
-class writer:
-	def __init__(self):
-		self.size = 0
-		self.copied = 0;
-	def write(self, data):
-		f.write(data)
-		self.copied = self.copied + len(data)
-		dialog.update((self.copied * 100)/ self.size)
-
-pwriter = writer()
-
-dialog = xbmcgui.DialogProgress()
-
-dialog.create("connecting",adres)
-ftp = FTP(adres) # connect to host, default port
-
-dialog.close()
-dialog.create("logging in","username = anonymous")
-ftp.login() # default, i.e.: user anonymous, passwd user@hostname
-
-dialog.close()
-dialog.create("changing directory to", remotedir)
-ftp.cwd(remotedir)
-pwriter.size = ftp.size(remotefile)
-f = open(localfile, "wb")
-
-dialog.close()
-dialog.create("downloading", remotefile)
-ftp.retrbinary('RETR ' + remotefile, pwriter.write, 8192)
-
-f.close()
-dialog.close()
-ftp.quit()
Index: scripts/GUI Builder.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: scripts/guibuilder.py
===================================================================
--- scripts/guibuilder.py	(revision 30763)
+++ scripts/guibuilder.py	(working copy)
@@ -1,670 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-'''
-This module creates your scripts GUI from a standard XBMC skinfile.xml. It works for both Windows and
-WindowDialogs. Hopefully it will make it easier to skin your scripts for different XBMC skins.
-
-There is one optional tag you may use, <resolution>. This tag is used in place of the folder structure XBMC
-skinning engine uses. It's used for setCoordinateResolution().  It is suggested you use the <resolution> tag.
-<resolution> can be one of (1080i, 720p, 480p, 480p16x9, ntsc, ntsc16x9, pal, pal16x9, pal60, pal6016x9)
-e.g. <resolution>pal</resolution>
-
-GUI Builder sets initial focus to the <control> with <id> equal to <defaultcontrol>.
-
-You may use <include> tags and references.xml will be used for default values if no tag is given.
-(Unless you use fastMethod=True) All unsupported tags will be ignored. (e.g. <animation>)
-
-GUI Builder sets up navigation based on the <onup>, <ondown>, <onleft> and <onright> tags.
-
-The <control> <type> fadelabel takes multiple <label> and/or <info> tags.
-
-The <control> <type> listcontrol supports an additional tag <label2> for use as the second column.
-GUI Builder creates a listitem from multiple <label>, <label2> and <image> tags. In most cases these
-tags won't be used as your code will populate a listcontrol.
-
-You may pass an optional path for any custom textures. If you precede the <texture> tags value with a
-backslash (\) in the xml, it will use the imagePath. Do not include ending \\ in the imagePath argument.
-e.g. <texture>\button.png</texture> will use imagePath
-
-You may pass an optional progress dialog, with an optional first line and percent finished as a continuation
-for your scripts initialization. GUI Builder will begin at percent finished and finish at 100 percent.
-
-You may pass fastMethod=True. If True, no dialogs will be displayed, GUI Builder will not resolve <include> tags
-and will not use default values from references.xml for missing tags. If you do include all necessary tags in the
-xml file and no <include> tags, this can speed up GUI creation slightly.
-
-If you are having problems, pass debug=True and progress will be output to the scripts info window and
-if <loglevel> is at one (1) or higher to xbmc.log.
-
-You need to pass your Window or WindowDialog Class as self and a skin xml file. All other arguments are optional.
-
-**************************************************************************************
-class GUIBuilder:
-GUIBuilder(win, skinXML[, imagePath, title, line1, dlg, pct, fastMethod, debug])
-
-win				: class - Your Window or WindowDialog class passed as self.
-skinXML			: string - The xml file including path you want to use.
-imagePath		: [opt] string - The path to any custom images. (do not end with \\)
-title				: [opt] string - Title you want to use for a new progress dialog.
-line1				: [opt] string - The first line of the progress dialog.
-dialog			: [opt] progress dialog - A current progress dialog.
-pct				: [opt] integer - The percent already completed. (0-100)
-fastMethod		: [opt] bool - True=no dialogs, no <include> tags and no defaults from references.xml.
-debug			: [opt] bool - True=output debug information / False=no logging.
-
-*Note, You may use the above as keywords for arguments and skip certain optional arguments.
-		  Once you use a keyword, all following arguments require the keyword.
-
-example:
-	- import guibuilder
-	- guibuilder.GUIBuilder(self,  'Project Mayhem III.xml', fastMethod=True)
-**************************************************************************************
-
-GUI Builder creates a dictionary of your controls, with the controls <id> as the key (self.controls{id : control}).
-GUI Builder creates a dictionary of visibilty conditions, with the controls <id> as the key (self.visibility{id : condition}).
-e.g.  self.controls[300].setVisible(xbmc.getCondVisibility(self.visibility[300]))
-
-GUI Builder creates a dictionary of your controls positions in a tuple, with the controls <id> as the key (self.positions{id : (x, y)}).
-GUI Builder creates a list variable for a <coordinates> based window (self.coordinates[x, y]).
-e.g. self.controls[300].setPosition(self.positions[300][0] + self.coordinates[0], self.positions[300][1] + self.coordinates[1])
-
-GUI Builder sets self.SUCCEEDED to True if the window creation succeeded or False if something failed. You may
-want to check this before the call to doModal().
-
-Post a message at http://www.xbmc.xbox-scene.com/forum/ with any suggestions.
-
-Credits:
-GetConditionalVisibility(), GetSkinPath(), LoadReferences(), LoadIncludes(), ResolveInclude()
-The above functions were translated from XBMC's source, thanks Developers.
-A special thanks to elupus for shaming me into doing it the right way. :)
-
-Nuka1195
-'''
-
-import xbmc, xbmcgui
-import xml.dom.minidom
-
-class GUIBuilder:
-	def __init__(self, win, skinXML, imagePath='', title='GUI Builder', line1='', dlg=None, pct=0, fastMethod=False, debug=False):
-		try:
-			self.debug							= debug
-			self.debugWrite('guibuilder.py', 2)
-			self.win 							= win
-			self.win.SUCCEEDED	 			= True
-			self.skinXML 						= skinXML[skinXML.rfind('\\') + 1:]
-			self.fastMethod					= fastMethod
-			self.pct 							= pct
-			self.lineno 							= line1 != ''
-			self.lines 							= [''] * 3
-			self.lines[0] 						= line1
-			self.lines[self.lineno] 			= 'Creating GUI from %s.' % (self.skinXML,)
-			self.initVariables()
-			if (not self.fastMethod):	
-				if (dlg): self.dlg = dlg
-				else: 
-					self.dlg = xbmcgui.DialogProgress()
-					self.dlg.create(title)
-				self.dlg.update(self.pct, self.lines[0], self.lines[1], self.lines[2])
-				self.pct1 = int((100 - pct) * 0.333)
-				self.includesExist = self.LoadIncludes()
-				self.referencesExist = self.LoadReferences()
-			else:
-				self.includesExist = False
-			self.pct1 = int((100 - self.pct) * 0.5)
-			self.parseSkinFile(imagePath, skinXML)
-			if (self.win.SUCCEEDED): self.setNav()
-			if (not self.win.SUCCEEDED): raise
-			else:
-				if (self.defaultControl and self.win.controls.has_key(self.defaultControl)):
-					self.win.setFocus(self.win.controls[self.defaultControl])
-				if (self.includesExist): self.incdoc.unlink()
-			if (not self.fastMethod): self.dlg.close()
-		except:
-			self.win.SUCCEEDED = False
-			if (not self.fastMethod):
-				if (dlg): dlg.close()
-				dlg = xbmcgui.Dialog()
-				dlg.ok(title, 'There was an error setting up controls.', 'Check your skin file:', skinXML)
-				self.dlg.close()
-
-
-	def debugWrite(self, function, action, lines=[], values=[]):
-		if (self.debug):
-			Action = ('Failed', 'Succeeded', 'Started')
-			Highlight = ('__', '__', '<<<<< ', '__', '__', ' >>>>>')
-			xbmc.output('%s%s%s : (%s)\n' % (Highlight[action], function, Highlight[action + 3], Action[action]))
-			try:
-				for cnt, line in enumerate(lines):
-					fLine = '%s\n' % (line,)
-					xbmc.output(fLine % values[cnt])
-			except: pass
-
-
-	def initVariables(self):
-		self.win.SUCCEEDED	 				= True
-		self.win.controls 						= {}
-		self.win.visibility 						= {}
-		self.win.positions						= {}
-		#self.win.onclick 						= {}
-		#self.win.onfocus 						= {}
-		self.navigation						= {}
-		self.m_references 					= {}
-		self.resPath 							= {}
-		self.resolution							= 6
-		self.currentResolution 				= self.win.getResolution()
-		self.resolutions = {'1080i' : 0, '720p' : 1, '480p' : 2, '480p16x9' : 3, 'ntsc' : 4, 'ntsc16x9' : 5, 'pal' : 6, 'pal16x9' : 7, 'pal60' : 8, 'pal6016x9' : 9}
-		for key, value in self.resolutions.items(): self.resPath[value] = key
-		self.debugWrite('initVariables', True)
-
-
-	def GetConditionalVisibility(self, conditions):
-		if (len(conditions) == 0): return 'true'
-		if (len(conditions) == 1): return conditions[0]
-		else:
-			#multiple conditions should be anded together
-			conditionString = "["
-			for i in range(len(conditions) - 1):
-				conditionString += conditions[i] + "] + ["
-			conditionString += conditions[len(conditions) - 1] + "]"
-		return conditionString
-
-
-	def addCtl(self, control):
-		try:
-			if (control['type'] == 'image'):
-				if (control.has_key('info')): 
-					if (control['info'][0] != ''): control['texture'] = xbmc.getInfoImage(control['info'][0])
-				self.win.controls[int(control['id'])] = (xbmcgui.ControlImage(x=int(control['posx']) + self.posx,\
-					y=int(control['posy']) + self.posy, width=int(control['width']), height=int(control['height']),\
-					filename=control['texture'], colorKey=control['colorkey'], aspectRatio=int(control['aspectratio'])))#,\
-					#colorDiffuse=control['colordiffuse']))
-				self.win.addControl(self.win.controls[int(control['id'])])
-			elif (control['type'] == 'label'):
-				if (control.has_key('info')):
-					if (control['info'][0] != ''): control['label'][0] = xbmc.getInfoLabel(control['info'][0])
-				self.win.controls[int(control['id'])] = (xbmcgui.ControlLabel(x=int(control['posx']) + self.posx,\
-					y=int(control['posy']) + self.posy, width=int(control['width']), height=int(control['height']), label=control['label'][0],\
-					font=control['font'], textColor=control['textcolor'], disabledColor=control['disabledcolor'], alignment=control['align'],\
-					hasPath=control['haspath'], angle=int(control['angle'])))#, shadowColor=control['shadowcolor']))
-				self.win.addControl(self.win.controls[int(control['id'])])
-			elif (control['type'] == 'button'):
-				if (control.has_key('info')):
-					if (control['info'][0] != ''): control['label'][0] = xbmc.getInfoLabel(control['info'][0])
-				self.win.controls[int(control['id'])] = (xbmcgui.ControlButton(x=int(control['posx']) + self.posx,\
-					y=int(control['posy']) + self.posy, width=int(control['width']), height=int(control['height']), label=control['label'][0],\
-					font=control['font'], textColor=control['textcolor'], disabledColor=control['disabledcolor'], alignment=control['align'],\
-					angle=int(control['angle']), shadowColor=control['shadowcolor'], focusTexture=control['texturefocus'],\
-					noFocusTexture=control['texturenofocus'], textXOffset=int(control['textoffsetx']), textYOffset=int(control['textoffsety'])))
-				self.win.addControl(self.win.controls[int(control['id'])])
-			elif (control['type'] == 'checkmark'):
-				if (control.has_key('info')):
-					if (control['info'][0] != ''): control['label'][0] = xbmc.getInfoLabel(control['info'][0])
-				self.win.controls[int(control['id'])] = (xbmcgui.ControlCheckMark(x=int(control['posx']) + self.posx,\
-					y=int(control['posy']) + self.posy, width=int(control['width']), height=int(control['height']), label=control['label'][0],\
-					font=control['font'], textColor=control['textcolor'], disabledColor=control['disabledcolor'], alignment=control['align'],\
-					focusTexture=control['texturecheckmark'], noFocusTexture=control['texturecheckmarknofocus'],\
-					checkWidth=int(control['markwidth']), checkHeight=int(control['markheight'])))
-				self.win.addControl(self.win.controls[int(control['id'])])
-			elif (control['type'] == 'textbox'):
-				self.win.controls[int(control['id'])] = (xbmcgui.ControlTextBox(x=int(control['posx']) + self.posx,\
-					y=int(control['posy']) + self.posy, width=int(control['width']), height=int(control['height']), font=control['font'],\
-					textColor=control['textcolor']))
-				self.win.addControl(self.win.controls[int(control['id'])])
-				if (control.has_key('label')): self.win.controls[int(control['id'])].setText(control['label'][0])
-			elif (control['type'] == 'fadelabel'):
-				self.win.controls[int(control['id'])] = (xbmcgui.ControlFadeLabel(x=int(control['posx']) + self.posx,\
-					y=int(control['posy']) + self.posy, width=int(control['width']), height=int(control['height']), font=control['font'],\
-					textColor=control['textcolor'], alignment=control['align']))#, shadowColor=control['shadowcolor']))
-				self.win.addControl(self.win.controls[int(control['id'])])
-				if (control.has_key('info')):
-					for item in control['info']:
-						if (item != ''): self.win.controls[int(control['id'])].addLabel(xbmc.getInfoLabel(item))
-				if (control.has_key('label')):
-					for item in control['label']:
-						if (item != ''): self.win.controls[int(control['id'])].addLabel(item)
-			elif (control['type'] == 'listcontrol'):
-				self.win.controls[int(control['id'])] = (xbmcgui.ControlList(x=int(control['posx']) + self.posx,\
-					y=int(control['posy']) + self.posy, width=int(control['width']), height=int(control['height']), font=control['font'],\
-					textColor=control['textcolor'], alignmentY=control['aligny'], buttonTexture=control['texturenofocus'],\
-					buttonFocusTexture=control['texturefocus'], selectedColor=control['selectedcolor'], imageWidth=int(control['itemwidth']),\
-					imageHeight=int(control['itemheight']), itemTextXOffset=int(control['textxoff']), itemTextYOffset=int(control['textyoff']),\
-					itemHeight=int(control['textureheight']), space=int(control['spacebetweenitems'])))#, shadowColor=control['shadowcolor']))
-				self.win.addControl(self.win.controls[int(control['id'])])
-				if (control.has_key('label')):
-					for cnt, item in enumerate(control['label']):
-						if (item != ''): 
-							if (cnt < len(control['label2'])): tmp = control['label2'][cnt]
-							else: tmp = ''
-							if (cnt < len(control['image'])): tmp2 = control['image'][cnt]
-							elif control['image']:	tmp2 = control['image'][len(control['image']) - 1]
-							else: tmp2 = ''
-							l = xbmcgui.ListItem(item, tmp, '', tmp2)
-							self.win.controls[int(control['id'])].addItem(l)
-			try: 
-				self.win.visibility[int(control['id'])] = control['visible']
-				self.win.positions[int(control['id'])] = (int(control['posx']), int(control['posy']))
-				#self.win.onclick[int(control['id'])] = control['onclick']
-				#self.win.onfocus[int(control['id'])] = control['onfocus']
-				self.navigation[int(control['id'])] = (int(control['onup']), int(control['ondown']), int(control['onleft']), int(control['onright']))
-				self.win.controls[int(control['id'])].setVisible(xbmc.getCondVisibility(control['visible']))
-			except: pass
-		except:
-			if (not self.fastMethod): self.dlg.close()
-			self.win.SUCCEEDED = False
-			self.controlsFailed += control['id'] + ', '
-			self.controlsFailedCnt += 1
-
-
-	def setResolution(self):
-		try:
-			offset = 0
-			# If resolutions differ calculate widescreen offset
-			if ((not (self.currentResolution == self.resolution)) and self.resolution > 1):
-				# check if current resolution is 16x9
-				if (self.currentResolution == 0 or self.currentResolution % 2): iCur16x9 = 1
-				else: iCur16x9 = 0
-				# check if skinned resolution is 16x9
-				if (self.resolution % 2): i16x9 = 1
-				else: i16x9 = 0
-				# calculate offset
-				offset = iCur16x9 - i16x9
-			self.win.setCoordinateResolution(self.resolution + offset)
-			self.debugWrite('setResolution', True, ['Current resolution: %i-%s', 'Skinned at resolution: %i-%s',\
-				'Set coordinate resolution at: %i-%s'], [(self.currentResolution, self.resPath[self.currentResolution],),\
-				(self.resolution, self.resPath[self.resolution],), (self.resolution + offset, self.resPath[self.resolution + offset],)])
-		except: self.debugWrite('setResolution', False)
-
-
-	def parseSkinFile(self, imagePath, filename):
-		try:
-			cnt = -1
-			self.controlsFailed = ''
-			self.controlsFailedCnt = 0
-			if (not self.fastMethod):
-				self.lines[self.lineno + 1]	= 'loading %s file...' % (self.skinXML,)
-				self.dlg.update(self.pct, self.lines[0], self.lines[1], self.lines[2])
-			# load and parse skin.xml file
-			skindoc = xml.dom.minidom.parse(filename)
-			root = skindoc.documentElement
-			# make sure this is a valid <window> xml file
-			if (not root or root.tagName != 'window'): raise
-			
-			self.posx = 0
-			self.posy = 0
-
-			# Check for default control and coordinates based system
-			try:
-				default = self.FirstChildElement(root, 'defaultcontrol')
-				if (default and default.firstChild): self.defaultControl = int(default.firstChild.nodeValue)
-				else: self.defaultControl = None
-				coordinates = self.FirstChildElement(root, 'coordinates')
-				if (coordinates and coordinates.firstChild):
-					systemBase = self.FirstChildElement(coordinates, 'system')
-					if (systemBase and systemBase.firstChild): 
-						system = int(systemBase.firstChild.nodeValue)
-						if (system == 1):
-							posx = self.FirstChildElement(coordinates, 'posx')
-							if (posx and posx.firstChild): self.posx = int(posx.firstChild.nodeValue)
-							posy = self.FirstChildElement(coordinates, 'posy')
-							if (posy and posy.firstChild): self.posy = int(posy.firstChild.nodeValue)
-			except: pass
-			self.win.coordinates = [self.posx, self.posy]
-
-			# check for a <resolution> tag and setCoordinateResolution()
-			resolution = self.FirstChildElement(root, 'resolution')
-			if (resolution and resolution.firstChild): self.resolution = self.resolutions.get(resolution.firstChild.nodeValue.lower(), 6)
-			self.setResolution()
-
-			# make sure <controls> block exists and resolve if necessary
-			controls = self.FirstChildElement(root, 'controls')
-			if (controls and controls.firstChild):
-				if (self.includesExist): controls = self.ResolveInclude(controls)
-			else: raise
-
-			#parse and resolve each control
-			data = controls.getElementsByTagName('control')
-			if (not data): raise
-			if (not self.fastMethod):
-				self.lines[self.lineno + 1]	= 'parsing %s file...' % (self.skinXML,)
-				t = len(data)
-			for cnt, control in enumerate(data):
-				if (not self.fastMethod): self.dlg.update(int((float(self.pct1) / float(t) * (cnt + 1)) + self.pct), self.lines[0], self.lines[1], self.lines[2])
-				if (self.includesExist): tmp = self.ResolveInclude(control)
-				else: tmp = control
-				ctl 		= {}
-				node 		= self.FirstChildElement(tmp, None)
-				lbl1 		= []
-				lbl2 		= []
-				ifo 		= []
-				img		= []
-				vis 		= []
-				ctype 	= ''
-				# loop thru control and find all tags
-				while (node):
-					# key node so save to the dictionary
-					if (node.tagName.lower() == 'label'): 
-						try: 
-							ls = xbmc.getLocalizedString(int(node.firstChild.nodeValue))
-							if (ls): lbl1.append(ls)
-							else: raise
-						except: 
-							if (node.hasChildNodes()): lbl1.append(node.firstChild.nodeValue)
-					elif (node.tagName.lower() == 'label2'):
-						try: 
-							ls = xbmc.getLocalizedString(int(node.firstChild.nodeValue))
-							if (ls): lbl2.append(ls)
-							else: raise
-						except:
-							if (node.hasChildNodes()): lbl2.append(node.firstChild.nodeValue)
-					elif (node.tagName.lower() == 'info'):
-						if (node.hasChildNodes()): ifo.append(node.firstChild.nodeValue)
-					elif (node.tagName.lower() == 'image'):
-						if (node.hasChildNodes()): img.append(node.firstChild.nodeValue)
-					elif (node.tagName.lower() == 'visible'):
-						if (node.hasChildNodes()): vis.append(node.firstChild.nodeValue)
-					elif (node.hasChildNodes()): 
-						if (node.tagName.lower() == 'type'): ctype = node.firstChild.nodeValue
-						ctl[node.tagName.lower()] = node.firstChild.nodeValue
-					node = self.NextSiblingElement(node, None)
-
-				# setup the controls settings and defaults if necessary
-				if (ctype):
-					# The following apply to all controls
-					if (not ctl.has_key('id')): ctl['id'] = self.m_references.get(ctype + '_id', '0')
-					if (not ctl.has_key('posx')): ctl['posx'] = self.m_references.get(ctype + '_posx', '0')
-					if (not ctl.has_key('posy')): ctl['posy'] = self.m_references.get(ctype + '_posy', '0')
-					if (not ctl.has_key('width')): ctl['width'] = self.m_references.get(ctype + '_width', '100')
-					if (not ctl.has_key('height')): ctl['height'] = self.m_references.get(ctype + '_height', '100')
-					if (not ctl.has_key('onup')): ctl['onup'] = self.m_references.get(ctype + '_onup', ctl['id'])
-					if (not ctl.has_key('ondown')): ctl['ondown'] = self.m_references.get(ctype + '_ondown', ctl['id'])
-					if (not ctl.has_key('onleft')): ctl['onleft'] = self.m_references.get(ctype + '_onleft', ctl['id'])
-					if (not ctl.has_key('onright')): ctl['onright'] = self.m_references.get(ctype + '_onright', ctl['id'])
-					if (vis): ctl['visible'] = self.GetConditionalVisibility(vis)
-					else: ctl['visible'] = self.m_references.get(ctype + '_visible', 'true')
-					#if (not ctl.has_key('onclick')): ctl['onclick'] = self.m_references.get(ctype + '_onclick', '')
-					#if (not ctl.has_key('onfocus')): ctl['onfocus'] = self.m_references.get(ctype + '_onfocus', '')
-
-					if (ctype == 'image' or ctype == 'label' or ctype == 'fadelabel' or ctype == 'button' or ctype == 'checkmark' or ctype == 'textbox'):
-						if (ifo): ctl['info'] = ifo
-						else: ctl['info'] = [self.m_references.get(ctype + '_info', '')]
-
-					if (ctype == 'label' or ctype == 'fadelabel' or ctype == 'button' or ctype == 'checkmark' or ctype == 'textbox' or ctype == 'listcontrol'):
-						if (lbl1): ctl['label'] = lbl1
-						else: ctl['label'] = [self.m_references.get(ctype + '_label', '')]
-						if (not ctl.has_key('shadowcolor')): ctl['shadowcolor'] = self.m_references.get(ctype + '_shadowcolor', '')
-						if (not ctl.has_key('font')): ctl['font'] = self.m_references.get(ctype + '_font', 'font12')
-						if (not ctl.has_key('textcolor')): ctl['textcolor'] = self.m_references.get(ctype + '_textcolor', '0xFF000000')
-
-					if (ctype == 'label' or ctype == 'fadelabel' or ctype == 'button' or ctype == 'checkmark' or ctype == 'listcontrol'):
-						if (not ctl.has_key('align')): ctl['align'] = self.m_references.get(ctype + '_align', 0)
-						if (ctl['align'] == 'left'): ctl['align'] = 0
-						elif (ctl['align'] == 'right'): ctl['align'] = 1
-						elif (ctl['align'] == 'center'): ctl['align'] = 2
-						else: ctl['align'] = 0
-						if (not ctl.has_key('aligny')): ctl['aligny'] = self.m_references.get(ctype + '_aligny', 0)
-						if (ctl['aligny'] == 'center'): ctl['aligny'] = 4
-						else: ctl['aligny'] = 0
-						ctl['align'] += ctl['aligny']
-							
-					if (ctype == 'label' or ctype == 'button' or ctype == 'checkmark'):
-						if (not ctl.has_key('disabledcolor')): ctl['disabledcolor'] = self.m_references.get(ctype + '_disabledcolor', '0x60000000')
-
-					if (ctype == 'label' or ctype == 'button'):
-						if (not ctl.has_key('angle')): ctl['angle'] = self.m_references.get(ctype + '_angle', '0')
-
-					if (ctype == 'listcontrol' or ctype == 'button'):
-						if (not ctl.has_key('texturefocus')): ctl['texturefocus'] = self.m_references.get(ctype + '_texturefocus', '')
-						elif (ctl['texturefocus'][0] == '\\'): ctl['texturefocus'] = imagePath + ctl['texturefocus']
-						if (not ctl.has_key('texturenofocus')): ctl['texturenofocus'] = self.m_references.get(ctype + '_texturenofocus', '')
-						elif (ctl['texturenofocus'][0] == '\\'): ctl['texturenofocus'] = imagePath + ctl['texturenofocus']
-						
-					if (ctype == 'image'):
-						if (not ctl.has_key('aspectratio')): ctl['aspectratio'] = self.m_references.get(ctype + '_aspectratio', 0)
-						if (ctl['aspectratio'] == 'stretch'): ctl['aspectratio'] = 0
-						elif (ctl['aspectratio'] == 'scale'): ctl['aspectratio'] = 1
-						elif (ctl['aspectratio'] == 'keep'): ctl['aspectratio'] = 2
-						else: ctl['aspectratio'] = 0
-						if (not ctl.has_key('colorkey')): ctl['colorkey'] = self.m_references.get(ctype + '_colorkey', '')
-						if (not ctl.has_key('colordiffuse')): ctl['colordiffuse'] = self.m_references.get(ctype + '_colordiffuse', '0xFFFFFFFF')
-						if (not ctl.has_key('texture')): ctl['texture'] = self.m_references.get(ctype + '_texture', '')
-						elif (ctl['texture'][0] == '\\'): ctl['texture'] = imagePath + ctl['texture']
-
-					if (ctype == 'label'):
-						if (not ctl.has_key('haspath')): ctl['haspath'] = self.m_references.get(ctype + '_haspath', 0)
-						if (ctl['haspath'] == 'false' or ctl['haspath'] == 'no'): ctl['haspath'] = 0
-						elif (ctl['haspath'] == 'true' or ctl['haspath'] == 'yes'): ctl['haspath'] = 1
-						else: ctl['haspath'] = 0
-						if (ctl.has_key('number')): ctl['label'][0] = [ctl['number']]
-
-					if (ctype == 'button'):
-						if (not ctl.has_key('textoffsetx')): ctl['textoffsetx'] = self.m_references.get(ctype + '_textoffsetx', '0')
-						if (not ctl.has_key('textoffsety')): ctl['textoffsety'] = self.m_references.get(ctype + '_textoffsety', '0')
-							
-					if (ctype == 'checkmark'):
-						if (not ctl.has_key('texturecheckmark')): ctl['texturecheckmark'] = self.m_references.get(ctype + '_texturecheckmark', '')
-						elif (ctl['texturecheckmark'][0] == '\\'): ctl['texturecheckmark'] = imagePath + ctl['texturecheckmark']
-						if (not ctl.has_key('texturecheckmarknofocus')): ctl['texturecheckmarknofocus'] = self.m_references.get(ctype + '_texturecheckmarknofocus', '')
-						elif (ctl['texturecheckmarknofocus'][0] == '\\'): ctl['texturecheckmarknofocus'] = imagePath + ctl['texturecheckmarknofocus']
-						if (not ctl.has_key('markwidth')): ctl['markwidth'] = self.m_references.get(ctype + '_markwidth', '20')
-						if (not ctl.has_key('markheight')): ctl['markheight'] = self.m_references.get(ctype + '_markheight', '20')
-
-					if (ctype == 'listcontrol'):
-						ctl['label2'] = lbl2
-						ctl['image'] = img
-						if (not ctl.has_key('selectedcolor')): ctl['selectedcolor'] = self.m_references.get(ctype + '_selectedcolor', '0xFFFFFFFF')
-						if (not ctl.has_key('itemwidth')): ctl['itemwidth'] = self.m_references.get(ctype + '_itemwidth', '20')
-						if (not ctl.has_key('itemheight')): ctl['itemheight'] = self.m_references.get(ctype + '_itemheight', '20')
-						if (not ctl.has_key('textureheight')): ctl['textureheight'] = self.m_references.get(ctype + '_textureheight', '20')
-						if (not ctl.has_key('textxoff')): ctl['textxoff'] = self.m_references.get(ctype + '_textxoff', '0')
-						if (not ctl.has_key('textyoff')): ctl['textyoff'] = self.m_references.get(ctype + '_textyoff', '0')
-						if (not ctl.has_key('spacebetweenitems')): ctl['spacebetweenitems'] = self.m_references.get(ctype + '_spacebetweenitems', '0')
-						if (not ctl['image']): ctl['image'] = [self.m_references.get(ctype + '_image', ' ')]
-						for i in range(len(ctl['image'])):
-							if (ctl['image'][i][0] == '\\'): ctl['image'][i] = imagePath + ctl['image'][i]
-
-				self.addCtl(ctl)
-			self.pct += self.pct1
-		except:
-			if (not self.fastMethod): self.dlg.close()
-			self.win.SUCCEEDED = False
-		try: skindoc.unlink()
-		except: pass
-		if (self.win.SUCCEEDED):
-			self.debugWrite('parseSkinFile', self.win.SUCCEEDED, ['Parsed %i control(s) from %s'], [(cnt + 1, self.skinXML,)])
-		else:
-			self.debugWrite('parseSkinFile', self.win.SUCCEEDED, ['Parsed %i control(s) from %s', 'Control(s) Failed: %s'],\
-				[((cnt + 1 - self.controlsFailedCnt), self.skinXML), self.controlsFailed[:-2]])
-
-
-	def setNav(self):
-		try:
-			if (not self.fastMethod): 
-				self.lines[self.lineno + 1]	= 'setting up navigation...'
-				t = len(self.navigation)
-			for cnt, item in enumerate(self.navigation):
-				if (not self.fastMethod): self.dlg.update(int((float(self.pct1) / float(t) * (cnt + 1)) + self.pct), self.lines[0], self.lines[1], self.lines[2])
-				if (self.win.controls.has_key(item)):
-					if (self.win.controls.has_key(self.navigation[item][0])):
-						self.win.controls[item].controlUp(self.win.controls[self.navigation[item][0]])
-					if (self.win.controls.has_key(self.navigation[item][1])):
-						self.win.controls[item].controlDown(self.win.controls[self.navigation[item][1]])
-					if (self.win.controls.has_key(self.navigation[item][2])):
-						self.win.controls[item].controlLeft(self.win.controls[self.navigation[item][2]])
-					if (self.win.controls.has_key(self.navigation[item][3])):
-						self.win.controls[item].controlRight(self.win.controls[self.navigation[item][3]])
-			self.debugWrite('setNav', True)
-		except:
-			if (not self.fastMethod): self.dlg.close()
-			self.win.SUCCEEDED = False
-			self.debugWrite('setNav', False)
-
-
-	def GetSkinPath(self, filename):
-		from os import path
-		default = 6
-		defaultwide = 7
-		try:
-			fname = 'Q:\\skin\\' + xbmc.getSkinDir() + '\\skin.xml'
-			skindoc = xml.dom.minidom.parse(fname)
-			root = skindoc.documentElement
-			if (not root or root.tagName != 'skin'): raise
-			strDefault = self.FirstChildElement(root, 'defaultresolution')
-			if (strDefault and strDefault.firstChild): default = self.resolutions.get(strDefault.firstChild.nodeValue.lower(), default)
-			strDefaultWide = self.FirstChildElement(root, 'defaultresolutionwide')
-			if (strDefaultWide and strDefaultWide.firstChild): defaultwide = self.resolutions.get(strDefaultWide.firstChild.nodeValue.lower(), defaultwide)
-			skindoc.unlink()
-		except: pass
-		fname = 'Q:\\skin\\' + xbmc.getSkinDir() + '\\' + self.resPath[self.currentResolution] + '\\' + filename
-		if (path.exists(fname)):
-			if (filename == 'references.xml'): self.resolution = self.currentResolution
-			self.debugWrite('GetSkinPath', True, ['Found path for %s at %s'], [(filename, fname,)])
-			return fname
-		# if we're in 1080i mode, try 720p next
-		if (self.currentResolution == 0):
-			fname = 'Q:\\skin\\' + xbmc.getSkinDir() + '\\' + self.resPath[1] + '\\' + filename
-			if (path.exists(fname)):
-				if (filename == 'references.xml'): self.resolution = 1
-				self.debugWrite('GetSkinPath', True, ['Found path for %s at %s'], [(filename, fname,)])
-				return fname
-		# that failed - drop to the default widescreen resolution if we're in a widemode
-		if (self.currentResolution % 2):
-			fname = 'Q:\\skin\\' + xbmc.getSkinDir() + '\\' + self.resPath[defaultwide] + '\\' + filename
-			if (path.exists(fname)):
-				if (filename == 'references.xml'): self.resolution = defaultwide
-				self.debugWrite('GetSkinPath', True, ['Found path for %s at %s'], [(filename, fname,)])
-				return fname
-		# that failed - drop to the default resolution
-		fname = 'Q:\\skin\\' + xbmc.getSkinDir() + '\\' + self.resPath[default] + '\\' + filename
-		if (path.exists(fname)):
-			if (filename == 'references.xml'): self.resolution = default
-			self.debugWrite('GetSkinPath', True, ['Found path for %s at %s'], [(filename, fname,)])
-			return fname
-		else:
-			self.debugWrite('GetSkinPath', False, ['No path for %s found'], [(filename,)])
-			return None
-
-	
-	def LoadReferences(self):
-		if (not self.fastMethod): 
-			self.lines[self.lineno + 1]	= 'loading references.xml file...'
-			self.dlg.update(self.pct, self.lines[0], self.lines[1], self.lines[2])
-			self.pct += self.pct1
-		# get the references.xml file location if it exists
-		referenceFile = self.GetSkinPath('references.xml')
-		# load and parse references.xml file
-		try: refdoc = xml.dom.minidom.parse(referenceFile)
-		except: 
-			self.debugWrite('LoadReferences', False)
-			return False
-		root = refdoc.documentElement
-		if (not root or root.tagName != 'controls'): 
-			refdoc.unlink()
-			self.debugWrite('LoadReferences', False)
-			return False
-		data = refdoc.getElementsByTagName('control')
-		for control in data:
-			if (self.includesExist): tmp = self.ResolveInclude(control)
-			else: tmp = control
-			t = tmp.getElementsByTagName('type')
-			if (t[0].hasChildNodes()): 
-				tagName = t[0].firstChild.nodeValue
-				node = self.FirstChildElement(tmp, None)
-				while (node):
-					# key node so save to the dictionary
-					if (node.tagName.lower() != 'type'):
-						if (node.hasChildNodes()): 
-							self.m_references[tagName + '_' + node.tagName.lower()] = node.firstChild.nodeValue
-					node = self.NextSiblingElement(node, None)
-		refdoc.unlink()
-		self.debugWrite('LoadReferences', True)
-		return True
-
-
-	def FirstChildElement(self, root, value = 'include'):
-		node = root.firstChild
-		while (node):
-			if (node and node.nodeType == 1):
-				if (node.tagName == value or not value): return node
-			node = node.nextSibling
-		return None
-
-
-	def NextSiblingElement(self, node, value = 'include'):
-		while (node):
-			node = node.nextSibling
-			if (node and node.nodeType == 1):
-				if (node.tagName == value or not value): return node
-		return None
-
-
-	def LoadIncludes(self):
-		if (not self.fastMethod):
-			self.lines[self.lineno + 1]	= 'loading includes.xml file...'
-			self.dlg.update(self.pct, self.lines[0], self.lines[1], self.lines[2])
-			self.pct += self.pct1
-		# make sure our include map is cleared.
-		self.m_includes = {}
-		# get the includes.xml file location if it exists
-		includeFile = self.GetSkinPath('includes.xml')
-		# load and parse includes.xml file
-		try: self.incdoc = xml.dom.minidom.parse(includeFile)
-		except:
-			self.debugWrite('LoadIncludes', False)
-			return False
-		root = self.incdoc.documentElement
-		if (not root or root.tagName != 'includes'):
-			self.incdoc.unlink()
-			self.debugWrite('LoadIncludes', False)
-			return False
-		node = self.FirstChildElement(root)
-		while (node):
-			if (node.attributes["name"] and node.firstChild):
-				# key node so save to the dictionary
-				tagName = node.attributes["name"].value
-				self.m_includes[tagName] = node
-			node = self.NextSiblingElement(node)
-		self.debugWrite('LoadIncludes', True)
-		return True
-
-
-	def ResolveInclude(self, node):
-		# we have a node, find any <include>tagName</include> tags and replace
-		# recursively with their real includes
-		if (not node): return None
-		include = self.FirstChildElement(node)
-		while (include and include.firstChild):
-			# have an include tag - grab it's tag name and replace it with the real tag contents
-			tagName = include.firstChild.toxml()
-			try: 
-				element = self.m_includes[tagName].cloneNode(True)
-				#found the tag(s) to include - let's replace it
-				for tag in element.childNodes:
-					# we insert before the <include> element to keep the correct
-					# order (we render in the order given in the xml file)
-					if (tag.nodeType == 1): result = node.insertBefore(tag, include)
-			except: pass# invalid include
-			#try:
-			result = node.removeChild(include)
-			include.unlink()
-			#except: pass
-			include = self.FirstChildElement(node)
-		return node
-
Index: scripts/IMDbLib.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: scripts/listitemexample.py
===================================================================
--- scripts/listitemexample.py	(revision 30763)
+++ scripts/listitemexample.py	(working copy)
@@ -1,52 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmcgui
-
-def debug( str ):
-    xbmc.output( str )
-
-class Window( xbmcgui.Window ):
-    def __init__( self ):
-        xbmcgui.Window.__init__( self )
-        self.checkMark = None
-
-    def create( self ):
-        self.ctl = xbmcgui.ControlList( 50, 200, 400, 200 )
-        self.addControl( self.ctl )
-        self.setFocus( self.ctl )
-        labels = { 0: 'zero', 1: 'one', 2: 'two', 3: 'three' }
-        for k,v in labels.items():
-            self.ctl.addItem(
-                xbmcgui.ListItem(
-                    label=str(k), label2=v,
-                    thumbnailImage="q:\\scripts\\test.png" ) )
-
-    def onAction( self, action ):
-        debug( "> Window.onAction( action=[%s] )"%action )
-        if action in (9,10):
-            self.close()
-        debug( "< Window.onAction( action=[%s] )"%action )
-
-win = Window()
-win.create()
-win.doModal()
-del win
-
Index: scripts/makedoc.py
===================================================================
--- scripts/makedoc.py	(revision 30763)
+++ scripts/makedoc.py	(working copy)
@@ -1,39 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import pydoc, os, xbmc, xbmcgui
-
-def makeDocDir():
-	try:
-		os.mkdir('q:\\doc')
-		os.mkdir('q:\\doc\\python')
-	except:
-		pass
-
-makeDocDir()		
-doc = pydoc.HTMLDoc()
-
-f = open('Q:\\doc\\python\\xbmc.html', 'w')
-f.write(doc.document(xbmc))
-f.close()
-
-f = open('Q:\\doc\\python\\xbmcgui.html', 'w')
-f.write(doc.document(xbmcgui))
-f.close()
Index: scripts/playmusic.py
===================================================================
--- scripts/playmusic.py	(revision 30763)
+++ scripts/playmusic.py	(working copy)
@@ -1,30 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmc, xbmcgui, nt
-
-dir = 'f:\\music\\mp3\\'
-list = nt.listdir(dir)
-
-dialog = xbmcgui.Dialog()
-selected = dialog.select('select a song to play, no directory!!!', list)
-filename = list[selected]
-
-xbmc.Player().play(dir + filename)
Index: scripts/rss.py
===================================================================
--- scripts/rss.py	(revision 30763)
+++ scripts/rss.py	(working copy)
@@ -1,106 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://www.xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-# RSS Feed example
-# This one uses a existing window in xbmc which allows us to draw for example in
-# the "home window"
-# No use to capture action codes in here since they are not supported when using an
-# existing window, same goes for buttons.
-
-#get windows from key.h
-
-WINDOW_HOME			= 10000
-WINDOW_PROGRAMS		= 10001
-WINDOW_PICTURES		= 10002
-WINDOW_FILES		= 10003
-
-RSS_URL = 'http://www.xbox-scene.com/xbox1data/xbox-scene.xml'
-
-import xbmc
-import xbmcgui
-import sys, urllib, string, urlparse, re, time
-
-class RssReader:
-	def __init__(self):
-		self.news = []
-		
-	def parsexml(self, line, tag):
-		result= re.search('<' + tag + '>.*' + tag + '>', line, re.DOTALL)
-		try:
-			if result.group(0):
-				mod = string.replace(result.group(0), '<' + tag + '>','')
-				mod = string.replace(mod, '</' + tag + '>', '')
-				mod = string.lstrip(mod)
-				return mod
-		except:
-			return
-	
-	def getNews(self):
-		data = urllib.urlopen(RSS_URL)
-		items = string.split(data.read(), '<item>')
-		
-		for item in items:
-			self.news.append(self.parsexml(item, 'title'))
-			
-		return self.news
-
-class Window(xbmcgui.Window):
-	def __init__(self, id):
-		self.strTitle = xbmcgui.ControlLabel(50, 400, 100, 20, '', 'font14', '0xFFB2D4F5')
-		self.labelsNews = []
-		self.labelsNews.append(xbmcgui.ControlLabel(50, 420, 100, 20, '', 'font13', '0xFFFFFFFF'))
-		self.labelsNews.append(xbmcgui.ControlLabel(50, 440, 100, 20, '', 'font13', '0xFFFFFFFF'))
-		self.labelsNews.append(xbmcgui.ControlLabel(50, 460, 100, 20, '', 'font13', '0xFFFFFFFF'))
-		self.labelsNews.append(xbmcgui.ControlLabel(50, 480, 100, 20, '', 'font13', '0xFFFFFFFF'))
-		self.labelsNews.append(xbmcgui.ControlLabel(50, 500, 100, 20, '', 'font13', '0xFFFFFFFF'))
-		
-		self.addControl(self.strTitle)
-		self.addControl(self.labelsNews[0])
-		self.addControl(self.labelsNews[1])
-		self.addControl(self.labelsNews[2])
-		self.addControl(self.labelsNews[3])
-		self.addControl(self.labelsNews[4])
-		
-		self.running = True
-		self.rssreader = RssReader()
-		
-	def run(self):
-		while self.running:
-			self.update()
-			#time.sleep(1800) # wait 30 min before updating again
-
-	def update(self):
-		self.news = self.rssreader.getNews()
-		self.strTitle.setLabel(self.news[0])
-		for i in range(1, 5):
-			self.labelsNews[i].setLabel(self.news[i])
-
-		self.running = False
-		
-w = Window(WINDOW_HOME)
-w.show()
-w.run()
-
-# wait 60 sec before closing window
-# loop forever if you never want to stop this script
-for i in range(6):
-	time.sleep(10)
-
-del w
Index: scripts/scripts.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: scripts/user_submitted.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: scripts/windowexample.py
===================================================================
--- scripts/windowexample.py	(revision 30763)
+++ scripts/windowexample.py	(working copy)
@@ -1,99 +0,0 @@
-#
-#      Copyright (C) 2005-2008 Team XBMC
-#      http://www.xbmc.org
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with XBMC; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-#
-
-import xbmc
-import xbmcgui
-
-#get actioncodes from keymap.xml
-
-ACTION_MOVE_LEFT 							= 1	
-ACTION_MOVE_RIGHT							= 2
-ACTION_MOVE_UP								= 3
-ACTION_MOVE_DOWN							= 4
-ACTION_PAGE_UP								= 5
-ACTION_PAGE_DOWN							= 6
-ACTION_SELECT_ITEM						= 7
-ACTION_HIGHLIGHT_ITEM					= 8
-ACTION_PARENT_DIR							= 9
-ACTION_PREVIOUS_MENU					= 10
-ACTION_SHOW_INFO							= 11
-
-ACTION_PAUSE									= 12
-ACTION_STOP										= 13
-ACTION_NEXT_ITEM							= 14
-ACTION_PREV_ITEM							= 15
-
-class Window(xbmcgui.Window):
-	def __init__(self):
-	
-		self.addControl(xbmcgui.ControlImage(0,0,720,576, 'background.png'))
-		self.list = xbmcgui.ControlList(200, 100, 400, 400)
-		self.strAction = xbmcgui.ControlLabel(50, 100, 100, 20, 'action', 'font13', '0xFFFF3300')
-		self.strButton = xbmcgui.ControlLabel(50, 150, 100, 20, 'button', 'font13', '0xFFFFFFFF')
-		
-		self.addControl(self.list)
-		self.addControl(self.strAction)
-		self.addControl(self.strButton)
-				
-		self.button1 = xbmcgui.ControlButton(50, 200, 90, 30, "Button 1")
-		self.button2 = xbmcgui.ControlButton(50, 240, 90, 30, "Button 2")
-		self.addControl(self.button1)
-		self.addControl(self.button2)
-		
-		self.button1.controlDown(self.button2)
-		self.button1.controlRight(self.list)
-		self.button2.controlUp(self.button1)
-		self.button2.controlRight(self.list)
-		self.list.controlLeft(self.button1)
-		
-		# add a few items to the list
-		xbmcgui.lock()
-		for i in range(50):
-			self.list.addItem('item' + str(i))
-		xbmcgui.unlock()
-		self.setFocus(self.button1)
-	
-	def onAction(self, action):
-		if action == ACTION_PREVIOUS_MENU:
-			print('action recieved: previous')
-			self.close()
-		if action == ACTION_SHOW_INFO:
-			self.strAction.setLabel('action recieved: show info')
-		if action == ACTION_STOP:
-			self.strAction.setLabel('action recieved: stop')
-		if action == ACTION_PAUSE:
-			print('pause')
-			dialog = xbmcgui.Dialog()
-			dialog.ok('action recieved','ACTION_PAUSE')
-	
-	def onControl(self, control):
-		if control == self.button1:
-			self.strButton.setLabel('button 1 clicked')
-		elif control == self.button2:
-			self.strButton.setLabel('button 2 clicked')
-		elif control == self.list:
-			item = self.list.getSelectedItem()
-			self.strButton.setLabel('selected : ' + self.list.getSelectedItem().getLabel())
-			item.setLabel(item.getLabel() + '1')
-
-w = Window()
-w.doModal()
-
-del w
Index: scripts/WindowXMLExample.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: skin/Confluence/720p/Home.xml
===================================================================
--- skin/Confluence/720p/Home.xml	(revision 30763)
+++ skin/Confluence/720p/Home.xml	(working copy)
@@ -22,7 +22,7 @@
 			<include>VisibleFadeEffect</include>
 			<visible>Skin.HasSetting(homepageSysteminfo) + Container(9000).HasFocus(5)</visible>
 			<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>
-			<animation effect="slide" start="0,0" end="130,0" delay="0" time="300" condition="Skin.HasSetting(homepageWeatherinfo) | !Weather.IsFetched">conditional</animation>
+			<animation effect="slide" start="0,0" end="130,0" delay="0" time="300" condition="Skin.HasSetting(homepageWeatherinfo) | !IsTrue(Window(Weather).Property(Weather.IsFetched))">conditional</animation>
 			<animation effect="slide" start="0,0" end="840,0" delay="0" time="300">WindowClose</animation>
 			<animation effect="slide" start="840,0" end="0,0" delay="0" time="300">WindowOpen</animation>
 			<control type="image">
@@ -54,7 +54,7 @@
 			<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>
 			<animation effect="slide" start="0,0" end="510,0" delay="0" time="300">WindowClose</animation>
 			<animation effect="slide" start="510,0" end="0,0" delay="0" time="300">WindowOpen</animation>
-			<visible>!Skin.HasSetting(homepageWeatherinfo) + Weather.IsFetched</visible>
+			<visible>!Skin.HasSetting(homepageWeatherinfo) + IsTrue(Window(Weather).Property(Weather.IsFetched))</visible>
 			<control type="image">
 				<description>time background</description>
 				<posx>0</posx>
@@ -70,7 +70,7 @@
 				<width>25</width>
 				<height>25</height>
 				<aspectratio>keep</aspectratio>
-				<texture>$INFO[Weather.Conditions]</texture>
+				<texture>$INFO[Window(Weather).Property(Current.ConditionIcon)]</texture>
 			</control>
 			<control type="label">
 				<description>time label</description>
@@ -83,7 +83,7 @@
 				<font>font12</font>
 				<textcolor>white</textcolor>
 				<shadowcolor>black</shadowcolor>
-				<label>[B]$INFO[Weather.Temperature][/B]</label>
+				<label>[B]$INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits][/B]</label>
 			</control>
 		</control>		
 		<control type="button" id="8999">
Index: skin/Confluence/720p/includes.xml
===================================================================
--- skin/Confluence/720p/includes.xml	(revision 30763)
+++ skin/Confluence/720p/includes.xml	(working copy)
@@ -180,7 +180,7 @@
 			<posy>0</posy>
 			<width>1280</width>
 			<height>720</height>
-			<imagepath background="true">$INFO[Skin.String(WeatherFanartDir)]$INFO[Weather.FanartCode]</imagepath>
+			<imagepath background="true">$INFO[Window(Weather).Property(Current.FanartPath)]</imagepath>
 			<timeperimage>10000</timeperimage>
 			<randomize>true</randomize>
 			<fadetime>1000</fadetime>
Index: skin/Confluence/720p/IncludesHomeHorizontal.xml
===================================================================
--- skin/Confluence/720p/IncludesHomeHorizontal.xml	(revision 30763)
+++ skin/Confluence/720p/IncludesHomeHorizontal.xml	(working copy)
@@ -858,7 +858,7 @@
 						<label>8</label>
 						<onclick>ActivateWindow(Weather)</onclick>
 						<icon>special://skin/backgrounds/weather.jpg</icon>
-						<thumb>$INFO[Skin.String(WeatherFanartDir)]$INFO[Weather.FanartCode]</thumb>
+						<thumb>$INFO[Window(Weather).Property(Current.FanartPath)]</thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
 						<visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible>
 					</item>
Index: skin/Confluence/720p/IncludesHomeVertical.xml
===================================================================
--- skin/Confluence/720p/IncludesHomeVertical.xml	(revision 30763)
+++ skin/Confluence/720p/IncludesHomeVertical.xml	(working copy)
@@ -852,7 +852,7 @@
 						<label>8</label>
 						<onclick>ActivateWindow(Weather)</onclick>
 						<icon>special://skin/backgrounds/weather.jpg</icon>
-						<thumb>$INFO[Skin.String(WeatherFanartDir)]$INFO[Weather.FanartCode]</thumb>
+						<thumb>$INFO[Window(Weather).Property(Current.FanartPath)]</thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
 						<visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible>
 					</item>
Index: xbmc/lib/libPython/xbmcmodule/PythonSettings.cpp
===================================================================
--- xbmc/lib/libPython/xbmcmodule/PythonSettings.cpp	(revision 30763)
+++ xbmc/lib/libPython/xbmcmodule/PythonSettings.cpp	(working copy)
@@ -23,6 +23,7 @@
 #include "PythonSettings.h"
 #include "pyutil.h"
 #include "GUIDialogPluginSettings.h"
+#include "Weather.h"
 
 #ifndef __GNUC__
 #pragma code_seg("PY_TEXT")
@@ -155,22 +156,32 @@
   }
 
   PyDoc_STRVAR(openSettings__doc__,
-    "openSettings() -- Opens this scripts settings dialog.\n"
+    "openSettings() -- Opens this scripts settings dialog. Returns True if user changed settings.\n"
     "\n"
     "example:\n"
-    "  - self.Settings.openSettings()\n");
+    "  - ok = self.Settings.openSettings()\n");
 
   PyObject* Settings_OpenSettings(Settings *self, PyObject *args, PyObject *kwds)
   {
-    // show settings dialog
+    bool ok;
     CStdString path = self->pSettings->getPath();
-    CGUIDialogPluginSettings::ShowAndGetInput(path);
 
+    // show settings dialog
+    Py_BEGIN_ALLOW_THREADS
+    ok = CGUIDialogPluginSettings::ShowAndGetInput(path);
+    Py_END_ALLOW_THREADS
+
+    // refresh weather if weather settings
+    if (ok && path.Find("Q:\\plugins\\weather\\"))
+    {
+      g_weatherManager.Refresh();
+      g_weatherManager.Reset();
+    }
+
     // reload settings
     self->pSettings->Load(path);
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    return Py_BuildValue((char*)"b", ok);
   }
 
   PyMethodDef Settings_methods[] = {
Index: xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
===================================================================
--- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	(revision 30763)
+++ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	(working copy)
@@ -764,7 +764,7 @@
     "\n"
     "id             : string - id of setting to return\n"
     "\n"
-    "*Note, choices are (dateshort, datelong, time, meridiem, tempunit, speedunit)\n"
+    "*Note, choices are (dateshort, datelong, locale, meridiem, speedunit, tempunit, time)\n"
     "\n"
     "       You can use the above as keywords for arguments.\n"
     "\n"
@@ -789,20 +789,18 @@
 
     CStdString result;
 
-    if (strcmpi(id, "datelong") == 0)
+    if (strcmpi(id, "datelong") == 0 || strcmpi(id, "dateshort") == 0)
     {
-      result = g_langInfo.GetDateFormat(true);
+      result = g_langInfo.GetDateFormat(strcmpi(id, "datelong") == 0 ? true : false);
+      // make python compatible
       result.Replace("DDDD", "%A");
       result.Replace("MMMM", "%B");
-      result.Replace("D", "%d");
-      result.Replace("YYYY", "%Y");
-    }
-    else if (strcmpi(id, "dateshort") == 0)
-    {
-      result = g_langInfo.GetDateFormat(false);
       result.Replace("MM", "%m");
+      result.Replace("M", "%m");
       result.Replace("DD", "%d");
+      result.Replace("D", "%d");
       result.Replace("YYYY", "%Y");
+      result.Replace("YY", "%y");
     }
     else if (strcmpi(id, "tempunit") == 0)
       result = g_langInfo.GetTempUnitString();
@@ -811,7 +809,11 @@
     else if (strcmpi(id, "time") == 0)
     {
       result = g_langInfo.GetTimeFormat();
-      result.Replace("H", "%H");
+      // make python compatible
+      if (result.Find("HH") >=0)
+        result.Replace("HH", "%H");
+      else
+        result.Replace("H", "%H");
       result.Replace("h", "%I");
       result.Replace("mm", "%M");
       result.Replace("ss", "%S");
@@ -819,6 +821,8 @@
     }
     else if (strcmpi(id, "meridiem") == 0)
       result.Format("%s/%s", g_langInfo.GetMeridiemSymbol(CLangInfo::MERIDIEM_SYMBOL_AM), g_langInfo.GetMeridiemSymbol(CLangInfo::MERIDIEM_SYMBOL_PM));
+    else if (strcmpi(id, "locale") == 0)
+      result = g_langInfo.GetDVDAudioLanguage();
 
     return Py_BuildValue((char*)"s", result.c_str());
   }
Index: xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
===================================================================
--- xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	(revision 30763)
+++ xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	(working copy)
@@ -548,7 +548,7 @@
   }
 
   PyDoc_STRVAR(openSettings__doc__,
-    "openSettings(url[, reload]) -- Opens this plugins settings.\n"
+    "openSettings(url[, reload]) -- Opens this plugins settings dialog. Returns True if user changed settings.\n"
     "\n"
     "url         : string or unicode - url of plugin. (plugin://pictures/picasa/)\n"
     "reload      : [opt] bool - reload language strings and settings (default=True)\n"
@@ -558,7 +558,7 @@
     "       reload is only necessary if calling openSettings() from the plugin.\n"
     "\n"
     "example:\n"
-    "  - xbmcplugin.openSettings(url=sys.argv[0])\n");
+    "  - ok = xbmcplugin.openSettings(url=sys.argv[0])\n");
 
   PyObject* XBMCPLUGIN_OpenSettings(PyTypeObject *type, PyObject *args, PyObject *kwds)
   {
@@ -588,9 +588,14 @@
       return NULL;
     }
 
+    bool ok;
     CURL cUrl(url);
-    CGUIDialogPluginSettings::ShowAndGetInput(cUrl);
-
+
+    // show settings dialog
+    Py_BEGIN_ALLOW_THREADS
+    ok = CGUIDialogPluginSettings::ShowAndGetInput(cUrl);
+    Py_END_ALLOW_THREADS
+
     // reload plugin settings & strings
     if (bReload)
     {
@@ -598,8 +603,7 @@
       DIRECTORY::CPluginDirectory::LoadPluginStrings(cUrl);
     }
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    return Py_BuildValue((char*)"b", ok);
   }
 
   // define c functions to be used in python here