Author: titmuss
Date: Fri Oct 17 02:24:09 2008
New Revision: 3151
URL: http://svn.slimdevices.com?rev=3151&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3142): bklaas | 2008-10-15 21:43:59 +0100
Bug: n/a
Description: kludgy larger icons for play, add, and selection_wait. Will need
updated graphics before release, but this is at least sized better
another fix for "pulsating" artwork
[EMAIL PROTECTED] (orig r3144): tom | 2008-10-16 03:48:51 +0100
Bug: 9717
Description:
Temporary fix to improve slider drag stickiness. Now slider receives drag
event even when mouse is in list area. This still needs works since the slider
should receive darg events no matter where the mouse is in the app.
[EMAIL PROTECTED] (orig r3145): tom | 2008-10-16 04:14:37 +0100
Bug: 9717
Description:
Improve slider drag boundary issues. Now slider shows top item when dragged to
the top and same for bottom
[EMAIL PROTECTED] (orig r3146): bklaas | 2008-10-16 16:14:33 +0100
Bug: n/a
Description: add slimp3 image, change softsqueeze image from my avatar
(whoops) to SD logo
these are still placeholders for official artwork from Noah
[EMAIL PROTECTED] (orig r3148): bklaas | 2008-10-16 18:45:22 +0100
Bug: 9730
Description: never set item.style to nil when refreshing player item
move a log:info() message to log:debug() in SelectPlayerApplet.lua
[EMAIL PROTECTED] (orig r3149): tom | 2008-10-16 21:22:38 +0100
wrong constant name used
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png
(with props)
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Scrollbar.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_add.png
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_play.png
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_wait.png
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Oct 17 02:24:09 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3138
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3149
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png?rev=3151&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Fri Oct 17 02:24:09 2008
@@ -225,8 +225,6 @@
-- update player state
if player == self.selectedPlayer then
item.style = "checked"
- else
- item.style = nil
end
end
@@ -268,7 +266,7 @@
function _showWallpaper(self, playerId)
- log:info("previewing background wallpaper for ", playerId)
+ log:debug("previewing background wallpaper for ", playerId)
appletManager:callService("showBackground", nil, playerId)
end
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua Fri Oct 17
02:24:09 2008
@@ -65,6 +65,7 @@
local EVENT_FOCUS_LOST = jive.ui.EVENT_FOCUS_LOST
local EVENT_MOUSE_PRESS = jive.ui.EVENT_MOUSE_PRESS
local EVENT_MOUSE_DOWN = jive.ui.EVENT_MOUSE_DOWN
+local EVENT_MOUSE_UP = jive.ui.EVENT_MOUSE_UP
local EVENT_MOUSE_MOVE = jive.ui.EVENT_MOUSE_MOVE
local EVENT_MOUSE_DRAG = jive.ui.EVENT_MOUSE_DRAG
@@ -222,7 +223,13 @@
evtype == EVENT_MOUSE_MOVE or
evtype == EVENT_MOUSE_DRAG then
- if self.scrollbar:mouseInside(event) then
+ if self.scrollbar:mouseInside(event) or
self.sliderDragInProgress then
+ if (evtype ~= EVENT_MOUSE_MOVE) then
+ --allows slider drag to continue even when
listitem area is entered
+ -- a more comprehensive solution is needed so
that drag of a slider is respected no matter
+ -- where the mouse cursor is on the screen
+ self.sliderDragInProgress = true
+ end
-- forward event to scrollbar
return self.scrollbar:_event(event)
@@ -239,6 +246,10 @@
return EVENT_CONSUME
end
+
+ elseif evtype == EVENT_MOUSE_UP then
+ self.sliderDragInProgress = false
+ return EVENT_UNUSED
elseif evtype == EVENT_SHOW or
evtype == EVENT_HIDE then
@@ -279,7 +290,7 @@
end)
obj.scrollbar = Scrollbar("scrollbar",
function(_, value)
- obj:setSelectedIndex(value)
+ obj:setSelectedIndex(value + 1) --
value comes in zero based, one based is needed
end)
obj.scrollbar.parent = obj
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Scrollbar.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Scrollbar.lua?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Scrollbar.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Scrollbar.lua Fri Oct
17 02:24:09 2008
@@ -94,14 +94,25 @@
function _setSlider(self, percent)
- local oldvalue = self.value
+
+ --boundary guard, since value is often past border (e.g. when vertical
slider drag y value moves above slider)
+ if percent < 0 then
+ percent = 0
+ elseif percent >= 1 then
+ percent = .9999
+ end
local pos = percent * (self.range)
self.value = math.floor(pos)
self:reDraw()
-
- if self.value ~= oldvalue and self.closure then
+
+-- removed oldValue check (performance enhancement as far as I can see)
because value (in menu case, for example) was
+-- being reset by the menu after setSelectedIndex was called, calling false
positives here
+-- I would think that these would always have been the same, but was not the
case,
+-- so in the future this discrepency could be resolved and this performance
enhancement could be re-added.
+-- if self.value ~= oldvalue and self.closure then
+ if self.closure then
self.closure(self, self.value, false)
end
end
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua Fri Oct 17
02:24:09 2008
@@ -61,7 +61,7 @@
local EVENT_ACTION = jive.ui.EVENT_ACTION
local EVENT_SCROLL = jive.ui.EVENT_SCROLL
local EVENT_KEY_PRESS = jive.ui.EVENT_KEY_PRESS
-local EVENT_TEXT_PRESS = jive.ui.EVENT_TEXT_PRESS
+local EVENT_CHAR_PRESS = jive.ui.EVENT_CHAR_PRESS
local EVENT_WINDOW_PUSH = jive.ui.EVENT_WINDOW_PUSH
local EVENT_WINDOW_POP = jive.ui.EVENT_WINDOW_POP
local EVENT_WINDOW_ACTIVE = jive.ui.EVENT_WINDOW_ACTIVE
@@ -318,7 +318,7 @@
if self.brieflyHandler == nil then
self.brieflyHandler =
- self:addListener(EVENT_TEXT_PRESS | EVENT_KEY_PRESS |
EVENT_SCROLL,
+ self:addListener(EVENT_CHAR_PRESS | EVENT_KEY_PRESS |
EVENT_SCROLL,
function(event)
self:hide(popTransition,
"NONE")
return EVENT_CONSUME
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Fri Oct 17 02:24:09 2008
@@ -439,7 +439,7 @@
icon = {
img = Surface:loadImage(imgpath
.. "Icons/selection_wait.png"),
frameRate = 5,
- frameWidth = 10
+ frameWidth = 29
}
})
@@ -1333,10 +1333,12 @@
s.albumcurrent.text.fg = TEXT_COLOR
s.albumcurrent.text.sh = TEXT_SH_COLOR
s.albumcurrent.icon = {}
- s.albumcurrent.icon.h = WH_FILL
+ s.albumcurrent.icon.h = 125
+ s.albumcurrent.icon.w = 125
s.albumcurrent.icon.align = "left"
--FIXME, this path likely needs changing
s.albumcurrent.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork_125.png")
+ s.albumcurrent.icon.padding = { 0, 5, 0, 0}
s.albumcurrent.play = {}
s.albumcurrent.play.align = 'center'
s.albumcurrent.play.img = Surface:loadImage(imgpath ..
"Icons/icon_nowplaying_indicator_w.png")
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png?rev=3151&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_add.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_add.png?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_play.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_play.png?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_wait.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/selection_wait.png?rev=3151&root=Jive&r1=3150&r2=3151&view=diff
==============================================================================
Binary files - no diff available.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
