Author: bklaas
Date: Thu Jul 1 15:04:14 2010
New Revision: 8919
URL: http://svn.slimdevices.com/jive?rev=8919&view=rev
Log:
Bug: n/a
Description: remove "Welcome to squeezebox" window
add jump to demo listener to the first SetupNetworking window
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=8919&r1=8918&r2=8919&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Thu Jul 1 15:04:14 2010
@@ -158,37 +158,26 @@
end
-function step2(self)
+function step2(self, transition)
log:info("step2")
-
- -- welcome!
- self:setupWelcomeShow(
- function()
- self:step3()
- end)
-end
-
-
-function step3(self, transition)
- log:info("step3")
-- network connection type
appletManager:callService("setupNetworking",
function()
- self:step6(iface)
+ self:step3(iface)
end,
transition)
end
-function step6(self)
- log:info("step6")
+function step3(self)
+ log:info("step3")
-- automatically setup local player as selected player
for mac, player in appletManager:callService("iteratePlayers") do
if player:isLocal() then
appletManager:callService("setCurrentPlayer", player)
- return self:step7()
+ return self:step4()
end
end
@@ -196,12 +185,12 @@
log:error("no local player found?")
return appletManager:callService("setupShowSelectPlayer",
function()
- self:step7()
+ self:step4()
end, 'setuptitle')
end
-function step7(self)
- log:info("step7")
+function step4(self)
+ log:info("step4")
if UPGRADE_FROM_SCS_ENABLED then
appletManager:callService("waitForSqueezenetwork")
@@ -245,7 +234,7 @@
log:info("connecting ", player, " to ", squeezenetwork)
player:connectToServer(squeezenetwork)
- self:step7()
+ self:step4()
end
end
@@ -275,45 +264,6 @@
end
-function _jumpToDemo(self)
- appletManager:callService("jumpToInStoreDemo")
-end
-
-
-function setupWelcomeShow(self, setupNext)
- local window = Window("help_list", self:string("WELCOME"),
welcomeTitleStyle)
- window:setAllowScreensaver(false)
-
- window:setButtonAction("rbutton", nil)
-
- window:addActionListener('start_demo', self, _jumpToDemo)
- local textarea = Textarea("help_text",
self:string("WELCOME_WALKTHROUGH"))
-
- local continueButton = SimpleMenu("menu")
-
- continueButton:addItem({
- text = (self:string("CONTINUE")),
- sound = "WINDOWSHOW",
- callback = setupNext,
- weight = 1
- })
-
- continueButton:setHeaderWidget(textarea)
- window:addWidget(continueButton)
-
- self:tieAndShowWindow(window)
- return window
-end
-
-
---[[
-function init(self)
- log:info("subscribe")
- jnt:subscribe(self)
-end
---]]
-
-
function free(self)
appletManager:callService("setDateTimeDefaultFormats")
return not self.locked
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua?rev=8919&r1=8918&r2=8919&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Thu Jul 1 15:04:14 2010
@@ -134,6 +134,7 @@
-- start network setup flow
function setupNetworking(self, setupNext, transition)
self.mode = "setup"
+ self.addDemoListener = true
self.setupNext = setupNext
@@ -181,7 +182,9 @@
-- ask the user to choose
local window = Window("text_list",
self:string("NETWORK_CONNECTION_TYPE"), "setup")
window:setAllowScreensaver(false)
-
+ if self.addDemoListener then
+ window:addActionListener('start_demo', self, _jumpToDemo)
+ end
local connectionMenu = SimpleMenu("menu")
connectionMenu:addItem({
@@ -229,7 +232,10 @@
local window = Window("text_list", self:string("NETWORK_REGION"),
"setup")
window:setAllowScreensaver(false)
-
+ if self.addDemoListener then
+ window:addActionListener('start_demo', self, _jumpToDemo)
+ self.addDemoListener = nil
+ end
local region = wlan:getRegion()
local menu = SimpleMenu("menu")
@@ -1913,6 +1919,9 @@
end):addTask()
end
+function _jumpToDemo(self)
+ appletManager:callService("jumpToInStoreDemo")
+end
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
