Author: bklaas
Date: Tue Feb 23 14:43:59 2010
New Revision: 8558
URL: http://svn.slimdevices.com/jive?rev=8558&view=rev
Log:
Fixed Bug: 14882
Description: Display time when touching blank screensaver
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua?rev=8558&r1=8557&r2=8558&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
Tue Feb 23 14:43:59 2010
@@ -26,7 +26,10 @@
local Timer = require("jive.ui.Timer")
local Surface = require("jive.ui.Surface")
local Icon = require("jive.ui.Icon")
+local Group = require("jive.ui.Group")
+local Label = require("jive.ui.Label")
local debug = require("jive.utils.debug")
+local datetime = require("jive.utils.datetime")
local System = require("jive.System")
local Applet = require("jive.Applet")
@@ -89,10 +92,27 @@
--called when an overlay window (such as the power on window) will be shown,
allows SS to do actoins at that time, such as turning on the brightess
function onOverlayWindowShown(self)
self:_setBrightness("on")
+
+ local time = datetime:getCurrentTime()
+
+ if time then
+ self.timeLabel = Group("text_block_black", {
+ text = Label("text", time)
+ })
+ self.window:addWidget(self.timeLabel)
+ else
+ self.timeLabel = nil
+ end
+
end
+
function onOverlayWindowHidden(self)
self:_setBrightness("off")
+ if self.timeLabel then
+ self.window:removeWidget(self.timeLabel)
+ self.timeLabel = nil
+ end
end
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=8558&r1=8557&r2=8558&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Tue Feb 23 14:43:59 2010
@@ -456,6 +456,10 @@
fg = c.SELECT_COLOR,
sh = c.SELECT_SH_COLOR,
},
+ }
+
+ s.text_block_black = {
+ hidden = 1,
}
s.menu = {
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua?rev=8558&r1=8557&r2=8558&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
Tue Feb 23 14:43:59 2010
@@ -585,6 +585,23 @@
fg = WHITE,
sh = NONE,
}
+ }
+
+
+ s.text_block_black = {
+ bgImg = Tile:fillColor(0x000000ff),
+ position = LAYOUT_NORTH,
+ h = 100,
+ order = { 'text' },
+ text = {
+ w = WH_FILL,
+ h = 100,
+ padding = { 10, 120, 10, 0 },
+ align = "center",
+ font = _font(100),
+ fg = WHITE,
+ sh = NONE,
+ },
}
s.menu = {
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=8558&r1=8557&r2=8558&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Tue Feb 23 14:43:59 2010
@@ -811,6 +811,22 @@
font = _boldfont(TITLE_FONT_SIZE),
fg = TEXT_COLOR,
}
+ }
+
+ s.text_block_black = {
+ bgImg = Tile:fillColor(0x000000ff),
+ position = LAYOUT_NORTH,
+ h = 100,
+ order = { 'text' },
+ text = {
+ w = WH_FILL,
+ h = 100,
+ padding = { 10, 160, 10, 0 },
+ align = "center",
+ font = _font(100),
+ fg = TEXT_COLOR,
+ sh = TEXT_SH_COLOR,
+ },
}
s.menu = {
@@ -1011,7 +1027,7 @@
s.help_text = {
w = screenWidth - 30,
- padding = { 18, 18, 10, 0},
+ padding = { 18, 18, 12, 0},
font = _font(HELP_FONT_SIZE),
lineHeight = 23,
fg = TEXT_COLOR,
@@ -2776,6 +2792,7 @@
zOrder = 1,
text = {
font = _boldfont(TITLE_FONT_SIZE),
+ bgImg = titlebarButtonBox,
},
rbutton = {
font = _font(14),
@@ -3038,6 +3055,7 @@
text = {
fg = { 0xB3, 0xB3, 0xB3 },
sh = { },
+ bgImg = pressedTitlebarButtonBox,
},
lbutton = {
bgImg = pressedTitlebarButtonBox,
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
