Author: bklaas
Date: Wed Mar 16 08:28:48 2011
New Revision: 9366
URL: http://svn.slimdevices.com/jive?rev=9366&view=rev
Log:
r49696@DaddyMac (orig r9359): fmueller | 2011-03-14 08:50:23 -0500
Bug: 15741
Description: Automatically hide eject success window when SD card / USB device
is removed.
r49697@DaddyMac (orig r9360): fmueller | 2011-03-14 08:53:44 -0500
Bug: n/a
Description: Add hint to Network Health function to inform user how to invoke
a network health test.
r49701@DaddyMac (orig r9364): bklaas | 2011-03-15 16:01:03 -0500
Fixed Bug: 17056
Description: remove padding so dirty space on time updates is refreshed
properly
this is done at the expense of being able to vertically center the time within
the header widget. As far as I can tell, there's no way to fix this at the skin
level, it's a bug with the refresh on the header widget.
r49702@DaddyMac (orig r9365): bklaas | 2011-03-16 10:18:21 -0500
Bug: n/a
Description: add pressed state for repeatDisabled and shuffleDisabled buttons
Modified:
7.6/branches/new-setup/ (props changed)
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
Propchange: 7.6/branches/new-setup/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Mar 16 08:28:48 2011
@@ -15,7 +15,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9302
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9354
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9365
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
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=9366&r1=9365&r2=9366&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Wed Mar 16 08:28:48 2011
@@ -1703,7 +1703,6 @@
s.alarm_header = {
w = screenWidth - 20,
- padding = { 0, 0, 0, 30 },
order = { 'time' },
time = {
h = WH_FILL,
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=9366&r1=9365&r2=9366&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Wed Mar 16 08:28:48 2011
@@ -3128,6 +3128,8 @@
hate = _uses(s.nowplaying.npcontrols.hate, { bgImg =
keyMiddlePressed }),
fwdDisabled = _uses(s.nowplaying.npcontrols.fwdDisabled),
rewDisabled = _uses(s.nowplaying.npcontrols.rewDisabled),
+ shuffleDisabled =
_uses(s.nowplaying.npcontrols.shuffleDisabled),
+ repeatDisabled = _uses(s.nowplaying.npcontrols.repeatDisabled),
}
s.nowplaying_art_only = _uses(s.nowplaying, {
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua?rev=9366&r1=9365&r2=9366&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
Wed Mar 16 08:28:48 2011
@@ -354,6 +354,14 @@
---function _mountingDrive(self)
function _deviceRemoval(self, devName)
+ -- If unmount success window is still up - automatically hide it and go
home
+ -- This saves the user from needing to click 'ok' manually
+ if self.unmountSuccessWindow then
+ self.unmountSuccessWindow:hide()
+ self.unmountSuccessWindow = nil
+ Framework:pushAction("go_home")
+ end
+
-- if devName is still in the self.mountedDevices table, consider this
an unsafe eject
if self.mountedDevices and self.mountedDevices[devName] then
@@ -581,6 +589,10 @@
local window = Window("text_list", self:string("DEVICE_EJECTED"))
+
+ -- Keep a reference so we can hide window when user removed SD card
+ self.unmountSuccessWindow = window
+
window:setAllowScreensaver(false)
window:setButtonAction("rbutton", nil)
window:setButtonAction("lbutton", nil)
@@ -598,6 +610,9 @@
self.ejectWarningWindow = nil
end
window:hide()
+
+ -- User clicked ok before removing SD card - no need to
keep the reference
+ self.unmountSuccessWindow = nil
end
})
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua?rev=9366&r1=9365&r2=9366&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
Wed Mar 16 08:28:48 2011
@@ -861,7 +861,8 @@
self.labels = {}
self.labels["NETWORK_STATUS"] = {
- text = self:string("NETWORK_STATUS", '-'),
+-- text = self:string("NETWORK_STATUS", '-'),
+ text = self:string("NETWORK_STATUS",
tostring(self:string("NET_HEALTH_HINT"))),
style = 'item_info',
}
menu:addItem(self.labels["NETWORK_STATUS"])
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt?rev=9366&r1=9365&r2=9366&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
Wed Mar 16 08:28:48 2011
@@ -993,6 +993,9 @@
STATUS_MSG
EN %s
+NET_HEALTH_HINT
+ EN Select 'Check Network' to perfom a network health check.
+
NET_BRINGING_NETWORK_DOWN
EN Bringing network down ...
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
