Author: richard
Date: Tue Mar 31 10:01:07 2009
New Revision: 5042
URL: http://svn.slimdevices.com/jive?rev=5042&view=rev
Log:
r5...@harrypotter (orig r5039): felix | 2009-03-31 15:26:56 +0100
Bug: n/a
Description: Tidy up zcip_action script, silence false error message
r5...@harrypotter (orig r5041): tom | 2009-03-31 17:55:28 +0100
Bug:N/A
Description:
Added unassignedActions so action that don't have hard buttons can be
registered easily.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Mar 31 10:01:07 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4842
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5025
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5041
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.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action?rev=5042&r1=5041&r2=5042&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
Tue Mar 31 10:01:07 2009
@@ -3,7 +3,7 @@
# zcip script from here:
http://sources.busybox.net/index.py/trunk/busybox/examples/zcip.script?revision=10206&view=markup
# only for use as a "zcip" callback script
-if [ "x$interface" = x ]
+if [ "x$interface" = "x" ]
then
exit 1
fi
@@ -17,7 +17,7 @@
exit 0
;;
config)
- if [ "x$ip" = x ]
+ if [ "x$ip" = "x" ]
then
exit 1
fi
@@ -29,13 +29,15 @@
ip address add dev $interface \
scope link local "$ip/16" broadcast +
route add default dev $interface
+ exit 0
;;
deconfig)
- if [ x$ip = x ]
+ if [ "x$ip" = "x" ]
then
exit 1
fi
exec ip address del dev $interface local $ip
+ exit 0
;;
esac
exit 1
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=5042&r1=5041&r2=5042&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Tue Mar 31 10:01:07 2009
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r28"
+PR = "r29"
SRC_URI = " \
file://85-mtd.rules \
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua?rev=5042&r1=5041&r2=5042&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
Tue Mar 31 10:01:07 2009
@@ -108,3 +108,8 @@
[KEY_REW | KEY_PAUSE] = "take_screenshot", -- a stab at how to handle
multi-press
}
+-- enter actions here that are triggered in the app but not by any hard input
mechanism. Entering them here will get them registered so they can be used
+unassignedActionMappings = {
+ "finish_operation",
+}
+
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua?rev=5042&r1=5041&r2=5042&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
Tue Mar 31 10:01:07 2009
@@ -690,6 +690,9 @@
for key, action in
pairs(self.inputToActionMap.charActionMappings.press) do
self:registerAction(action)
end
+ for i, action in ipairs(self.inputToActionMap.unassignedActionMappings)
do
+ self:registerAction(action)
+ end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
