The branch, dharma-pre has been updated
       via  ab99d769fdafd1244cba72b3f0a9d359e49dc66d (commit)
      from  57a411fc28189556aad4b508827ab00c729725f4 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=ab99d769fdafd1244cba72b3f0a9d359e49dc66d

commit ab99d769fdafd1244cba72b3f0a9d359e49dc66d
Author: Zeljko Ametovic <[email protected]>
Date:   Tue Oct 19 10:01:14 2010 +0400

    [script.image.bigpictures] -v 1.3.0
      Added: The possibility to get albums/images from more than one website 
(switch source)
      Added: New Scraper 'Wallstreetjournal: The Photo Journal'
      Added: New Scraper 'Boston.com: The Big Shot'
      Added: New Scraper 'Sacramento Bee: The Frame'
      Changed: The Layout and content of the help texts
      Fixed: TBP-Scraper: Remove the image-number within the description text
      Fixed: TBP-Scraper: removed #-sign at the end of the picture
      Improved: Changes to the icon.png (more padding)

diff --git a/script.image.bigpictures/addon.xml 
b/script.image.bigpictures/addon.xml
index c4e57cf..d92f508 100644
--- a/script.image.bigpictures/addon.xml
+++ b/script.image.bigpictures/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.image.bigpictures" name="The Big Picture" version="1.2.0" 
provider-name="sphere, rwparris2">
+<addon id="script.image.bigpictures" name="The Big Picture" version="1.3.0" 
provider-name="sphere, rwparris2">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
     <import addon="script.module.beautifulsoup" version="3.0.8"/>
@@ -9,9 +9,9 @@
   </extension>
   <extension point="xbmc.addon.metadata">
     <platform>all</platform>
-    <summary lang="de">Zeigt Alben/Bilder von Boston.com's Seite "The Big 
Pictures"</summary>
-    <summary lang="en">Shows Albums/Pictures from Boston.com's photojournalism 
site</summary>
-    <description lang="de">Das Album kann mit links und rechts gewählt 
werden.[CR]Mit select wird das Album geöffnet.[CR]Herunterladen der Bilder ist 
mit der Kontext-Menu Taste möglich.</description>
-    <description lang="en">You can switch the album with left and 
right.[CR]With select-key you can enter the album to view its 
content.[CR]Picture Downloading is possible with the context menu 
key.</description>
+    <summary lang="de">Zeigt Alben/Bilder von Photojournalismus-Seiten wie 
Boston.com's "The Big Pictures"</summary>
+    <summary lang="en">Shows Albums/Pictures from photojournalism site's like 
Boston.com's 'The Big Picture'</summary>
+    <description lang="de">Die Quelle kann mit hoch und runter gewechselt 
werden - das album mit links und rechts[CR]Mit select wird das Album 
geöffnet.[CR]Herunterladen der Bilder ist mit der Kontext-Menu Taste 
möglich.[CR]Aktuell sind die folgenden Quellen verfügbar:[CR] - Boston.com: 
The Big Picture[CR] - Boston.com: The Big Shot[CR] - Sacramento Bee: The 
Frame[CR] - Wallstreetjournal: The Photo Journal</description>
+    <description lang="en">You can switch the source with up and down, switch 
the album with left and right[CR]With select-key you can enter an album to view 
its content.[CR]Picture Downloading is possible with the context menu 
key.[CR]Currently the following Sources are included:[CR] - Boston.com: The Big 
Picture[CR] - Boston.com: The Big Shot[CR] - Sacramento Bee: The Frame[CR] - 
Wallstreetjournal: The Photo Journal</description>
   </extension>
 </addon>
