Author: bklaas
Date: Tue Nov 4 14:44:37 2008
New Revision: 3278
URL: http://svn.slimdevices.com?rev=3278&root=Jive&view=rev
Log:
Bug: 9821
Description: allow optional windowStyle param to be sent to setup windows for
setupLanguage and setupWelcome
add setuptitle style to FullscreenSkin (not necessary for default skin, as
squeezeplay_jive's SetupWelcome will not use setuptitle as a style)
use setuptitle style in local setupWelcome windows
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=3278&root=Jive&r1=3277&r2=3278&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Tue Nov 4 14:44:37 2008
@@ -289,9 +289,13 @@
end
-function setupShowSelectPlayer(self, setupNext)
+function setupShowSelectPlayer(self, setupNext, windowStyle)
+
+ if not windowStyle then
+ windowStyle = 'settingstitle'
+ end
-- get list of slimservers
- local window = Window("window", self:string("SELECT_PLAYER"),
'settingstitle')
+ local window = Window("window", self:string("SELECT_PLAYER"),
windowStyle)
window:setAllowScreensaver(false)
local menu = SimpleMenu("albummenu")
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua?rev=3278&root=Jive&r1=3277&r2=3278&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
Tue Nov 4 14:44:37 2008
@@ -46,16 +46,20 @@
oo.class(_M, Applet)
-function setupShowSetupLanguage(self, setupNext)
+function setupShowSetupLanguage(self, setupNext, windowStyle)
local currentLocale = locale:getLocale()
log:info("locale currently is ", currentLocale)
+
+ if not windowStyle then
+ windowStyle = 'settingstitle'
+ end
-- this uses private data/methods from Applet and locale. don't do this
elsewhere,
-- but it's needed for speed here
self.allStrings = locale:loadAllStrings(self._entry.stringsFilepath)
-- setup menu
- local window = Window("window", self:string("CHOOSE_LANGUAGE"),
'settingstitle')
+ local window = Window("window", self:string("CHOOSE_LANGUAGE"),
windowStyle)
window:setAllowScreensaver(false)
local menu = SimpleMenu("menu")
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=3278&root=Jive&r1=3277&r2=3278&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Tue Nov 4 14:44:37 2008
@@ -784,6 +784,18 @@
s.minititle.icon.padding = { 0, 0, 8, 0 }
s.minititle.icon.align = 'right'
+
+ -- Based on s.title, this is for setup title style
+ s.setuptitle =
+ _uses(s.minititle, {
+ order = { 'back', 'text', 'nowplaying', 'icon'
},
+ nowplaying = { img = false },
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Mini/icon_settings.png")
+ }
+ })
+
+
-- Based on s.title, this is for internetradio title style
s.internetradiotitle =
_uses(s.minititle, {
@@ -831,6 +843,7 @@
img = Surface:loadImage(imgpath ..
"Icons/Mini/icon_settings.png")
}
})
+
-- Based on s.title, this is for newmusic title style
s.newmusictitle =
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=3278&root=Jive&r1=3277&r2=3278&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Tue Nov 4 14:44:37 2008
@@ -50,7 +50,7 @@
local jiveMain = jiveMain
-local welcomeTitleStyle = 'settingstitle'
+local welcomeTitleStyle = 'setuptitle'
local disableHomeKeyDuringSetup
local freeAppletWhenEscapingSetup
@@ -70,7 +70,7 @@
}
jiveMain:addItem(returnToSetup)
- self._topWindow = appletManager:callService("setupShowSetupLanguage",
function() self:step2() end)
+ self._topWindow = appletManager:callService("setupShowSetupLanguage",
function() self:step2() end, 'setuptitle')
disableHomeKeyDuringSetup =
Framework:addListener(EVENT_KEY_PRESS,
@@ -104,7 +104,7 @@
end
function step3(self)
- return appletManager:callService("setupShowSelectPlayer", function()
self:step4() end)
+ return appletManager:callService("setupShowSelectPlayer", function()
self:step4() end, 'setuptitle')
end
function step4(self)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
