Author: bklaas
Date: Fri Apr 11 14:28:05 2008
New Revision: 2222
URL: http://svn.slimdevices.com?rev=2222&root=Jive&view=rev
Log:
Bug: 6907
Description: when no artwork is present in showBriefly, use textarea to wrap
text message.
Adjust DefaultSkin to handle textarea in popupplay style
Modified:
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.0/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.0/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2222&root=Jive&r1=2221&r2=2222&view=diff
==============================================================================
---
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Fri Apr 11 14:28:05 2008
@@ -1188,6 +1188,15 @@
s.popupplay.text.fg = TEXT_COLOR
s.popupplay.text.align = "top-left"
+ -- for textarea properties in popupplay
+ s.popupplay.padding = 12
+ s.popupplay.h = 72
+ s.popupplay.fg = TEXT_COLOR
+ s.popupplay.font = FONT_15px
+ s.popupplay.align = "top-left"
+ s.popupplay.scrollbar = {}
+ s.popupplay.scrollbar.w = 0
+
-- Popup window for information display
s.popupinfo = {}
s.popupinfo.x = 0
Modified: 7.0/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.0/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2222&root=Jive&r1=2221&r2=2222&view=diff
==============================================================================
--- 7.0/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.0/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Fri Apr 11
14:28:05 2008
@@ -47,6 +47,7 @@
local Popup = require("jive.ui.Popup")
local Icon = require("jive.ui.Icon")
local Label = require("jive.ui.Label")
+local Textarea = require("jive.ui.Textarea")
local Window = require("jive.ui.Window")
local Group = require("jive.ui.Group")
@@ -778,8 +779,10 @@
local type = display["type"] or 'text'
local s = self.currentSong
+ local showMe
if type == 'song' then
+ showMe = s.window
-- new song display from server
s.text:setValue(table.concat(display["text"], "\n"))
s.artIcon:setStyle("icon")
@@ -789,11 +792,13 @@
self.slimServer:fetchArtworkThumb(display["icon-id"], s.artIcon, 56, 'png')
end
else
- s.text:setValue(table.concat(display["text"], "\n"))
- s.artIcon:setStyle("noimage")
- s.artIcon:setValue(nil)
+ local textarea = Textarea('popupplay',
table.concat(display['text'], ' '))
+ showMe = Popup("currentsong")
+ showMe:addWidget(textarea)
+ showMe:setAllowScreensaver(true)
+ showMe:setAlwaysOnTop(true)
end
- s.window:showBriefly(3000, nil, Window.transitionPushPopupUp,
Window.transitionPushPopupDown)
+ showMe:showBriefly(3000, nil, Window.transitionPushPopupUp,
Window.transitionPushPopupDown)
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
