[Jive-Checkins] r3220 - in /7.3/trunk/squeezeplay/src: squeezeplay/share/applets/SelectSkin/SelectSkinMeta.lua squeezeplay/share/jive/JiveMain.lua squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua

[tom]

Author: tom
Date: Mon Oct 27 09:21:08 2008
New Revision: 3220

URL: http://svn.slimdevices.com?rev=3220&root=Jive&view=rev
Log:
Bug 9627:
Description: 
Desktop now defaults to fullscreen skin

Modified:
    
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinMeta.lua
    7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
    
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua

Modified: 
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinMeta.lua
URL: 
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinMeta.lua?rev=3220&root=Jive&r1=3219&r2=3220&view=diff
==============================================================================
--- 
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinMeta.lua
 (original)
+++ 
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinMeta.lua
 Mon Oct 27 09:21:08 2008
@@ -36,9 +36,7 @@
 
 
 function defaultSettings(meta)
-       return { 
-               skin = "DefaultSkin",
-       }
+       return {}
 end
 
 
@@ -48,6 +46,10 @@
 
 
 function configureApplet(meta)
+       if (not meta:getSettings().skin) then
+               meta:getSettings().skin = jiveMain:getDefaultSkin()
+       end
+
        local skin = meta:getSettings().skin
        jiveMain:setSelectedSkin(skin)
 

Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL: 
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=3220&root=Jive&r1=3219&r2=3220&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Mon Oct 27 
09:21:08 2008
@@ -119,6 +119,8 @@
        ["\27"]  = KEY_BACK -- ESC
 }
 
+local _defaultSkin
+
 -- bring us to the home menu
 local function _homeHandler(event)
        local type = event:getType()
@@ -361,7 +363,7 @@
 
 function JiveMain:getSkinParam(key)
 
-       local skinName = self.selectedSkin or "DefaultSkin"
+       local skinName = self.selectedSkin or JiveMain:getDefaultSkin()
        
        if key and self.skinParams and self.skinParams[skinName] and 
self.skinParams[skinName][key] then
                return self.skinParams[skinName][key]
@@ -402,6 +404,14 @@
        obj[method](obj, jive.ui.style)
 end
 
+function JiveMain:setDefaultSkin(appletName)
+       log:debug("setDefaultSkin(", appletName, ")")
+       _defaultSkin = appletName
+end
+
+function JiveMain:getDefaultSkin()
+       return _defaultSkin or "DefaultSkin"
+end
 
 -----------------------------------------------------------------------------
 -- main()

Modified: 
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
URL: 
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua?rev=3220&root=Jive&r1=3219&r2=3220&view=diff
==============================================================================
--- 
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
 (original)
+++ 
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
 Mon Oct 27 09:21:08 2008
@@ -89,6 +89,8 @@
 
        -- set uuid
        jnt:setUUID(settings.uuid, settings.mac)
+       
+       jiveMain:setDefaultSkin("FullscreenSkin")
 end
 
 

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins