Author: titmuss
Date: Wed Jan 23 07:59:31 2008
New Revision: 1587
URL: http://svn.slimdevices.com?rev=1587&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1586): titmuss | 2008-01-23 15:49:13 +0000
Bug: 6590
Description:
Update the menu and menu item styles correctly when loading data.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/DB.lua
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jan 23 07:59:31 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1584
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1586
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/applets/SlimBrowser/DB.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/DB.lua?rev=1587&root=Jive&r1=1586&r2=1587&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/DB.lua (original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/DB.lua Wed Jan 23
07:59:31 2008
@@ -52,7 +52,7 @@
-- creates an empty database object
function __init(self, windowSpec)
log:debug("DB:__init()")
-
+
return oo.rawnew(self, {
-- data
@@ -71,6 +71,11 @@
-- windowSpec (to create labels in renderer)
windowSpec = windowSpec,
})
+end
+
+
+function menuStyle(self)
+ return self.windowSpec.menuStyle
end
@@ -126,6 +131,17 @@
self.store = {}
self.complete = false
end
+
+ -- update the window properties
+ if chunk and chunk.window then
+ local window = chunk.window
+
+ if window.menuStyle then
+ self.windowSpec.menuStyle = window.menuStyle .. "menu"
+ self.windowSpec.labelItemStyle = window.menuStyle ..
"item"
+ end
+ end
+
self.ts = ts
self.count = cCount
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1587&root=Jive&r1=1586&r2=1587&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Wed
Jan 23 07:59:31 2008
@@ -616,9 +616,10 @@
-- if our window has a menu - some windows don't :(
if step.menu then
step.menu:setItems(step.db:menuItems(data))
- if data.window and data.window.menuStyle then
- step.menu:setStyle(data.window.menuStyle ..
'menu')
- end
+
+ -- update the window properties
+ -- TODO add more properties here
+ step.menu:setStyle(step.db:menuStyle())
-- what's missing?
local from, qty =
step.db:missing(step.menu:isAccelerated())
@@ -1452,7 +1453,7 @@
-- a db above
-- a menu. We manage closing ourselves to guide our path
- menu = Menu(windowSpec.menuStyle, _browseMenuRenderer,
_browseMenuListener, _browseMenuAvailable)
+ menu = Menu(db:menuStyle(), _browseMenuRenderer,
_browseMenuListener, _browseMenuAvailable)
-- alltogether now
menu:setItems(db:menuItems())
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
