Author: titmuss
Date: Sun Jan 20 02:02:18 2008
New Revision: 1521
URL: http://svn.slimdevices.com?rev=1521&root=Jive&view=rev
Log:
Bug: 6303
Description:
Add a checked with no action style for use in the Music Source menu.
Modified:
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
Modified:
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=1521&root=Jive&r1=1520&r2=1521&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua Sun
Jan 20 02:02:18 2008
@@ -388,6 +388,9 @@
}
})
+ -- checked menu item, with no action
+ s.checkedNoAction = _uses(s.checked)
+
-- selected menu item
s.selected = {}
s.selected.item =
@@ -430,12 +433,28 @@
})
- s.selected.itemNoAction = {}
- s.selected.itemNoAction.bgImg = selectionBox
- s.selected.itemNoAction.text = {}
- s.selected.itemNoAction.text.font = FONT_BOLD_15px
- s.selected.itemNoAction.text.fg = SELECT_COLOR
- s.selected.itemNoAction.text.sh = SELECT_SH_COLOR
+ s.selected.itemNoAction =
+ _uses(s.itemNoAction, {
+ bgImg = selectionBox,
+ text = {
+ fg = SELECT_COLOR,
+ sh = SELECT_SH_COLOR
+ },
+ })
+
+ s.selected.checkedNoAction =
+ _uses(s.checkedNoAction, {
+ bgImg = selectionBox,
+ text = {
+ fg = SELECT_COLOR,
+ sh = SELECT_SH_COLOR
+ },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"menu_check_selected.png")
+ }
+ })
+
-- locked menu item (with loading animation)
s.locked = {}
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua?rev=1521&root=Jive&r1=1520&r2=1521&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
Sun Jan 20 02:02:18 2008
@@ -160,7 +160,7 @@
-- check current player
if server == currentPlayer:getSlimServer() then
- item.style = 'checked' -- XXXX NoAction
+ item.style = 'checkedNoAction'
item.callback = nil
end
@@ -203,7 +203,7 @@
for id, item in pairs(self.serverList) do
if server == id then
- item.style = 'checked' -- XXXX NoAction
+ item.style = 'checkedNoAction'
item.callback = nil
else
item.style = nil
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
