Author: fmueller
Date: Fri Mar 30 05:43:47 2012
New Revision: 9699
URL: http://svn.slimdevices.com/jive?rev=9699&view=rev
Log:
Bug: n/a
Description: Setup changes
- Remove welcome screen
- This also removes the hidden demo start which is now in the language
selection step
Modified:
7.8/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Modified:
7.8/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9699&r1=9698&r2=9699&view=diff
==============================================================================
---
7.8/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.8/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Fri Mar 30 05:43:47 2012
@@ -158,19 +158,8 @@
-- choose language
appletManager:callService("setupShowSetupLanguage",
function()
- self:step2()
+ self:step3()
end, false)
-end
-
-
-function step2(self)
- log:info("step2")
-
- -- welcome!
- self:setupWelcomeShow(
- function()
- self:step3()
- end)
end
@@ -558,36 +547,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")
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
