Author: bklaas
Date: Wed Apr 28 20:32:40 2010
New Revision: 8746
URL: http://svn.slimdevices.com/jive?rev=8746&view=rev
Log:
Bug: 9057
Description: support for a textareaToken on a slimbrowse menu which can deliver
platform-specific help for a window
note that using help to present menu header widgets like this can not coexist
with decorated menu items like radio buttons or checkboxes
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
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=8746&r1=8745&r2=8746&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 Apr 28 20:32:40 2010
@@ -1342,9 +1342,15 @@
elseif data.title then
step.window:setTitle(data.title)
end
+
-- textarea data for the window
- if data.window and data.window.textarea then
- local text =
string.gsub(data.window.textarea, '\\n', "\n")
+ if data.window and (data.window.textarea or
data.window.textareaToken) then
+
+ if data.window.textareaToken then
+ data.window.textarea =
_string(data.window.textareaToken)
+ end
+
+ local text =
string.gsub(tostring(data.window.textarea), '\\n', "\n")
local textarea = Textarea('help_text',
text)
if step.menu then
local item_loop =
_safeDeref(step.menu, 'list', 'db', 'last_chunk', "item_loop")
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt?rev=8746&r1=8745&r2=8746&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
(original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
Wed Apr 28 20:32:40 2010
@@ -370,3 +370,15 @@
SLIMBROWSER_DONE
EN Done
+SLIMBROWSER_ALARM_SOUND_HELP
+ EN In these menus, select an item for an alarm sound or press play
to preview.
+
+SLIMBROWSER_ALARM_SOUND_HELP_FAB4
+ EN In these menus, touch to select an alarm sound, touch-hold to
preview.
+
+SLIMBROWSER_ALARM_SOUND_HELP_BABY
+ EN In these menus, press the knob to select an alarm sound, press
play to preview.
+
+SLIMBROWSER_ALARM_SOUND_HELP_JIVE
+ EN In these menus, press the center button to select an alarm
sound, press play to preview.
+
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
