Author: bklaas
Date: Tue Jul 27 14:59:32 2010
New Revision: 8997
URL: http://svn.slimdevices.com/jive?rev=8997&view=rev
Log:
Bug: n/a
Description: incremental changes to CustomizeHomeMenu, incorporating some
suggestions from the beta community
While fully functional, *the UI is still a work in progress*
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua?rev=8997&r1=8996&r2=8997&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
Tue Jul 27 14:59:32 2010
@@ -88,13 +88,6 @@
somethingHidden
= true
end
end
- if not somethingHidden then
- -- remove restore menu
items item
- local restoreHomeItems
= jiveMain:getNodeItemById('appletCustomizeHomeRestoreHiddenItems', 'home')
-
jiveMain:removeItemFromNode(restoreHomeItems, 'home')
-
self:getSettings()['appletCustomizeHomeRestoreHiddenItems'] = nil
-
self:_storeSettings('home')
- end
end, 500)
return EVENT_CONSUME
end,
@@ -126,22 +119,48 @@
log:info("menu")
local menu = SimpleMenu("menu")
+ -- add an entry for help
+ menu:addItem(
+ {
+ text = self:string('GLOBAL_HELP'),
+ callback = function()
+ self:helpWindow()
+ end
+ }
+ )
-- add an entry for returning everything to defaults
menu:addItem(
{
text = self:string('CUSTOMIZE_RESTORE_DEFAULTS'),
- weights = { 2000 },
callback = function()
self:restoreDefaultsMenu()
return EVENT_CONSUME
end
}
)
- local window = Window("text_list", self:string("CUSTOMIZE_HOME"),
'settingstitle')
- local help_text = Textarea('help_text',
self:string("CUSTOMIZE_HOME_HELP"))
- menu:setHeaderWidget(help_text)
+ -- add an entry for restoring hidden items
+ menu:addItem(
+ {
+ text = self:string("RESTORE_HIDDEN_ITEMS"),
+ callback = function()
+ self:restoreHiddenItemMenu()
+ return EVENT_CONSUME
+ end
+ }
+ )
+ local helpText = Textarea( 'help_text',
self:string('CUSTOMIZE_HOME_HELP') )
+ menu:setHeaderWidget(helpText)
+ local window = Window("text_list", self:string("CUSTOMIZE_HOME"))
window:addWidget(menu)
window:show()
+end
+
+function helpWindow(self)
+ local help_text = Textarea('help_text',
self:string("CUSTOMIZE_HOME_MORE_HELP"))
+ local window = Window("information", self:string("CUSTOMIZE_HOME"))
+ window:addWidget(help_text)
+ window:show()
+
end
function homeMenuItemContextMenu(self, item)
@@ -174,15 +193,10 @@
callback = function()
if item.node == 'home' then
- -- add restore home menu items
at the bottom of the home menu
- local restoreHomeItems =
jiveMain:getNodeItemById('appletCustomizeHomeRestoreHiddenItems',
'advancedSettings')
- local homeItem =
jiveMain:addItemToNode(restoreHomeItems, 'home')
self:_timedExec(
function()
-
self:getSettings()[homeItem.id] = 'home'
jiveMain:setNode(item, 'hidden')
self:getSettings()[item.id] = 'hidden'
-
jiveMain:itemToBottom(homeItem, 'home')
end
)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua?rev=8997&r1=8996&r2=8997&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
Tue Jul 27 14:59:32 2010
@@ -38,7 +38,6 @@
end
jiveMain:addItem(self:menuItem('appletCustomizeHome', 'settings',
"CUSTOMIZE_HOME", function(applet, ...) applet:menu(...) end, 55, nil,
"hm_appletCustomizeHome"))
- jiveMain:addItem(self:menuItem('appletCustomizeHomeRestoreHiddenItems',
'advancedSettings', "RESTORE_HIDDEN_ITEMS", function(applet, ...)
applet:restoreHiddenItemMenu(...) end, _, nil, _))
end
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt?rev=8997&r1=8996&r2=8997&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
Tue Jul 27 14:59:32 2010
@@ -93,7 +93,7 @@
SV Välj Fortsätt om du vill ta bort alla anpassade
inställningar för menyordning
RESTORE_HIDDEN_ITEMS
- EN Restore Home Menu Items
+ EN Restore Hidden Menu items
REMOVE_FROM_HOME
EN Hide from Home Menu
@@ -105,9 +105,12 @@
EN Select an item to restore to the Home Menu. The following items
have been hidden from view:
CUSTOMIZE_HOME_HELP
- EN By pressing the + button on a selected Settings menu item and
choosing "Add to Home Menu", the item can be added to the Home Menu. Items
already in the Home Menu can be hidden from view via the same method.
+ EN Select help for more information
-CUSTOMIZE_HOME_HELP_FAB4
+CUSTOMIZE_HOME_MORE_HELP
+ EN The home menu of your Squeezebox as well as several submenus
can be customized, both in what items appear on the menu as well as what order
the items take. Pressing the + button on a selected menu item raises a context
menu that presents you with several options for customization of that item.
+
+CUSTOMIZE_HOME_MORE_HELP_FAB4
EN Touch-hold on a selected Settings Menu item and choose "Add to
Home Menu" to add the item to the Home Menu. Items already in the Home Menu can
be hidden from view via the same method.
NONE
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
