Author: titmuss
Date: Fri Mar 14 05:28:59 2008
New Revision: 2116
URL: http://svn.slimdevices.com?rev=2116&root=Jive&view=rev
Log:
Bug: 7419
Description:
Added new style for error windows (to be reviewed).
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2116&root=Jive&r1=2115&r2=2116&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Fri Mar 14 05:28:59 2008
@@ -619,6 +619,10 @@
s.window.w = screenWidth
s.window.h = screenHeight
+ s.errorWindow = {}
+ s.errorWindow.w = screenWidth
+ s.errorWindow.h = screenHeight
+ s.errorWindow.maskImg = popupMask
-- Popup window with Icon, no borders
s.popupArt = {}
Modified:
trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua?rev=2116&root=Jive&r1=2115&r2=2116&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
(original)
+++ trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
Fri Mar 14 05:28:59 2008
@@ -150,6 +150,11 @@
callback = function(event, menuItem)
self:connectingPopup(menuItem)
end },
+ { text = "Error",
+ sound = "WINDOWSHOW",
+ callback = function(event, menuItem)
+ self:errorWindow(menuItem)
+ end },
{ text = "Slider",
sound = "WINDOWSHOW",
callback = function(event, menuItem)
@@ -291,6 +296,39 @@
window:addWidget(help)
window:addWidget(slider)
+
+ self:tieAndShowWindow(window)
+ return window
+end
+
+
+function errorWindow(self)
+ local window = Popup("errorWindow", "Error Message")
+ window:setAllowScreensaver(false)
+
+ local textarea = Textarea("textarea", "A description of the error. This
may be several lines long.")
+
+ local menu = SimpleMenu("menu",
+ {
+ {
+ text = "Go back",
+ sound = "WINDOWHIDE",
+ callback = function()
+ window:hide()
+ end
+ },
+ {
+ text = "Corrective action",
+ sound = "WINDOWHIDE",
+ callback = function()
+ window:hide()
+ end
+ },
+ })
+
+
+ window:addWidget(textarea)
+ window:addWidget(menu)
self:tieAndShowWindow(window)
return window
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
