[Jive-Checkins] r8358 - in /7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter: SqueezeCenterApplet.lua strings.txt

[bklaas]

Author: bklaas
Date: Fri Jan 15 13:55:58 2010
New Revision: 8358

URL: http://svn.slimdevices.com/jive?rev=8358&view=rev
Log:
Bug: n/a
Description: better menu items on window after attaching removable storage.
The My Music item isn't working as desired, so that one is commented out right 
now.

Modified:
    
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
    
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt

Modified: 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
 (original)
+++ 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
 Fri Jan 15 13:55:58 2010
@@ -1026,23 +1026,65 @@
 
        local menu = SimpleMenu("menu")
 
-       local itemCallback
+
        if item.SCDrive then
-               itemCallback = function()
-                       self:settingsShow()
-                       window:hide()
-               end
+
+
+               -- Server status
+               menu:addItem({
+                       text = self:string("SERVER_STATUS"),
+                       iconStyle = 'hm_advancedSettings',
+                       sound = "WINDOWSHOW",           
+                       callback = function()
+                               self:settingsShow()
+                               window:hide()
+                       end,
+               })
+
+               -- My Music
+               --[[ FIXME: does not provide a positive user experience yet. 
Going to My Music when scan is just starting yields not good behavior
+               menu:addItem({
+                       text = self:string("MY_MUSIC"),
+                       iconStyle = 'hm_appletCustomizeHome',
+                       sound = "WINDOWSHOW",           
+                       callback = function()
+                               --Framework:pushAction("go_music_library")
+                               --window:hide()
+                               log:warn('my music!')
+                               if jiveMain:getMenuTable()['_myMusic'] then
+                                      Framework:playSound("JUMP")
+                                       
debug.dump(jiveMain:getMenuTable()['_myMusic'])
+                                       
jiveMain:getMenuTable()['_myMusic'].callback(nil, nil, true)
+                               else
+                                       log:warn('_myMusic not found')
+                               end
+                       end
+               })
+               --]]
+
+               -- Eject item
+               local ejectToken = 'EJECT_CONFIRM_ITEM'
+               if item.devType then
+                       ejectToken = 'EJECT_' .. item.devType
+               end
+               menu:addItem({
+                       text = self:string(ejectToken),
+                       iconStyle = 'hm_eject',
+                       sound = "WINDOWSHOW",           
+                       callback = function()
+                               self:_confirmEject(devName)
+                       end,
+               })
        else
-               itemCallback = function()
-                       window:hide()
-               end
-       end
-       menu:addItem({
-               text = self:string("OK"),
-               style = 'item',
-               sound = "WINDOWSHOW",           
-               callback = itemCallback,
-       })
+               menu:addItem({
+                       text = self:string("OK"),
+                       style = 'item',
+                       sound = "WINDOWSHOW",           
+                       callback = function()
+                               window:hide()
+                       end,
+               })
+       end
 
        menu:setHeaderWidget(Textarea("help_text", 
self:string("EJECT_WARNING_INFO")))
 

Modified: 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt
 (original)
+++ 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt
 Fri Jan 15 13:55:58 2010
@@ -694,3 +694,32 @@
        RU      Повторите попытку
        SV      Försök igen
 
+SERVER_STATUS
+       CS      Stav Squeezebox Server
+       DA      Status for Squeezebox Server
+       DE      Squeezebox Server-Status
+       EN      Squeezebox Server Status
+       ES      Estado de Squeezebox Server
+       FI      Squeezebox Serverin tila
+       FR      Etat du Squeezebox Server
+       IT      Stato di Squeezebox Server
+       NL      Status van Squeezebox Server
+       NO      Status for Squeezebox Server
+       PL      Stan programu Squeezebox Server
+       RU      Статус Squeezebox Server
+       SV      Squeezebox Server-status
+
+MY_MUSIC
+       CS      Hudba
+       DA      Musik
+       DE      Eigene Musik
+       EN      My Music
+       ES      Mi música
+       FI      Omat musiikkitiedostot
+       FR      Ma musique
+       IT      Musica
+       NL      Mijn muziek
+       NO      Min musikk
+       PL      Moja muzyka
+       RU      Моя музыка
+       SV      Min musik

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins