Author: bklaas Date: Tue Oct 12 09:37:15 2010 New Revision: 9164 URL: http://svn.slimdevices.com/jive?rev=9164&view=rev Log: Bug: n/a Description: context menu skinning fixes for all skins
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=9164&r1=9163&r2=9164&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Tue Oct 12 09:37:15 2010
@@ -1631,9 +1631,19 @@
w = WH_FILL,
h = WH_FILL,
align = 'left',
- font = _boldfont(c.TEXTMENU_FONT_SIZE),
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,
+ },
+ },
},
arrow = _uses(s.item.arrow),
bgImg = false,
@@ -1650,10 +1660,21 @@
h = WH_FILL,
align = 'left',
font =
_boldfont(c.TEXTMENU_SELECTED_FONT_SIZE),
- fg = c.TEXT_COLOR,
- sh = c.TEXT_SH_COLOR,
+ fg = c.SELECT_COLOR,
+ sh = c.SELECT_SH_COLOR,
+ padding = { 0, 2, 0, 0 },
+ line = {
+ {
+ font =
_boldfont(21),
+ height = 23,
+ },
+ {
+ font =
_font(14),
+ height = 14,
+ },
+ },
+ arrow =
_uses(s.selected.item.arrow),
},
- arrow = _uses(s.selected.item.arrow),
},
},
locked = {
@@ -1664,17 +1685,17 @@
},
}
+
s.context_menu.menu.item_play = _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, {
- 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,
padding = { 50, 0, 50, 0 },
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua?rev=9164&r1=9163&r2=9164&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
Tue Oct 12 09:37:15 2010
@@ -1511,6 +1511,121 @@
border = {0, 10, 2, 10},
},
},
+ menu = {
+ border = { 7, 7, 7, 0 },
+ padding = { 0, 0, 0, 100 },
+ scrollbar = {
+ h = CM_MENU_HEIGHT * 3 - 8,
+ border = { 0, 4, 2, 4 },
+ },
+ item = {
+ h = CM_MENU_HEIGHT,
+ order = { "text", "arrow" },
+ padding = { ITEM_LEFT_PADDING, 0, 12, 0 },
+ bgImg = false,
+ text = {
+ w = WH_FILL,
+ h = WH_FILL,
+ padding = { 0, 8, 0, 8 },
+ align = 'left',
+ font = _font(ALBUMMENU_SMALL_FONT_SIZE),
+ line = {
+ {
+ font =
_boldfont(ALBUMMENU_FONT_SIZE),
+ height = 42,
+ },
+ {
+ font =
_font(ALBUMMENU_SMALL_FONT_SIZE),
+ },
+ },
+ fg = TEXT_COLOR,
+ sh = TEXT_SH_COLOR,
+ },
+ arrow = _uses(s.item.arrow),
+ },
+ selected = {
+ item = {
+ bgImg = threeItemCMSelectionBox,
+ order = { "text", "arrow" },
+ padding = { ITEM_LEFT_PADDING, 0, 12, 0
},
+ text = {
+ w = WH_FILL,
+ h = WH_FILL,
+ align = 'left',
+ padding = { 0, 12, 0, 12 },
+ font =
_font(ALBUMMENU_SELECTED_SMALL_FONT_SIZE),
+ line = {
+ {
+ font =
_boldfont(ALBUMMENU_SELECTED_FONT_SIZE),
+ height = 42,
+ },
+ {
+ font =
_font(ALBUMMENU_SELECTED_SMALL_FONT_SIZE),
+ },
+ },
+ fg = TEXT_COLOR,
+ sh = TEXT_SH_COLOR,
+ },
+ arrow = _uses(s.item.arrow, {
+ img = _loadImage(self,
"Icons/selection_right_3line_on.png"),
+ }),
+ },
+ },
+
+ },
+ }
+
+ s.context_menu.menu.item_play = _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.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.pressed = _uses(s.context_menu.menu.selected, {
+ })
+
+ -- alarm popup
+ s.alarm_header = {
+ w = screenWidth - 16,
+ align = 'center',
+ layer = LAYER_TITLE,
+ order = { 'time' },
+ }
+
+ s.alarm_time = {
+ w = WH_FILL,
+ fg = TEXT_COLOR,
+ sh = TEXT_SH_COLOR,
+ layer = LAYER_TITLE,
+ align = "center",
+ font = _boldfont(62),
+ border = { 0, 14, 0, 0 },
+ }
+ s.preview_text = _uses(s.alarm_time, {
+ font = _boldfont(TITLE_FONT_SIZE),
+ })
+
+ -- alarm menu window
+ s.alarm_popup = {
+ x = 8,
+ y = 21,
+ w = screenWidth - 16,
+ h = screenHeight - 42,
+ bgImg = contextMenuBox,
+ layer = LAYER_TITLE,
+
+ title = {
+ hidden = 1,
+ },
+
menu = {
border = { 7, 7, 7, 0 },
padding = { 0, 0, 0, 100 },
@@ -1579,122 +1694,6 @@
}),
},
},
-
- },
- }
-
- s.context_menu.menu.selected.item_play =
_uses(s.context_menu.menu.selected.item, {
- order = { 'icon', 'text' },
- })
- s.context_menu.menu.selected.item_add =
_uses(s.context_menu.menu.selected.item, {
- arrow = addArrow,
- })
-
- s.context_menu.menu.pressed = _uses(s.context_menu.menu.selected, {
- })
-
- -- alarm popup
- s.alarm_header = {
- w = screenWidth - 16,
- align = 'center',
- layer = LAYER_TITLE,
- order = { 'time' },
- }
-
- s.alarm_time = {
- w = WH_FILL,
- fg = TEXT_COLOR,
- sh = TEXT_SH_COLOR,
- layer = LAYER_TITLE,
- align = "center",
- font = _boldfont(62),
- border = { 0, 14, 0, 0 },
- }
- s.preview_text = _uses(s.alarm_time, {
- font = _boldfont(TITLE_FONT_SIZE),
- })
-
- -- alarm menu window
- s.alarm_popup = {
- x = 8,
- y = 21,
- w = screenWidth - 16,
- h = screenHeight - 42,
- bgImg = contextMenuBox,
- layer = LAYER_TITLE,
-
- title = {
- hidden = 1,
- },
-
- menu = {
- border = { 7, 7, 7, 0 },
- padding = { 0, 0, 0, 100 },
- scrollbar = {
- h = CM_MENU_HEIGHT * 3 - 8,
- border = { 0, 4, 2, 4 },
- },
- item = {
- h = CM_MENU_HEIGHT,
- order = { "icon", "text", "arrow" },
- padding = { ITEM_LEFT_PADDING, 0, 12, 0 },
- bgImg = false,
- text = {
- w = WH_FILL,
- h = WH_FILL,
- padding = { 0, 0, 0, 8 },
- align = 'left',
- font = _font(ALBUMMENU_SMALL_FONT_SIZE),
- line = {
- {
- font =
_boldfont(ALBUMMENU_FONT_SIZE),
- },
- {
- font =
_font(ALBUMMENU_SMALL_FONT_SIZE),
- },
- },
- fg = TEXT_COLOR,
- sh = TEXT_SH_COLOR,
- },
- icon = {
- h = THUMB_SIZE,
- padding = MENU_ITEM_ICON_PADDING,
- align = 'center',
- },
- arrow = _uses(s.item.arrow),
- },
- selected = {
- item = {
- bgImg = threeItemCMSelectionBox,
- order = { "icon", "text", "arrow" },
- padding = { ITEM_LEFT_PADDING, 0, 12, 0
},
- text = {
- w = WH_FILL,
- h = WH_FILL,
- align = 'left',
- padding = { 0, 0, 0, 12 },
- font =
_font(ALBUMMENU_SELECTED_SMALL_FONT_SIZE),
- line = {
- {
- font =
_boldfont(ALBUMMENU_SELECTED_FONT_SIZE),
- },
- {
- font =
_font(ALBUMMENU_SELECTED_SMALL_FONT_SIZE),
- },
- },
- fg = TEXT_COLOR,
- sh = TEXT_SH_COLOR,
- },
- icon = {
- h = THUMB_SIZE,
- padding =
MENU_ITEM_ICON_PADDING,
- align = 'center',
- },
- arrow = _uses(s.item.arrow, {
- img = _loadImage(self,
"Icons/selection_right_3line_on.png"),
- }),
- },
- },
}
}
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=9164&r1=9163&r2=9164&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Tue Oct 12 09:37:15 2010
@@ -2062,7 +2062,7 @@
},
item = {
h = CM_MENU_HEIGHT,
- order = { "icon", "text", "arrow" },
+ order = { "text", "arrow" },
padding = { ITEM_LEFT_PADDING, 0, 12, 0 },
text = {
padding = { 0, 4, 0, 0 },
@@ -2082,16 +2082,11 @@
fg = TEXT_COLOR,
sh = TEXT_SH_COLOR,
},
- icon = {
- h = THUMB_SIZE,
- padding = MENU_ITEM_ICON_PADDING,
- align = 'center',
- },
arrow = _uses(s.item.arrow),
},
selected = {
item = {
- order = { "icon", "text", "arrow" },
+ order = { "text", "arrow" },
bgImg = fiveItemSelectionBox,
padding = { ITEM_LEFT_PADDING, 0, 12, 0
},
text = {
@@ -2112,11 +2107,6 @@
fg = TEXT_COLOR,
sh = TEXT_SH_COLOR,
},
- icon = {
- h = THUMB_SIZE,
- padding =
MENU_ITEM_ICON_PADDING,
- align = 'center',
- },
arrow = _uses(s.item.arrow),
},
},
@@ -2127,7 +2117,13 @@
s.context_menu.menu.item_play = _uses(s.context_menu.menu.item, {
order = { 'text' },
})
+ 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, {
order = { 'text' },
})
@@ -3490,6 +3486,7 @@
sh = TEXT_SH_COLOR,
}
+ return s
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
