Author: ayoung
Date: Tue Apr 3 01:28:49 2012
New Revision: 9703
URL: http://svn.slimdevices.com/jive?rev=9703&view=rev
Log:
Update context-menu styles to use icons for playlist control actions.
Use play and add icons for Play, Add, Insert and PlayAll actions (styles), and
a heart icon for item_fav style.
This are particularly relevant now that defeat-touch-to-play is the default
server setting.
Server change are needed send the appropriate styles but I will wait a day or
so before checking those in so that f/w for players is available first.
Modified:
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Modified:
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=9703&r1=9702&r2=9703&view=diff
==============================================================================
---
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Tue Apr 3 01:28:49 2012
@@ -389,8 +389,26 @@
}
s.img.playArrow = {
+ img = _loadImage(self, "Icons/selection_play_off.png"),
+ }
+ s.img.playArrowSel = {
img = _loadImage(self, "Icons/selection_play_sel.png"),
- h = WH_FILL
+ }
+ s.img.playAllArrow = s.img.playArrow
+ s.img.playAllArrowSel = s.img.playArrowSel
+ s.img.itemAdd = {
+ img = _loadImage(self, "Icons/selection_add_off.png"),
+ }
+ s.img.itemAddSel = {
+ img = _loadImage(self, "Icons/selection_add_sel.png"),
+ }
+ s.img.itemAddNext = s.img.itemAdd
+ s.img.itemAddNextSel = s.img.itemAddSel
+ s.img.itemFav = {
+ img = _loadImage(self, "Icons/selection_fav_off.png"),
+ }
+ s.img.itemFavSel = {
+ img = _loadImage(self, "Icons/selection_fav_sel.png"),
}
s.img.rightArrowSel = {
img = _loadImage(self, "Icons/selection_right_sel.png"),
@@ -1590,11 +1608,11 @@
layer = LAYER_TITLE,
--FIXME, something very wrong here. space still being allocated
for hidden, no height title
- title = {
+ title = {
layer = LAYER_TITLE,
hidden = 1,
- h = 0,
- text = {
+ h = 0,
+ text = {
hidden = 1,
},
bgImg = false,
@@ -1632,22 +1650,24 @@
item = {
h = c.CM_MENU_HEIGHT,
order = { "text", "arrow" },
+ padding = { 8, 0, 5, 0 },
text = {
w = WH_FILL,
h = WH_FILL,
+ padding = { 0, 0, 0, 0 },
align = 'left',
fg = TEXT_COLOR,
sh = TEXT_SH_COLOR,
font =
_font(c.ALBUMMENU_SMALL_FONT_SIZE),
line = {
- {
- font = _boldfont(18),
- height = 20,
- },
- {
- font = _font(14),
- height = 18,
- },
+ {
+ font = _boldfont(18),
+ height = 20,
+ },
+ {
+ font = _font(14),
+ height = 18,
+ },
},
},
arrow = _uses(s.item.arrow),
@@ -1660,6 +1680,7 @@
item = {
bgImg = s.img.contextMenuSelectionBox,
order = { "text", "arrow" },
+ padding = { 8, 0, 5, 0 },
text = {
w = WH_FILL,
h = WH_FILL,
@@ -1678,8 +1699,8 @@
height = 14,
},
},
- arrow =
_uses(s.selected.item.arrow),
},
+ arrow = _uses(s.selected.item.arrow),
},
},
locked = {
@@ -1692,14 +1713,46 @@
}
s.context_menu.menu.item_play = _uses(s.context_menu.menu.item, {
+ arrow = {img = s.img.playArrow.img},
+ })
+ s.context_menu.menu.selected.item_play =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = s.img.playArrowSel.img},
+ })
+
+ s.context_menu.menu.item_insert = _uses(s.context_menu.menu.item, {
+ arrow = {img = s.img.itemAddNext.img},
+ })
+ s.context_menu.menu.selected.item_insert =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = s.img.itemAddNextSel.img},
+ })
+
+ s.context_menu.menu.item_add = _uses(s.context_menu.menu.item, {
+ arrow = {img = s.img.itemAdd.img},
+ })
+ s.context_menu.menu.selected.item_add =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = s.img.itemAddSel.img},
+ })
+
+ s.context_menu.menu.item_playall = _uses(s.context_menu.menu.item, {
+ arrow = {img = s.img.playAllArrow.img},
+ })
+ s.context_menu.menu.selected.item_playall =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = s.img.playAllArrowSel.img},
+ })
+
+ s.context_menu.menu.item_fav = _uses(s.context_menu.menu.item, {
+ arrow = {img = s.img.itemFav.img},
+ })
+ s.context_menu.menu.selected.item_fav =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = s.img.itemFavSel.img},
+ })
+
+ s.context_menu.menu.item_no_arrow =
_uses(s.context_menu.menu.item_play, {
order = { 'text' },
})
- s.context_menu.menu.selected.item_play =
_uses(s.context_menu.menu.selected.item, {
+ s.context_menu.menu.selected.item_no_arrow =
_uses(s.context_menu.menu.selected.item, {
order = { 'text' },
})
-
- s.context_menu.menu.item_no_arrow = _uses(s.context_menu.menu.item_play)
- s.context_menu.menu.selected.item_no_arrow =
_uses(s.context_menu.menu.selected.item_play)
s.alarm_header = {
w = screenWidth - 20,
Modified:
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua?rev=9703&r1=9702&r2=9703&view=diff
==============================================================================
---
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
(original)
+++
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
Tue Apr 3 01:28:49 2012
@@ -507,9 +507,12 @@
img = _loadImage(self, "Icons/selection_play_3line_on.png"),
}
local addArrow = {
- img = _loadImage(self, "Icons/selection_add_3line_off.png"),
- }
-
+ img = _loadImage(self, "Icons/selection_add_3line_on.png"),
+ }
+ local favItem = {
+ img = _loadImage(self, "Icons/icon_toolbar_fav.png"),
+ }
+
---- REVIEWED BELOW THIS LINE ----
@@ -1499,19 +1502,20 @@
hidden = 1,
},
- multiline_text = {
- w = WH_FILL,
- h = 223,
- padding = { 18, 20, 14, 18 },
- border = { 0, 0, 6, 15 },
- fg = { 0xe6, 0xe6, 0xe6 },
- sh = { },
- align = "top-left",
- scrollbar = {
- h = 210,
- border = {0, 10, 2, 10},
- },
- },
+ multiline_text = {
+ w = WH_FILL,
+ h = 223,
+ padding = { 18, 20, 14, 18 },
+ border = { 0, 0, 6, 15 },
+ fg = { 0xe6, 0xe6, 0xe6 },
+ sh = { },
+ align = "top-left",
+ scrollbar = {
+ h = 210,
+ border = {0, 10, 2, 10},
+ },
+ },
+
menu = {
border = { 7, 7, 7, 0 },
padding = { 0, 0, 0, 100 },
@@ -1577,17 +1581,59 @@
}
s.context_menu.menu.item_play = _uses(s.context_menu.menu.item, {
+ arrow = {img = playArrow.img},
+ })
+ s.context_menu.menu.selected.item_play =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = playArrow.img},
+ })
+
+ s.context_menu.menu.item_insert = _uses(s.context_menu.menu.item, {
+ arrow = {img = addArrow.img},
+ })
+ s.context_menu.menu.selected.item_insert =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = addArrow.img},
+ })
+
+ s.context_menu.menu.item_add = _uses(s.context_menu.menu.item, {
+ arrow = {img = addArrow.img},
+ })
+ s.context_menu.menu.selected.item_add =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = addArrow.img},
+ })
+
+ s.context_menu.menu.item_playall = _uses(s.context_menu.menu.item, {
+ arrow = {img = playArrow.img},
+ })
+ s.context_menu.menu.selected.item_playall =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = playArrow.img},
+ })
+
+ s.context_menu.menu.item_fav = _uses(s.context_menu.menu.item, {
+ arrow = {img = favItem.img},
+ })
+ s.context_menu.menu.selected.item_fav =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = favItem.img},
+ })
+
+ s.context_menu.menu.item_no_arrow = _uses(s.context_menu.menu.item, {
order = { 'text' },
})
- s.context_menu.menu.selected.item_play =
_uses(s.context_menu.menu.selected.item, {
+ s.context_menu.menu.selected.item_no_arrow =
_uses(s.context_menu.menu.selected.item, {
order = { 'text' },
})
- s.context_menu.menu.item_no_arrow = _uses(s.context_menu.menu.item_play)
- s.context_menu.menu.selected.item_no_arrow =
_uses(s.context_menu.menu.selected.item_play)
-
- s.context_menu.menu.selected.item_add =
_uses(s.context_menu.menu.selected.item, {
- arrow = addArrow,
+ s.context_menu.menu.item_fav = _uses(s.context_menu.menu.item, {
+ arrow = {img = favItem.img},
+ })
+ s.context_menu.menu.selected.item_fav =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = favItem.img},
+ })
+
+ s.context_menu.menu.item_no_arrow = _uses(s.context_menu.menu.item, {
+ order = { 'text' },
+ })
+ s.context_menu.menu.selected.item_no_arrow =
_uses(s.context_menu.menu.selected.item, {
+ order = { 'text' },
})
s.context_menu.menu.pressed = _uses(s.context_menu.menu.selected, {
Modified:
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=9703&r1=9702&r2=9703&view=diff
==============================================================================
---
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
(original)
+++
7.8/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Tue Apr 3 01:28:49 2012
@@ -710,7 +710,10 @@
img = _loadImage(self, "Icons/selection_play_3line_on.png"),
}
local addArrow = {
- img = _loadImage(self, "Icons/selection_add_3line_off.png"),
+ img = _loadImage(self, "Icons/selection_add_3line_on.png"),
+ }
+ local favItem = {
+ img = _loadImage(self, "Icons/icon_toolbar_fav.png"),
}
@@ -2017,23 +2020,23 @@
layer = LAYER_TITLE,
multiline_text = {
- w = WH_FILL,
- h = 172,
- padding = { 18, 2, 14, 18 },
- border = { 0, 0, 6, 15 },
- lineHeight = 22,
- font = _font(18),
- fg = { 0xe6, 0xe6, 0xe6 },
- sh = { },
- align = "top-left",
- scrollbar = {
- h = 164,
- border = {0, 2, 2, 10},
- },
- },
+ w = WH_FILL,
+ h = 172,
+ padding = { 18, 2, 14, 18 },
+ border = { 0, 0, 6, 15 },
+ lineHeight = 22,
+ font = _font(18),
+ fg = { 0xe6, 0xe6, 0xe6 },
+ sh = { },
+ align = "top-left",
+ scrollbar = {
+ h = 164,
+ border = {0, 2, 2, 10},
+ },
+ },
title = {
- layer = LAYER_TITLE,
+ layer = LAYER_TITLE,
h = 52,
padding = {10,10,10,5},
bgImg = false,
@@ -2057,8 +2060,8 @@
font = _boldfont(TITLE_FONT_SIZE),
fg = TEXT_COLOR,
},
-
- },
+ },
+
menu = {
h = CM_MENU_HEIGHT * 4,
border = { 7, 0, 7, 0 },
@@ -2121,12 +2124,41 @@
}
s.context_menu.menu.item_play = _uses(s.context_menu.menu.item, {
- order = { 'text' },
- })
+ arrow = {img = playArrow.img},
+ })
+ s.context_menu.menu.selected.item_play =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = playArrow.img},
+ })
+
+ s.context_menu.menu.item_insert = _uses(s.context_menu.menu.item, {
+ arrow = {img = addArrow.img},
+ })
+ s.context_menu.menu.selected.item_insert =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = addArrow.img},
+ })
+
+ s.context_menu.menu.item_add = _uses(s.context_menu.menu.item, {
+ arrow = {img = addArrow.img},
+ })
+ s.context_menu.menu.selected.item_add =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = addArrow.img},
+ })
+
+ s.context_menu.menu.item_playall = _uses(s.context_menu.menu.item, {
+ arrow = {img = playArrow.img},
+ })
+ s.context_menu.menu.selected.item_playall =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = playArrow.img},
+ })
+
+ s.context_menu.menu.item_fav = _uses(s.context_menu.menu.item, {
+ arrow = {img = favItem.img},
+ })
+ s.context_menu.menu.selected.item_fav =
_uses(s.context_menu.menu.selected.item, {
+ arrow = {img = favItem.img},
+ })
+
s.context_menu.menu.item_no_arrow = _uses(s.context_menu.menu.item, {
- order = { 'text' },
- })
- s.context_menu.menu.selected.item_play =
_uses(s.context_menu.menu.selected.item, {
order = { 'text' },
})
s.context_menu.menu.selected.item_no_arrow =
_uses(s.context_menu.menu.selected.item, {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
