Author: bklaas
Date: Wed Mar 3 14:51:02 2010
New Revision: 8627
URL: http://svn.slimdevices.com/jive?rev=8627&view=rev
Log:
Bug: 12013
Description: clean up title widget button so it uses a label instead of a
nested label in a group
tidy up skins to support that change
add back animation to text label now that it is no longer broken after this
change
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=8627&r1=8626&r2=8627&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Wed Mar 3 14:51:02 2010
@@ -460,8 +460,9 @@
s.title.textButton = _uses(s.title.text, {
padding = 0,
- text = s.title.text,
- })
+ })
+ s.title.pressed = {}
+ s.title.pressed.textButton = s.title.textButton
s.text_block_black = {
hidden = 1,
@@ -872,8 +873,10 @@
s.text_list.title.textButton = _uses(s.text_list.title.text, {
padding = 0,
border = 0,
- text = s.text_list.title.text,
- })
+ })
+ s.text_list.title.pressed = {}
+ s.text_list.title.pressed.textButton = s.text_list.title.textButton
+
-- popup "spinny" window
s.waiting_popup = _uses(s.popup)
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=8627&r1=8626&r2=8627&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Mar 3 14:51:02 2010
@@ -2519,10 +2519,9 @@
-- it will turn the title text into a button in unwanted spots
along XMLBrowse trees
if containerContextMenu and containerContextMenu.cmd and
containerContextMenu.cmd[1] == 'contextmenu' then
log:debug('Turn the title text into a button')
- local titleText = Label("text", windowSpec.text)
local titleWidget = Group('title', {
text = Button(
- Group( "textButton", {
titleText } ),
+ Label("textButton",
windowSpec.text),
function()
local step, sink =
_newDestination(_getCurrentStep(), item, _newWindowSpec(db, item, true),
_browseSink, containerContextMenu)
local from, qty
@@ -2539,9 +2538,6 @@
rbutton = _nowPlayingButton(),
})
window:setTitleWidget(titleWidget)
- --FIXME: the animation in the textButton widget yields
a broken UI
- -- Possibly part of Bug 15557
- titleText:animate(false)
titleWidgetComplete = true
end
end
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua?rev=8627&r1=8626&r2=8627&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
Wed Mar 3 14:51:02 2010
@@ -586,9 +586,9 @@
sh = NONE,
}
}
- s.title.textButton = _uses(s.title.text, {
- text = s.title.text
- })
+ s.title.textButton = s.title.text
+ s.title.pressed = {}
+ s.title.pressed.textButton = s.title.textButton
s.text_block_black = {
bgImg = Tile:fillColor(0x000000ff),
@@ -1052,9 +1052,10 @@
},
},
})
- s.text_list.title.textButton = _uses(s.text_list.title.text, {
- text = s.text_list.title.text,
- })
+ s.text_list.title.textButton = s.text_list.title.text
+
+ s.text_list.title.pressed = {}
+ s.text_list.title.pressed.textButton = s.text_list.title.textButton
-- choose player window. identical to text_list on all windows except
WQVGAlarge, which needs to show the icon
s.choose_player = _uses(s.text_list, {
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=8627&r1=8626&r2=8627&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Wed Mar 3 14:51:02 2010
@@ -821,9 +821,7 @@
s.title.textButton = _uses(s.title.text, {
bgImg = titlebarButtonBox,
- text = _uses(s.title.text, {
- padding = { 4, 15, 4, 15 },
- }),
+ padding = { 4, 15, 4, 15 },
})
s.title.pressed = {}
@@ -1495,14 +1493,12 @@
s.text_list.title.textButton = _uses(s.text_list.title.text, {
bgImg = titlebarButtonBox,
- text = _uses(s.text_list.title.text, {
- padding = { 4, 15, 4, 15 },
- }),
+ padding = { 4, 15, 4, 15 },
})
s.text_list.title.pressed = {}
s.text_list.title.pressed.textButton = _uses(s.text_list.title.text, {
bgImg = pressedTitlebarButtonBox,
- text = _uses(s.text_list.title.text, { h = WH_FILL }),
+ padding = { 4, 15, 4, 15 },
})
-- choose player window is exactly the same as text_list on all windows
except WQVGAlarge
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