diff --git a/script.image.bigpictures/changelog.txt 
b/script.image.bigpictures/changelog.txt
index f6334b6..3702a52 100644
--- a/script.image.bigpictures/changelog.txt
+++ b/script.image.bigpictures/changelog.txt
@@ -1,8 +1,18 @@
+1.3.0
+  Added: The possibility to get albums/images from more than one website 
(switch source)
+  Added: New Scraper 'Wallstreetjournal: The Photo Journal'
+  Added: New Scraper 'Boston.com: The Big Shot'
+  Added: New Scraper 'Sacramento Bee: The Frame'
+  Changed: The Layout and content of the help texts
+  Fixed: TBP-Scraper: Remove the image-number within the description text
+  Fixed: TBP-Scraper: removed #-sign at the end of the picture  
+  Improved: Changes to the icon.png (more padding)
+
 1.2.0
   Ported to be dharma compatible by sphere (with permission of rwparris2)
-  Added German Translation
-  Changed from plugin which called script to native script
-  Added new icon.png
+  Added: German Translation
+  Changed: Addon ported from plugin which called script to native script
+  Added: New icon.png
   
 1.1.2
   Released as plugin for camelot by rwparris2
\ No newline at end of file
diff --git a/script.image.bigpictures/icon.png 
b/script.image.bigpictures/icon.png
index e54d0d5..151393e 100644
Binary files a/script.image.bigpictures/icon.png and 
b/script.image.bigpictures/icon.png differ
diff --git a/script.image.bigpictures/resources/language/English/strings.xml 
b/script.image.bigpictures/resources/language/English/strings.xml
index ac2cf50..2fbbe8e 100644
--- a/script.image.bigpictures/resources/language/English/strings.xml
+++ b/script.image.bigpictures/resources/language/English/strings.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<strings>

-  <!--LOADING-->

-  <string id="32000">The Big Picture - Boston.com</string>

-  <string id="32001">Image loading may take a while...</string>

-  

-  <!--DOWNLOAD-->

-  <string id="32020">Download</string>

-  <string id="32021">Album</string>

-  <string id="32022">Picture</string>

-  <!--Downloading [picturename] to [path].-->

-  <string id="32023">Downloading</string>

-  <string id="32024">to</string>

-  <string id="32025">of</string>

-  

-  <string id="32030">Info - Toggle Onscreen Information</string>

-  <string id="32031">Context Menu - Download Photos</string>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+  <!--LOADING-->
+  <string id="32001">Image loading may take a while...</string>
+  <!--DOWNLOAD-->
+  <string id="32020">Download</string>
+  <string id="32021">Album</string>
+  <string id="32022">Picture</string>
+  <!--Downloading [picturename] to [path].-->
+  <string id="32023">Downloading</string>
+  <string id="32024">to</string>
+  <string id="32025">of</string>
+  <!--Picture Mode -->
+  <string id="32030">Left + Right - Switch Picture</string>  
+  <string id="32031">Info - Toggle Onscreen Information</string>
+  <string id="32032">Context Menu - Download Photos</string>
+  <!--Album Mode -->
+  <string id="32040">Left + Right - Switch Album</string>
+  <string id="32041">Up + Down - Switch Source</string>
+  <string id="32042">Select - Enter Album</string>
 </strings>
\ No newline at end of file
diff --git a/script.image.bigpictures/resources/language/German/strings.xml 
b/script.image.bigpictures/resources/language/German/strings.xml
index 023d1b3..1e400cd 100644
--- a/script.image.bigpictures/resources/language/German/strings.xml
+++ b/script.image.bigpictures/resources/language/German/strings.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<strings>

-  <!--LOADING-->

-  <string id="32000">The Big Picture - Boston.com</string>

-  <string id="32001">Das Laden kann einige Zeit dauern...</string>

-  

-  <!--DOWNLOAD-->

-  <string id="32020">Herunterladen</string>

-  <string id="32021">Album</string>

-  <string id="32022">Bild</string>

-  <!--Downloading [picturename] to [path].-->

-  <string id="32023">Lade</string>

-  <string id="32024">nach</string>

-  <string id="32025">von</string>

-  

-  <string id="32030">Info - OSD Zeigen</string>

-  <string id="32031">Context Menu - Bilder herunterladen</string>

