Author: bklaas
Date: Wed Oct 8 19:36:00 2008
New Revision: 3084
URL: http://svn.slimdevices.com?rev=3084&root=Jive&view=rev
Log:
Bug: n/a
Description: an end to the hard-coded values for THUMB_SIZE and NowPlaying
artwork
skins now setup constants when registering themselves that can be accessed by
other applets via JiveMain when requesting artwork
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinMeta.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinMeta.lua?rev=3084&root=Jive&r1=3083&r2=3084&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinMeta.lua
Wed Oct 8 19:36:00 2008
@@ -35,9 +35,14 @@
function registerApplet(self)
-- load ourselves indirectly through jiveMain
- jiveMain:registerSkin(self:string("CONTROLLER_SKIN"), "DefaultSkin",
"skin")
+ local params = {
+ THUMB_SIZE = 56,
+ nowPlayingBrowseArtworkSize = 154,
+ nowPlayingSSArtworkSize = 186,
+ }
+ jiveMain:registerSkin(self:string("CONTROLLER_SKIN"), "DefaultSkin",
"skin", params)
+
end
-
--[[
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=3084&root=Jive&r1=3083&r2=3084&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Wed Oct 8 19:36:00 2008
@@ -43,15 +43,6 @@
module(..., Framework.constants)
oo.class(_M, Applet)
-
--- FIXME: Bug 8479. workaround: this is hardcoded for now
-local ARTWORK_SIZE = 154
-
---[[ alternative skins
-local ARTWORK_SIZE = 190
-local ARTWORK_SIZE = 350
---]]
-
local showProgressBar = true
local modeTokens = {
off = "SCREENSAVER_OFF",
@@ -99,12 +90,9 @@
local server = self.player:getSlimServer()
if windowStyle == 'ss' then
- -- without drop shadow
- ARTWORK_SIZE = 186
- -- with drop shadow
- --ARTWORK_SIZE = 172
+ ARTWORK_SIZE = jiveMain:getSkinParam("nowPlayingSSArtworkSize")
else
- ARTWORK_SIZE = 154
+ ARTWORK_SIZE =
jiveMain:getSkinParam("nowPlayingBrowseArtworkSize")
end
if item and item["icon-id"] then
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3084&root=Jive&r1=3083&r2=3084&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Oct 8 19:36:00 2008
@@ -74,9 +74,6 @@
-- number of volume steps
local VOLUME_STEPS = 20
--- defaults for thumbnail images
-local THUMB_SIZE = 56
-
--==============================================================================
-- Local variables (globals)
--==============================================================================
@@ -221,6 +218,9 @@
local function _artworkItem(item, group, menuAccel)
local icon = group and group:getWidget("icon")
local iconSize
+
+ local THUMB_SIZE = jiveMain:getSkinParam("THUMB_SIZE")
+
if icon then
iconSize = icon:getSize()
if not iconSize or iconSize == 0 then
@@ -949,7 +949,7 @@
if data.window['icon-id'] then
-- Fetch an image from
SlimServer
titleIcon = Icon("icon")
-
_server:fetchArtworkThumb(data.window["icon-id"], titleIcon, THUMB_SIZE)
+
_server:fetchArtworkThumb(data.window["icon-id"], titleIcon,
jiveMain:getSkinParam("THUMB_SIZE"))
-- only allow the existing icon to stay
if titleStyle isn't being changed
elseif not data.window.titleStyle and
titleWidget:getWidget('icon') then
titleIcon =
titleWidget:getWidget('icon')
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=3084&root=Jive&r1=3083&r2=3084&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Wed Oct 8
19:36:00 2008
@@ -256,10 +256,15 @@
end
-function JiveMain:registerSkin(name, appletName, method)
+function JiveMain:registerSkin(name, appletName, method, params)
log:debug("registerSkin(", name, ",", appletName, ")")
-
self.skins[appletName] = { name, method }
+ local defaultParams = {
+ THUMB_SIZE = 56,
+ }
+ local params = params or defaultParams
+ JiveMain:setSkinParams(appletName, params)
+
end
@@ -302,9 +307,34 @@
function JiveMain:setSelectedSkin(appletName, reload)
+ log:warn(appletName)
if _loadSkin(self, appletName, false) then
- self.selectedSkin = appletName
- end
+ self.selectedSkin = appletName
+ end
+end
+
+function JiveMain:getSkinParam(key)
+
+ local skinName = self.selectedSkin or "DefaultSkin"
+
+ if key and self.skinParams and self.skinParams[skinName] and
self.skinParams[skinName][key] then
+ return self.skinParams[skinName][key]
+ else
+ log:error('no value for skinParam ', key, ' found')
+ return nil
+ end
+
+end
+
+-- service method to allow other applets to set skin-specific settings like
THUMB_SIZE
+function JiveMain:setSkinParams(skinName, settings)
+
+ _assert(type(settings) == 'table')
+ if not self.skinParams then
+ self.skinParams = {}
+ end
+ self.skinParams[skinName] = settings
+
end
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3084&root=Jive&r1=3083&r2=3084&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed Oct 8
19:36:00 2008
@@ -62,6 +62,7 @@
local EVENT_CONSUME = jive.ui.EVENT_CONSUME
local jnt = jnt
+local jiveMain = jiveMain
local iconbar = iconbar
@@ -906,9 +907,9 @@
s.text:setValue(textValue)
s.artIcon:setStyle("icon")
if display['icon'] then
-
self.slimServer:fetchArtworkURL(display['icon'], s.artIcon, 56)
+
self.slimServer:fetchArtworkURL(display['icon'], s.artIcon,
jiveMain:getSkinParam('THUMB_SIZE'))
else
-
self.slimServer:fetchArtworkThumb(display["icon-id"], s.artIcon, 56, 'png')
+
self.slimServer:fetchArtworkThumb(display["icon-id"], s.artIcon,
jiveMain:getSkinParam('THUMB_SIZE'), 'png')
end
else
s.text:setValue('')
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=3084&root=Jive&r1=3083&r2=3084&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Wed Oct 8 19:36:00 2008
@@ -938,7 +938,7 @@
s.albumitem.icon.h = WH_FILL
s.albumitem.icon.align = "left"
--FIXME, this path likely needs changing
- --s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork_125.png")
+ s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork_125.png")
s.albumitem.icon.padding = 0
-- checked albummenu item
@@ -959,7 +959,7 @@
s.transporter = _uses(s.chooseplayer, {
icon = {
img = Surface:loadImage(imgpath ..
"Icons/Players/transporter.png"),
- w = 56,
+ w = 125,
}
})
s.transporterchecked = _uses(s.transporter, {
@@ -985,7 +985,7 @@
s.boom = _uses(s.chooseplayer, {
icon = {
img = Surface:loadImage(imgpath ..
"Icons/Players/boom.png"),
- w = 56,
+ w = 125,
}
})
s.boomchecked = _uses(s.boom, {
@@ -1238,7 +1238,7 @@
--FIXME, need a resized icon_connecting.png image for
the correct albumitem thumb size
img = Surface:loadImage(imgpath ..
"icon_connecting.png"),
frameRate = 4,
- frameWidth = 120
+ frameWidth = 125
}
})
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinMeta.lua?rev=3084&root=Jive&r1=3083&r2=3084&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinMeta.lua
Wed Oct 8 19:36:00 2008
@@ -34,9 +34,13 @@
function registerApplet(self)
- jiveMain:registerSkin(self:string("DESKTOP_SKIN"), 'FullscreenSkin',
'skin')
+ local params = {
+ THUMB_SIZE = 125,
+ nowPlayingBrowseArtworkSize = 350,
+ nowPlayingSSArtworkSize = 350,
+ }
+ jiveMain:registerSkin(self:string("DESKTOP_SKIN"), 'FullscreenSkin',
'skin', params)
end
-
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
