Author: bklaas
Date: Tue Mar 4 13:06:21 2008
New Revision: 2090
URL: http://svn.slimdevices.com?rev=2090&root=Jive&view=rev
Log:
Bug: 7343
Description: make NowPlaying a resident applet
remove calls to tieWindow (not necessary since the applet is never freed)
remove unneeded methods
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingMeta.lua
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua?rev=2090&root=Jive&r1=2089&r2=2090&view=diff
==============================================================================
---
branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
Tue Mar 4 13:06:21 2008
@@ -239,7 +239,6 @@
-- create the window to display
local window = _createUI(self)
if self[windowStyle].window then
- self:_uninstallListeners(windowStyle)
window:replace(self[windowStyle].window,
Window.transitionFadeIn)
self:_installListeners(window)
end
@@ -437,24 +436,6 @@
-----------------------------------------------------------------------------------------
-- Settings
--
-function openSettings(self, menuItem)
- local window = Window("Now Playing Settings")
-
- self:tieAndShowWindow(window)
- return window
-end
-
-
-function _uninstallListeners(self, ws)
- if not self[ws].listeners then
- return
- end
-
- for i in ipairs(self[ws].listeners) do
- Framework:removeListener(self[ws].listeners[i])
- end
- self[ws].listeners = false
-end
function _installListeners(self, window)
@@ -583,7 +564,6 @@
manager:screensaverWindow(window)
end
- self:tieWindow(window)
return window
end
@@ -677,14 +657,8 @@
-- we force the recreation of the UI when re-entering the screen,
possibly in a different mode
log:warn("NowPlaying.free()")
self.player = false
- if self['ss'] then
- self:_uninstallListeners('ss')
- self['ss'] = nil
- end
- if self['browse'] then
- self:_uninstallListeners('browse')
- self['browse'] = nil
- end
+ self['ss'] = nil
+ self['browse'] = nil
jiveMain:removeItemById('appletNowPlaying')
end
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingMeta.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingMeta.lua?rev=2090&root=Jive&r1=2089&r2=2090&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingMeta.lua
(original)
+++ branches/7.0/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingMeta.lua
Tue Mar 4 13:06:21 2008
@@ -37,5 +37,7 @@
jiveMain:loadSkin("NowPlaying", "skin")
end
+ -- NowPlaying is a resident Applet
+ appletManager:loadApplet("NowPlaying")
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