-</strings>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+  <!--LOADING-->
+  <string id="32001">Das Laden kann einige Zeit dauern...</string>
+  <!--DOWNLOAD-->
+  <string id="32020">Herunterladen</string>
+  <string id="32021">Album</string>
+  <string id="32022">Bild</string>
+  <!--Downloading [picturename] to [path].-->
+  <string id="32023">Lade</string>
+  <string id="32024">nach</string>
+  <string id="32025">von</string>
+  <!--Picture Mode -->
+  <string id="32030">Links + Rechts - Bild wechseln</string>
+  <string id="32031">Info - OSD an/aus</string>
+  <string id="32032">Kontext Menu - Bilder herunterladen</string>
+  <!--Album Mode -->
+  <string id="32040">Links + Rechts - Album wechseln</string>
+  <string id="32041">Hoch + Runter - Quelle wechseln</string>
+  <string id="32042">Select - Album öffnen</string>
+</strings>
diff --git a/script.image.bigpictures/resources/language/Swedish/strings.xml 
b/script.image.bigpictures/resources/language/Swedish/strings.xml
index 9dcc2fc..c470b65 100644
--- a/script.image.bigpictures/resources/language/Swedish/strings.xml
+++ b/script.image.bigpictures/resources/language/Swedish/strings.xml
@@ -1,18 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<!--Language file translated with Team XBMC Translator-->

-<!--Translator: blittan-->

-<!--Email: [email protected]>

-<!--Date of translation: 12/09/2009-->

-<!--$Revision$-->

-<strings>

-  <string id="32000">The Big Picture - Boston.com</string>

-  <string id="32001">Bildnedladdning kan ta ett tag...</string>

-  <string id="32020">Ladda ner</string>

-  <string id="32021">Album</string>

-  <string id="32022">Bild</string>

-  <string id="32023">Laddar ner</string>

-  <string id="32024">till</string>

-  <string id="32025">av</string>

-  <string id="32030">Info - Växla skärminformation</string>

-  <string id="32031">Snabbmeny - Ladda ner foton</string>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--Language file translated with Team XBMC Translator-->
+<!--Translator: blittan-->
+<!--Email: [email protected]>
+<!--Date of translation: 12/09/2009-->
+<!--$Revision$-->
+<strings>
+  <string id="32001">Bildnedladdning kan ta ett tag...</string>
+  <string id="32020">Ladda ner</string>
+  <string id="32021">Album</string>
+  <string id="32022">Bild</string>
+  <string id="32023">Laddar ner</string>
+  <string id="32024">till</string>
+  <string id="32025">av</string>
+  <string id="32031">Info - Växla skärminformation</string>
+  <string id="32032">Snabbmeny - Ladda ner foton</string>
 </strings>
\ No newline at end of file
diff --git a/script.image.bigpictures/resources/lib/gui.py 
b/script.image.bigpictures/resources/lib/gui.py
index b868fcd..c665e1d 100644
--- a/script.image.bigpictures/resources/lib/gui.py
+++ b/script.image.bigpictures/resources/lib/gui.py
@@ -1,9 +1,12 @@
-import tbp_scraper

-import xbmcgui

 import os

+

+import xbmcgui

 import imageDownloader

 import xbmcaddon

-from xbmc import sleep

+

+import tbp_scraper

+import sbb_scraper

+import wsj_scraper

 

 _id = os.path.basename(os.getcwd())

 Addon = xbmcaddon.Addon(_id)

@@ -12,28 +15,35 @@ getLS = Addon.getLocalizedString
 

 

 class GUI(xbmcgui.WindowXML):

-    #BASE URL(S)

-    BIGSHOTSHOME = 'http://www.boston.com/sports/blogs/bigshots/'

-    TBPHOME = 'http://www.boston.com/bigpicture/'

     #Label Controls

     CONTROL_MAIN_IMAGE = 100

-    CONTROL_USAGE_TEXT = 3

