Author: richard
Date: Tue Jan 27 03:08:06 2009
New Revision: 3953
URL: http://svn.slimdevices.com?rev=3953&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3950): richard | 2009-01-27 10:07:20 +0000
Bug: N/A
Description:
Add the JIVE_VERSION information to the syslog when SqueezePlay starts.
r3...@harrypotter (orig r3951): richard | 2009-01-27 10:07:52 +0000
Bug: 10806
Description:
Fix scroll event handling for the NetTest applet.
r3...@harrypotter (orig r3952): richard | 2009-01-27 10:37:00 +0000
Bug: 10792
Description:
Fix keypad factory test. Added bonus, the help screen disappears when you
start using it.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 27 03:08:06 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3856
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3952
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.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua?rev=3953&root=Jive&r1=3952&r2=3953&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
Tue Jan 27 03:08:06 2009
@@ -114,6 +114,7 @@
self.window:setAllowScreensaver(false)
+ self.window:focusWidget(nil)
self.window:addListener(EVENT_SCROLL | EVENT_KEY_PRESS,
function(event)
return _event_handler(self, event)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=3953&root=Jive&r1=3952&r2=3953&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Tue Jan 27
03:08:06 2009
@@ -90,6 +90,8 @@
local KEY_VOLUME_UP = jive.ui.KEY_VOLUME_UP
local KEY_VOLUME_DOWN = jive.ui.KEY_VOLUME_DOWN
local KEY_ADD = jive.ui.KEY_ADD
+
+local JIVE_VERSION = jive.JIVE_VERSION
-- Classes
local JiveMain = oo.class({}, HomeMenu)
@@ -232,7 +234,7 @@
-- __init
-- creates our JiveMain main object
function JiveMain:__init()
- log:debug("__init()")
+ log:info("SqueezePlay version ", JIVE_VERSION)
-- Seed the rng
local initTime = os.time()
@@ -241,7 +243,7 @@
-- Initialise UI
Framework:init()
- _addUserPathToLuaPath()
+ _addUserPathToLuaPath()
-- Singleton instances (globals)
jnt = NetworkThread()
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadApplet.lua?rev=3953&root=Jive&r1=3952&r2=3953&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadApplet.lua
Tue Jan 27 03:08:06 2009
@@ -79,13 +79,20 @@
self.background:blit(srf, 0, 0)
self.icon:setValue(srf)
+ local started = false
+
for i,k in ipairs(keymap) do
local state = keyState[k.key]
if state ~= nil then
+ started = true
srf:filledCircle(k.x, k.y, 10, stateToColor[state])
else
srf:circle(k.x, k.y, 10, 0x00FF00FF)
end
+ end
+
+ if started then
+ self.window:removeWidget(self.help)
end
return EVENT_CONSUME
@@ -131,10 +138,13 @@
self.icon = Icon("icon")
window:addWidget(self.icon)
- window:addWidget(Textarea("help", self:string("TEST_KEYPAD_HELP")))
+
+ self.help = Textarea("help", self:string("TEST_KEYPAD_HELP"))
+ window:addWidget(self.help)
self:drawKeypad()
+ self.window:focusWidget(nil)
window:addListener(EVENT_KEY_ALL | EVENT_SCROLL,
function(event)
local eventtype = event:getType()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
