Author: titmuss
Date: Wed Apr 16 03:59:10 2008
New Revision: 2240
URL: http://svn.slimdevices.com?rev=2240&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2239): titmuss | 2008-04-16 11:58:46 +0100
[EMAIL PROTECTED] (orig r2237): bklaas | 2008-04-16 04:06:56 +0100
Bug: 5465
Description: This is a partial fix that will be a decent improvement for 7.0.1
Needs revisiting, particularly with:
how LAYOUT_SOUTH orients things on the screen
how adding a textarea can cause unwanted behaviors from other widgets on the
window
using Group or some equivalent for grouping vertically
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Apr 16 03:59:10 2008
@@ -1,5 +1,5 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2231
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2232
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2237
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2239
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2240&root=Jive&r1=2239&r2=2240&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Wed Apr 16 03:59:10 2008
@@ -1185,6 +1185,15 @@
s.popupplay.scrollbar = {}
s.popupplay.scrollbar.w = 0
+ s.lockedHelp = {}
+ s.lockedHelp.padding = { 12, 0, 12, 12 }
+ s.lockedHelp.fg = TEXT_COLOR
+ s.lockedHelp.font = FONT_BOLD_15px
+ s.lockedHelp.align = "center"
+ s.lockedHelp.position = LAYOUT_NORTH
+ s.lockedHelp.w = screenWidth - 20
+ s.lockedHelp.x = 20
+ s.lockedHelp.y = 0
s.popupplay.text = {}
s.popupplay.text.w = screenWidth
Modified:
7.2/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua?rev=2240&root=Jive&r1=2239&r2=2240&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
Wed Apr 16 03:59:10 2008
@@ -33,6 +33,7 @@
local Icon = require("jive.ui.Icon")
local Label = require("jive.ui.Label")
local Popup = require("jive.ui.Popup")
+local Group = require("jive.ui.Group")
local RadioButton = require("jive.ui.RadioButton")
local RadioGroup = require("jive.ui.RadioGroup")
local SimpleMenu = require("jive.ui.SimpleMenu")
@@ -145,6 +146,12 @@
callback = function(event, menuItem)
self:textWindow(menuItem,
"applets/Test/test.txt")
end },
+ { text = 'Locked Screen Popup',
+ sound = "WINDOWSHOW",
+ callback = function(event, menuItem)
+ self:lockedScreen(menuItem)
+ end
+ },
{ text = "Connecting Popup",
sound = "WINDOWSHOW",
callback = function(event, menuItem)
@@ -196,7 +203,7 @@
end },
})
- local window = Window("window", "This") -- is a really long title to
test the bounding box")
+ local window = Window("window", "Test") -- is a really long title to
test the bounding box")
window:addWidget(menu)
self:tieAndShowWindow(window)
@@ -428,6 +435,25 @@
return window
end
+
+function lockedScreen(self, menuItem)
+ local popup = Popup("popupIcon")
+
+ popup:setAllowScreensaver(false)
+ popup:setAlwaysOnTop(true)
+ popup:setAutoHide(false)
+
+ popup:addWidget(Icon("iconLocked"))
+ popup:addWidget(Label("text", "Locked"))
+ popup:addWidget(Textarea("lockedHelp", 'To unlock press the ADD and
PLAY buttons at the same time.'))
+
+ popup:addTimer(10000, function()
+ popup:hide()
+ end)
+
+ self:tieAndShowWindow(popup)
+ return popup
+end
function connectingPopup(self, menuItem)
Modified:
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2240&root=Jive&r1=2239&r2=2240&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Wed Apr 16 03:59:10 2008
@@ -683,7 +683,7 @@
-- FIXME change icon and text
popup:addWidget(Icon("iconLocked"))
popup:addWidget(Label("text", self:string("BSP_SCREEN_LOCKED")))
- popup:addWidget(Textarea("help", self:string("BSP_SCREEN_LOCKED_HELP")))
+ popup:addWidget(Textarea("lockedHelp",
self:string("BSP_SCREEN_LOCKED_HELP")))
popup:show()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