+    CONTROL_USAGE_TEXT = 103

     #Label Actions

     ACTION_CONTEXT_MENU = [117]

     ACTION_MENU = [122]

     ACTION_PREVIOUS_MENU = [9]

     ACTION_SHOW_INFO = [11]

     ACTION_EXIT_SCRIPT = [10, 13]

+    ACTION_DOWN = [4]

+    ACTION_UP = [3]

+

+    ACTIVESOURCE = 0

+    

+    SOURCES = list()

+    SOURCES.append({'name': 'Boston.com: The Big Picture', 'object': 'tbp', 
'url': 'http://www.boston.com/bigpicture/'})

+    SOURCES.append({'name': 'Boston.com: The Big Shot', 'object': 'tbp', 
'url': 'http://www.boston.com/sports/blogs/bigshots/'})

+    SOURCES.append({'name': 'Sacramento Bee: The Frame', 'object': 'sbb', 
'url': 'http://blogs.sacbee.com/photos/'})

+    SOURCES.append({'name': 'Wallstreetjournal: The Photo Journal', 'object': 
'wsj', 'url': 
'http://blogs.wsj.com/photojournal/category/pictures-of-the-week/'})

 

     def __init__(self, *args, **kwargs):

         xbmcgui.WindowXML.__init__(self, *args, **kwargs)

         self.tbp = tbp_scraper.TBP()

+        self.sbb = sbb_scraper.SBB()

+        self.wsj = wsj_scraper.WSJ()

 

     def onInit(self):

-        self.getControl(1).setLabel(getLS(32000))

-        self.getControl(2).setLabel(getLS(32001))

-        
self.getControl(self.CONTROL_USAGE_TEXT).setText('\n'.join([getLS(32030), 
getLS(32031)]))

-        self.showAlbums(self.TBPHOME)

+        self.getControl(102).setLabel(getLS(32001)) #fixme

+        self.showAlbums()

 

     def onFocus(self, controlId):

         pass

@@ -49,9 +59,21 @@ class GUI(xbmcgui.WindowXML):
                 self.close()

             # return to previous album

             elif self.getProperty('type') == 'photo':

-                self.showAlbums(self.TBPHOME)

+                self.showAlbums()

         elif action in self.ACTION_EXIT_SCRIPT:

             self.close()

+        elif action in self.ACTION_DOWN and self.getProperty('type') == 
'album':

+            if len(self.SOURCES) > self.ACTIVESOURCE + 1:

+                self.ACTIVESOURCE += 1

+            else:

+                self.ACTIVESOURCE = 0

+            self.showAlbums()

+        elif action in self.ACTION_UP and self.getProperty('type') == 'album':

+            if self.ACTIVESOURCE == 0:

+                self.ACTIVESOURCE = len(self.SOURCES) - 1

+            else:

+                self.ACTIVESOURCE -= 1

+            self.showAlbums()

 

     def onClick(self, controlId):

         if controlId == self.CONTROL_MAIN_IMAGE:

@@ -77,45 +99,75 @@ class GUI(xbmcgui.WindowXML):
 

     def download(self):

         #get writable directory

-        if self.getProperty('type') == 'photo':

-            downloadPath = xbmcgui.Dialog().browse(3, ' '.join([getLS(32020), 
getLS(32021)]), 'pictures')

-            if downloadPath:

-                photos = [{'pic':self.getProperty('pic')}] #url needs to be 
passed as a dict in a list.

+        downloadPath = xbmcgui.Dialog().browse(3, ' '.join([getLS(32020), 
getLS(32022)]), 'pictures')

+        if downloadPath:

+            if self.getProperty('type') == 'photo':

+                photos = [{'pic':self.getProperty('pic'), 'title': ''}] #url 
needs to be passed as a dict in a list.

                 imageDownloader.Download(photos, downloadPath) 

-        elif self.getProperty('type') == 'album':

-            downloadPath = xbmcgui.Dialog().browse(3, ' '.join([getLS(32020), 
getLS(32022)]), 'pictures')

