The branch, gotham has been updated
via a8dccbd7f1dc56e06d510fa7de704c789585362d (commit)
from 9acccecd50e0480f6db97d29fe005ca6f2696815 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a8dccbd7f1dc56e06d510fa7de704c789585362d
commit a8dccbd7f1dc56e06d510fa7de704c789585362d
Author: Martijn Kaijser <[email protected]>
Date: Thu May 22 10:16:07 2014 +0200
[script.skinshortcuts] 0.3.1
diff --git a/script.skinshortcuts/README.txt b/script.skinshortcuts/README.txt
index a209922..5803c09 100644
--- a/script.skinshortcuts/README.txt
+++ b/script.skinshortcuts/README.txt
@@ -1,19 +1,14 @@
script.skinshortcuts was written with the intention of making user
customizable shortcuts on the home page easier for skinners.
-What's New for Skinners (version 0.3.0)
------------------------
-
- - (Includes method) Menu items now only have the "hasSubmenu" property if
there is a submenu
- - Test of an alternative includes method for including whole menu in a single
list, see "Alternative Listings Method" in Advanced Usage.txt
- - Numerous management dialog changes - see resources/Management Dialog.txt
for full details - including
- > Advice change - skins should now provide labels for all controls
- > Labels 311 and 312 (background and widget name) replaced with
listitem properties
- - Management dialog will now list skin-provided playlists - this affects
defaults, see "Providing Default Shortcuts" below
- - Management dialog can now list skin-recommended shortcuts - see
"Skin-Recommended Shortcuts" in Advanced Usage.txt
- - If you prefer to manage menus yourself, the script can now be used to
select a shortcut, then pass this to the skin to manage - see "Just select
shortcuts" in Advanced Usage.txt
-
-Note: The code to manage additional properties including backgrounds and
widgets has been re-written in this revision. The new method is not backwards
compatible, so any backgrounds/widgets/additional properties will need to be
re-set.
+REPO-FIXES BRANCH (version 0.3.1)
+-----------------
+
+This branch contains fixes for issues discovered in the current XBMC
repository version (version 0.3.0).
+
+ - Fix for no favourites showing up in management dialog. (Caused by script
failing to assign thumbnial)
+ - Fix for script crash in new skin-managed shortcuts on empty grouping.
(Caused by failing to check for empty grouping)
+ - Fix for disappearing Eject Tray shortcut. (Caused by visibility check)
Where To Get Help
diff --git a/script.skinshortcuts/addon.xml b/script.skinshortcuts/addon.xml
index 6be091c..0dedd88 100644
--- a/script.skinshortcuts/addon.xml
+++ b/script.skinshortcuts/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.skinshortcuts" name="Skin Shortcuts" version="0.3.0"
provider-name="Unfledged">
+<addon id="script.skinshortcuts" name="Skin Shortcuts" version="0.3.1"
provider-name="Unfledged">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
<import addon="script.module.simplejson" version="3.3.0"/>
diff --git a/script.skinshortcuts/changelog.txt
b/script.skinshortcuts/changelog.txt
index 765cb42..09c66bc 100644
--- a/script.skinshortcuts/changelog.txt
+++ b/script.skinshortcuts/changelog.txt
@@ -1,3 +1,8 @@
+v0.3.1 - RepoFixes Branch
+- Fix for script not correctly providing thumbnails for favourites
+- Fix for script error on empty grouping with skin-managed selection dialog
+- Remove visibility condition for EjectTray shortcut
+
v0.3.0
- Fix escaping of main menu items (includes method)
- Fix for custom nodes when using profiles
diff --git a/script.skinshortcuts/resources/Management Dialog.txt
b/script.skinshortcuts/resources/Management Dialog.txt
index c781889..734a0c0 100644
--- a/script.skinshortcuts/resources/Management Dialog.txt
+++ b/script.skinshortcuts/resources/Management Dialog.txt
@@ -34,7 +34,7 @@ It is recommended you set the label for all of these
controls, however if no lab
Most of these controls are optional (though it is recommended to include
them), but you MUST include control 211. Controls 101, 102, 103 and 111 all
rely on the others being present.
-3. Using label2 on buttons to provide more information
+2. Using label2 on buttons to provide more information
You can set the label2 value of buttons to provide details of current selected
- for example, the current label or action of the user selected shortcut.
@@ -43,7 +43,7 @@ User-selected shortcuts have the same properties they will
have when displayed i
NOTE: You MUST provide a label (even one set to a script-provided string) for
label2's to operate.
-2. Alternative method to set a shortcut
+3. Alternative method to set a shortcut
Rather than using list 111 to let the user select a shortcut, you can include
button 401. When clicked it will show the user, via the standard Select dialog,
first a list of the available categories of shortcuts, then the shortcuts
within that category.
@@ -56,10 +56,10 @@ You can also use the button to go straight to the list of
shortcuts for a catego
favourites (Users favourites)
addons (Programs, video add-ons, music add-ons, picture
add-ons)
-Note, you must still include all controls in the 100 range in your xml file.
However, they do not have to be visible to the user. After a click to 401 has
been registered, the window property "category" will be cleared.
+After a click to 401 has been registered, the window property "category" will
be cleared.
-3. Set a custom property
+4. Set a custom property
If you want to attach a custom property to a menu item, you can include button
404.
@@ -73,7 +73,7 @@ Then send a click to control 404. The two properties will be
cleared afterwards.
You can set defaults for your custom property in your overrides.xml file. See
resources/Advanced Usage.txt - "Overrides.xml".
-4. Launch management dialog for submenu / additional menus
+5. Launch management dialog for submenu / additional menus
You can give the users a way to launch the management dialog for the submenu
or an additional menu from the management dialog.
@@ -84,6 +84,6 @@ To launch the management dialog for an additional sub menu,
first set the window
You will likely only want to include this when editing the main menu. You can
check the window property "groupname" for the value "mainmenu" to only display
it when relevant.
-5. Limit controls to main menu only
+6. Limit controls to main menu only
You may wish to only show some of these controls when the user is editing the
main menu only, not a submenu. To do this, check the window property
"groupname" for the value "mainmenu".
diff --git a/script.skinshortcuts/resources/lib/datafunctions.py
b/script.skinshortcuts/resources/lib/datafunctions.py
index c5e29de..e4f68f3 100644
--- a/script.skinshortcuts/resources/lib/datafunctions.py
+++ b/script.skinshortcuts/resources/lib/datafunctions.py
@@ -416,7 +416,7 @@ class DataFunctions():
return "Library.HasContent(MusicVideos)"
if action.startswith( "ActivateWindow(MusicLibrary," ):
return "Library.HasContent(Music)"
- if action == "XBMC.PlayDVD()" or action == "EjectTray()":
+ if action == "XBMC.PlayDVD()":
return "System.HasMediaDVD"
return ""
diff --git a/script.skinshortcuts/resources/lib/library.py
b/script.skinshortcuts/resources/lib/library.py
index 9031cf1..b3672e2 100755
--- a/script.skinshortcuts/resources/lib/library.py
+++ b/script.skinshortcuts/resources/lib/library.py
@@ -602,7 +602,7 @@ class LibraryFunctions():
listing = doc.documentElement.getElementsByTagName(
'favourite' )
else:
self.arrayFavourites = listitems
- return
+ return self.arrayFavourites
for count, favourite in enumerate(listing):
name = favourite.attributes[ 'name' ].nodeValue
@@ -610,12 +610,12 @@ class LibraryFunctions():
if ('RunScript' not in path) and ('StartAndroidActivity' not
in path) and not (path.endswith(',return)') ):
path = path.rstrip(')')
path = path + ',return)'
- else:
- try:
- thumb = favourite.attributes[ 'thumb' ].nodeValue
- except:
- thumb = "DefaultFolder.png"
-
+
+ try:
+ thumb = favourite.attributes[ 'thumb' ].nodeValue
+ except:
+ thumb = "DefaultFolder.png"
+
listitem = xbmcgui.ListItem(label=name,
label2=__language__(32006), iconImage="DefaultShortcut.png",
thumbnailImage=thumb)
listitem.setProperty( "path", urllib.quote( path.encode(
'utf-8' ) ) )
listitem.setProperty( "thumbnail", thumb )
@@ -781,6 +781,13 @@ class LibraryFunctions():
else: # No category selected
log( "No shortcut category selected" )
return
+
+ # Check that something has been returned
+ if len( availableShortcuts ) == 0:
+ log( "No available shortcuts found" )
+ xbmcgui.Dialog().ok( "No Shortcuts", "There are no available
shortcuts to choose from in the group you selected." )
+ return
+
# Now build an array of items to show to the user
displayShortcuts = []
-----------------------------------------------------------------------
Summary of changes:
script.skinshortcuts/README.txt | 19 ++++++-----------
script.skinshortcuts/addon.xml | 2 +-
script.skinshortcuts/changelog.txt | 5 ++++
.../resources/Management Dialog.txt | 12 +++++-----
.../resources/lib/datafunctions.py | 2 +-
script.skinshortcuts/resources/lib/library.py | 21 +++++++++++++------
6 files changed, 34 insertions(+), 27 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