-            if downloadPath:

+            elif self.getProperty('type') == 'album':

                 pDialog = xbmcgui.DialogProgress() #show useless dialog so 
user knows something is happening.

-                pDialog.create(getLS(32000))

+                pDialog.create(self.SOURCES[self.ACTIVESOURCE]['name'])

+                link = self.getProperty('link')

                 pDialog.update(50)

-                self.tbp.getPhotos(self.getProperty('link'))

+                if self.SOURCES[self.ACTIVESOURCE]['object'] == 'tbp':

+                    self.tbp.getPhotos(link) # Get a list of photos from the 
link.

+                    photos = self.tbp.photos

+                elif self.SOURCES[self.ACTIVESOURCE]['object'] == 'sbb':

+                    self.sbb.getPhotos(link)

+                    photos = self.sbb.photos

+                elif self.SOURCES[self.ACTIVESOURCE]['object'] == 'wsj':

+                    self.wsj.getPhotos(link)

+                    photos = self.wsj.photos

+                else:

+                    photos = {'title': '', 'pic': '', 'description': ''}

                 pDialog.update(100)

                 pDialog.close()

-                imageDownloader.Download(self.tbp.photos, downloadPath)

+                imageDownloader.Download(photos, downloadPath)

 

     def showPhotos(self): #the order is significant!

+        
self.getControl(self.CONTROL_USAGE_TEXT).setText('\n'.join([getLS(32030), 
getLS(32031), getLS(32032)]))

         link = self.getProperty('link')

         self.getControl(self.CONTROL_MAIN_IMAGE).reset() #Clear the old list 
of albums.

-        self.getControl(self.CONTROL_USAGE_TEXT).setVisible(False)

-        self.tbp.getPhotos(link) # Get a list of photos from the link.

-        self.showItems(self.tbp.photos, 'photo')

+        if self.SOURCES[self.ACTIVESOURCE]['object'] == 'tbp':

+            self.tbp.getPhotos(link) # Get a list of photos from the link.

+            photos = self.tbp.photos

+        elif self.SOURCES[self.ACTIVESOURCE]['object'] == 'sbb':

+            self.sbb.getPhotos(link)

+            photos = self.sbb.photos

+        elif self.SOURCES[self.ACTIVESOURCE]['object'] == 'wsj':

+            self.wsj.getPhotos(link)

+            photos = self.wsj.photos

+        else:

+            photos = [{'title': '', 'pic': '', 'description': ''}]

+        self.showItems(photos, 'photo')

 

-    def showAlbums(self, albumUrl):

+    def showAlbums(self):

+        
self.getControl(self.CONTROL_USAGE_TEXT).setText('\n'.join([getLS(32040), 
getLS(32041), getLS(32042)]))

         self.getControl(self.CONTROL_MAIN_IMAGE).reset() #This is necessary 
when returning from photos.

-        self.getControl(self.CONTROL_USAGE_TEXT).setVisible(True)

-        self.tbp.getAlbums(albumUrl)

-        self.showItems(self.tbp.albums, 'album')

+        if self.SOURCES[self.ACTIVESOURCE]['object'] == 'tbp':

+            self.tbp.getAlbums(self.SOURCES[self.ACTIVESOURCE]['url'])

+            albums = self.tbp.albums

+        elif self.SOURCES[self.ACTIVESOURCE]['object'] == 'sbb':

+            self.sbb.getAlbums(self.SOURCES[self.ACTIVESOURCE]['url'])

+            albums = self.sbb.albums

+        elif self.SOURCES[self.ACTIVESOURCE]['object'] == 'wsj':

+            self.wsj.getAlbums(self.SOURCES[self.ACTIVESOURCE]['url'])

+            albums = self.wsj.albums

+        else:

+            albums = [{'title': '', 'pic': '', 'description': '', 'link': ''}]

+        self.showItems(albums, 'album')

 

     def showItems(self, itemSet, type):

         total = len(itemSet)

         for i, item in enumerate(itemSet):

             item['showInfo'] = 'true'

-            item['type'] = type #TODO move this to scraper?

-            item['title'] = item['title'] + ' (%s/%s)' % (i+1, total)

+            item['type'] = type

+            item['title'] = self.SOURCES[self.ACTIVESOURCE]['name'] + '\n' + 
item['title'] + ' (%s/%s)' % (i+1, total)

             self.addListItem(self.CONTROL_MAIN_IMAGE, item)

 

     def addListItem(self, controlId, properties):

-        li = xbmcgui.ListItem(label=properties['title'].upper(), 
label2=properties['description'], iconImage=properties['pic'])

+        #print properties

+        li = xbmcgui.ListItem(label=properties['title'], 
label2=properties['description'], iconImage=properties['pic'])

         for p in properties.keys():

             li.setProperty(p, properties[p])

         self.getControl(controlId).addItem(li)

diff --git a/script.image.bigpictures/resources/lib/imageDownloader.py 
b/script.image.bigpictures/resources/lib/imageDownloader.py
index ed4ecf1..3be13ca 100644
--- a/script.image.bigpictures/resources/lib/imageDownloader.py
+++ b/script.image.bigpictures/resources/lib/imageDownloader.py
@@ -1,6 +1,7 @@
 import urllib

 import os

 import sys

+import re

 import xbmc

 import xbmcgui

 import xbmcaddon

@@ -17,22 +18,22 @@ class Download:
     def __init__(self, photos, downloadPath):

         self.len = str(len(photos))

         self.pDialog = xbmcgui.DialogProgress()

-        self.pDialog.create(getLS(32000))

+        self.pDialog.create('')

         downloadPath = xbmc.translatePath(downloadPath)

 

         for i, photo in enumerate(photos):

             self.url = photo['pic']

             self.index = str(i+1)

             #unicode causes problems here, convert to standard str

-            self.filename = str(self.url.split('/')[-1])

-            foldername = str(self.url.split('/')[-2])

+            self.filename = '_'.join([str(i), str(self.url.split('/')[-1])])

+            foldername = re.sub('[^\w\s-]', '', str(photo['title'])) # 
download folder should be named like the album

             self.fullDownloadPath = os.path.join(downloadPath, foldername, 
self.filename)

-            print '[SCRIPT][%s] %s : Attempting to download %s of %s' % 
(scriptName, __name__, i+1, len(photos))

+            #print '[SCRIPT][%s] %s : Attempting to download %s of %s' % 
(scriptName, __name__, i+1, len(photos))

             print '[SCRIPT][%s] %s --> %s\n' %  (scriptName, self.url, 
self.fullDownloadPath)

 

             if self.checkPath(downloadPath, foldername, self.filename):

                 try:

-                    re = urllib.urlretrieve(self.url, self.fullDownloadPath, 
reporthook = self.showdlProgress)

+                    dl = urllib.urlretrieve(self.url, self.fullDownloadPath, 
reporthook = self.showdlProgress)

                     print '[SCRIPT][%s] Download Success!' % (scriptName)

                 except IOError, e:

                     print e

diff --git a/script.image.bigpictures/resources/lib/tbp_scraper.py 
b/script.image.bigpictures/resources/lib/tbp_scraper.py
index e00a959..6be8e27 100644
--- a/script.image.bigpictures/resources/lib/tbp_scraper.py
+++ b/script.image.bigpictures/resources/lib/tbp_scraper.py
@@ -40,6 +40,7 @@ class TBP:
         s = re.sub('\s+', ' ', s) #remove extra spaces

         s = re.sub('<.+?>|Image:.+?\r|\r', '', s) #remove htmltags, image 
captions, & newlines

         s = s.replace('&#39;', '\'') #replace html-encoded double-quotes

+        s = re.sub('#$', '', s) #remove hash at the end

         s = s.strip()

         return s

 

@@ -76,5 +77,7 @@ class TBP:
         photoNodes = tree.findAll('div', {'class': 
re.compile('bpImageTop|bpBoth')})

         for node in photoNodes:

             pic = node.img['src']

-            description = self.cleanHTML(node.find('div', 'bpCaption'))

+            if node.find('div', 'photoNum'):

+                node.find('div', 'photoNum').replaceWith('')

+            description = self.cleanHTML(node.find('div', 
'bpCaption').contents)

             self.photos.append({'title': title, 'pic': pic, 'description': 
description})

diff --git a/script.image.bigpictures/resources/skins/default/720p/main.xml 
b/script.image.bigpictures/resources/skins/default/720p/main.xml
index 0bd9401..0a97b91 100644
--- a/script.image.bigpictures/resources/skins/default/720p/main.xml
+++ b/script.image.bigpictures/resources/skins/default/720p/main.xml
@@ -17,17 +17,17 @@
                 <height>66</height>
                 <texture>loader.gif</texture>
             </control>
-            <control type="label" id="1">
+            <control type="label" id="101">
                 <posx>20</posx>
                 <posy>35</posy>
                 <width>1200</width>
                 <height>100</height>
                 <align>left</align>
                 <aligny>top</aligny>
-                <label>32000</label>
+                <label></label>
                 <textcolor>FFAAAAAA</textcolor>
             </control>
-            <control type="label" id="2">
+            <control type="label" id="102">
                 <posx>20</posx>
                 <posy>60</posy>
                 <width>1200</width>
@@ -173,7 +173,7 @@
                     </control>
                 </focusedlayout>
             </control>
-            <control type="textbox" id="3">
+            <control type="textbox" id="103">
                 <!--usage instructions-->
                 <posx>20</posx>
                 <posy>10</posy>
diff --git a/script.image.bigpictures/runscript.py 
b/script.image.bigpictures/runscript.py
index 2d12b9a..d092a07 100644
--- a/script.image.bigpictures/runscript.py
+++ b/script.image.bigpictures/runscript.py
@@ -4,7 +4,7 @@ import sys
 # Script constants

 __scriptname__ = 'The Big Picture'

 __author__ = 'sphere, rwparris2'

-__version__ = '1.2.0'

+__version__ = '1.3.0'

 

 print '[SCRIPT][%s] version %s initialized!' % (__scriptname__, __version__)

 


-----------------------------------------------------------------------

Summary of changes:
 script.image.bigpictures/addon.xml                 |   10 +-
 script.image.bigpictures/changelog.txt             |   16 ++-
 script.image.bigpictures/icon.png                  |  Bin 39611 -> 37564 bytes
 .../resources/language/English/strings.xml         |   37 ++++---
 .../resources/language/German/strings.xml          |   39 ++++---
 .../resources/language/Swedish/strings.xml         |   33 +++---
 script.image.bigpictures/resources/lib/gui.py      |  116 ++++++++++++++------
 .../resources/lib/imageDownloader.py               |   11 +-
 .../lib/{tbp_scraper.py => sbb_scraper.py}         |   35 +++----
 .../resources/lib/tbp_scraper.py                   |    5 +-
 .../lib/{tbp_scraper.py => wsj_scraper.py}         |   44 +++----
 .../resources/skins/default/720p/main.xml          |    8 +-
 .../resources/skins/default/media/down.png         |  Bin 0 -> 2496 bytes
 .../resources/skins/default/media/up.png           |  Bin 0 -> 2453 bytes
 script.image.bigpictures/runscript.py              |    2 +-
 15 files changed, 207 insertions(+), 149 deletions(-)
 copy script.image.bigpictures/resources/lib/{tbp_scraper.py => sbb_scraper.py} 
(69%)
 copy script.image.bigpictures/resources/lib/{tbp_scraper.py => wsj_scraper.py} 
(63%)
 create mode 100644 
script.image.bigpictures/resources/skins/default/media/down.png
 create mode 100644 
script.image.bigpictures/resources/skins/default/media/up.png


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to