Author: bklaas
Date: Fri Apr 30 11:46:24 2010
New Revision: 8759

URL: http://svn.slimdevices.com/jive?rev=8759&view=rev
Log:
 r39...@daddymac (orig r8754):  bklaas | 2010-04-29 15:28:39 -0500
 Bug: n/a
 Description: data.window can be transformed after useSimpleMenuOverlay boolean 
is set, so just query data.window directly in the if clause
 
 r39...@daddymac (orig r8755):  mherger | 2010-04-30 08:28:47 -0500
 Bug: 15827
 Bug: 15734
 Description: add "Browse folder for images" item to media menu and 
ImageViewer. Allow setting a folder as the source for the ImageViewer 
screensaver using a contexte menu on folders and files.
 r39...@daddymac (orig r8756):  bklaas | 2010-04-30 09:03:02 -0500
 Bug: 15734
 Description: s/can not/cannot/i
 http://www.dailywritingtips.com/cannot-or-can-not/
 
 r39...@daddymac (orig r8757):  bklaas | 2010-04-30 10:55:34 -0500
 Bug: 15827
 Description:
 Sort media manager menu by weight, then alpha
 Push eject item to bottom of media manager menu
 
 Add support in mmOnEjectHanlders for ejectWarningText and ejectWarningText 
conditionals
 allows for appended text on the eject confirmation window, e.g. things like 
"This drive is running SBS. Ejecting will stop playback"
 
 Remove subtext line again from Starting Squeezebox Server spinny popup, 
because of bug 16157
 Fix improperly dereferenced table in _scDrive() method
 
 Add EN string for SBS drive eject warning
 

Modified:
    7.6/trunk/   (props changed)
    
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceLocalStorage.lua
    
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
    
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerMeta.lua
    7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/strings.txt
    
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
    
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
    
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerMeta.lua
    
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
    
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
    
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt

Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Apr 30 11:46:24 2010
@@ -13,7 +13,7 @@
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8750
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8757
 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/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceLocalStorage.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceLocalStorage.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceLocalStorage.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceLocalStorage.lua
 Fri Apr 30 11:46:24 2010
@@ -51,6 +51,16 @@
                obj.pathOverride = paramOverride.path
        end
 
+       if paramOverride and paramOverride.startImage then
+               log:debug("start slideshow with image: ", 
paramOverride.startImage)
+               obj.startImage = paramOverride.startImage
+       end
+
+       if paramOverride and paramOverride.noRecursion then
+               log:debug("don't search subfolders")
+               obj.noRecursion = true
+       end
+
        return obj
 end
 
@@ -89,7 +99,7 @@
                                
                                                local fullpath = nextfolder .. 
"/" .. f
                        
-                                               if lfs.attributes(fullpath, 
"mode") == "directory" then
+                                               if (not self.norecursion) and 
lfs.attributes(fullpath, "mode") == "directory" then
                
                                                        -- push this directory 
on our list to be scanned
                                                        
table.insert(dirstoscan, fullpath)
@@ -100,8 +110,13 @@
                                                                        or 
string.find(string.lower(fullpath), "%ppng") 
                                                                        or 
string.find(string.lower(fullpath), "%pbmp") 
                                                                        or 
string.find(string.lower(fullpath), "%pgif") then
+                                                               
                                                                -- 
log:info(fullpath)
                                                                
table.insert(self.imgFiles, fullpath)
+                                                               
+                                                               if 
self.startImage and self.startImage == f then
+                                                                       
self.currentImage = #self.imgFiles - 1
+                                                               end
                                                        end
                                                end
                                        

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
 Fri Apr 30 11:46:24 2010
@@ -31,6 +31,7 @@
 local Framework                = require("jive.ui.Framework")
 local Font                     = require("jive.ui.Font")
 local Icon                     = require("jive.ui.Icon")
+local Textarea      = require("jive.ui.Textarea")
 local Label                    = require("jive.ui.Label")
 local Group                    = require("jive.ui.Group")
 local RadioButton      = require("jive.ui.RadioButton")
@@ -120,33 +121,151 @@
 end
 
 function openImageViewer(self)
-       -- two item menu that shows start slideshow and settings
        local window = Window("text_list", self:string('IMAGE_VIEWER'))
-       window:addWidget(
-               SimpleMenu("menu",
+       
+       local menu = SimpleMenu("menu", {
                {
-                       {
-                               text = 
self:string("IMAGE_VIEWER_START_SLIDESHOW"), 
-                               sound = "WINDOWSHOW",
-                               callback = function(event, menuItem)
-                                       self:startSlideshow(false)
-                                       return EVENT_CONSUME
-                               end
-                       },
-                       {
-                               text = self:string("IMAGE_VIEWER_SETTINGS"), 
-                               sound = "WINDOWSHOW",
-                               callback = function()
-                                       self:openSettings()
-                                       return EVENT_CONSUME
-                               end
-                       },
-               }
-               )
-       )
+                       text = self:string("IMAGE_VIEWER_START_SLIDESHOW"), 
+                       sound = "WINDOWSHOW",
+                       callback = function(event, menuItem)
+                               self:startSlideshow(false)
+                               return EVENT_CONSUME
+                       end
+               },
+               {
+                       text = self:string("IMAGE_VIEWER_SETTINGS"), 
+                       sound = "WINDOWSHOW",
+                       callback = function()
+                               self:openSettings()
+                               return EVENT_CONSUME
+                       end
+               },
+       })
+       
+       if System:hasLocalStorage() then
+               menu:insertItem({
+                       text = self:string("IMAGE_VIEWER_BROWSE_MEDIA"), 
+                       sound = "WINDOWSHOW",
+                       callback = function(event, menuItem)
+                               self:browseFolder("/media")
+                               return EVENT_CONSUME
+                       end
+               }, 1)
+       end
+       
+       window:addWidget(menu)
        self:tieAndShowWindow(window)
        return window
 end
+
+function browseFolder(self, folder, title)
+       local window = Window("text_list", title or folder)
+
+       log:info("Browse folder for images: " .. folder)
+
+       -- verify validity of the directory
+       if lfs.attributes(folder, "mode") ~= 'directory' then
+               local text = Textarea("text", 
tostring(self:string("IMAGE_VIEWER_INVALID_FOLDER")) .. "\n" .. folder)
+       
+               window:addWidget(text)
+               self:tieAndShowWindow(window)
+               return window
+       end     
+
+       local menu = SimpleMenu("menu")
+
+       for f in lfs.dir(folder) do
+               -- exclude any dot file (hidden files/directories)
+               if (string.sub(f, 1, 1) ~= ".") then
+       
+                       local fullpath = folder .. "/" .. f
+
+                       if lfs.attributes(fullpath, "mode") == "directory" then
+                               menu:addItem({
+                                       text = f,
+                                       sound = "WINDOWSHOW",
+--                                     icon = "icon_folder",
+                                       callback = function()
+                                               self:browseFolder(fullpath, f)
+                                       end
+                               })
+
+                       elseif lfs.attributes(fullpath, "mode") == "file" then
+                               -- check for supported file type
+                               if string.find(string.lower(fullpath), 
"%pjpe*g")
+                                               or 
string.find(string.lower(fullpath), "%ppng") 
+                                               or 
string.find(string.lower(fullpath), "%pbmp") 
+                                               or 
string.find(string.lower(fullpath), "%pgif") then
+                                       -- log:info(fullpath)
+                                       menu:addItem({
+                                               text = f,
+                                               sound = "WINDOWSHOW",
+                                               style = "item_no_arrow",
+                                               callback = function()
+                                                       
self:startSlideshow(false, ImageSourceLocalStorage(self, {
+                                                               path = folder,
+                                                               startImage = f,
+                                                               noRecursion = 
true
+                                                       }))
+                                               end
+                                       })
+                               end
+                       end
+               
+               end
+       end
+
+       if menu:numItems() > 0 then
+               -- allow setting the path for the screensaver mode from a 
folder context menu
+               window:addActionListener("add", menu, function (menu)
+                       local item = menu:getSelectedItem()
+                       local path = folder
+                       
+                       if item:getWidgetValue('text') then
+                               path = path .. '/' .. 
item:getWidgetValue('text')
+
+                               -- if current item is a file, use its folder
+                               if lfs.attributes(path, "mode") == "file" then
+                                       path = folder
+                               end
+                       end
+                       
+                       if item and path and lfs.attributes(path, "mode") == 
"directory" then
+                               local window = 
ContextMenuWindow(self:string("IMAGE_VIEWER"))
+               
+                               local menu = SimpleMenu("menu", {
+                                       {
+                                               text = 
tostring(self:string("IMAGE_VIEWER_CURRENT_FOLDER")) .. "\n" .. path,
+                                               style = "item_info"
+                                       },
+                                       {
+                                               text = 
self:string("IMAGE_VIEWER_USE_FOLDER"),
+                                               sound = "CLICK",
+                                               callback = function()
+                                                       
self:getSettings()["card.path"] = path
+                                                       
self:getSettings()["source"] = "storage"
+                                                       self:storeSettings()
+                                                       window:hide()
+                                                       return EVENT_CONSUME
+                                               end
+                                       },
+                               })
+                               
+                               window:addWidget(menu)
+                               window:show()
+                       end 
+
+                       return EVENT_CONSUME
+               end)
+               window:addWidget(menu)
+       else
+               window:addWidget(Textarea("text", 
self:string("IMAGE_VIEWER_EMPTY_LIST")))
+       end
+       
+       self:tieAndShowWindow(window)
+       return window
+end
+
 
 function startScreensaver(self)
        log:info("start standard image viewer screensaver")
@@ -475,12 +594,16 @@
        end
 end
 
--- callback called from media manager
+-- callbacks called from media manager
 function mmImageViewerMenu(self, devName)
        log:info('mmImageViewerMenu: ', devName)
        self:startSlideshow(false, ImageSourceLocalStorage(self, { path = 
'/media/' .. devName }))
 end
 
+function mmImageViewerBrowse(self, devName)
+       log:info('mmImageViewerBrowse: ', devName)
+       self:browseFolder('/media/' .. devName)
+end
 
 function free(self)
        log:info("destructor of image viewer")

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerMeta.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerMeta.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerMeta.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerMeta.lua
 Fri Apr 30 11:46:24 2010
@@ -41,6 +41,7 @@
        meta:registerService("unregisterRemoteScreensaver")
        meta:registerService("openRemoteScreensaver")
        meta:registerService("mmImageViewerMenu")
+       meta:registerService("mmImageViewerBrowse")
 end
 
 
@@ -58,6 +59,11 @@
        appletManager:callService("mmRegisterMenuItem", {
                serviceMethod = "mmImageViewerMenu",
                menuText      = self:string('IMAGE_VIEWER_START_SLIDESHOW')
+       })
+
+       appletManager:callService("mmRegisterMenuItem", {
+               serviceMethod = "mmImageViewerBrowse",
+               menuText      = self:string('IMAGE_VIEWER_BROWSE_IMAGES')
        })
 end
 

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/strings.txt?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/strings.txt 
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ImageViewer/strings.txt 
Fri Apr 30 11:46:24 2010
@@ -636,6 +636,12 @@
 #
 # Strings for Card Source
 #
+IMAGE_VIEWER_CURRENT_FOLDER
+       EN      Current folder:
+
+IMAGE_VIEWER_USE_FOLDER
+       EN      Use folder as ImageViewer source
+
 IMAGE_VIEWER_CARD_PATH_HELP
        CS      Definuje cestu pro hledání obrázků.
        DA      Definerer søgestien til billeder.
@@ -1063,3 +1069,11 @@
        RU      Сохраненный слайд
        SV      Sparad bild
 
+IMAGE_VIEWER_BROWSE_MEDIA
+       EN      Browse Media
+
+IMAGE_VIEWER_BROWSE_IMAGES
+       EN      Browse for Images
+
+IMAGE_VIEWER_INVALID_FOLDER
+       EN      Cannot open folder:

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 Fri Apr 30 11:46:24 2010
@@ -1350,7 +1350,7 @@
                                end
 
                                -- textarea data for the window
-                               if useSimpleMenuOverlay then
+                               if data.window and ( data.window.textarea or 
data.window.textareaToken ) then
 
                                        if data.window.textareaToken then
                                                data.window.textarea = 
_string(data.window.textareaToken)

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerApplet.lua
 Fri Apr 30 11:46:24 2010
@@ -159,6 +159,8 @@
                        })
                end
        end
+       menu:setComparator(SimpleMenu.itemComparatorWeightAlpha)
+
        window:addWidget(menu)
        self:tieAndShowWindow(window)
        return window
@@ -666,6 +668,7 @@
 
 function mmConfirmEject(self, devName)
        log:info('mmConfirmEject(): ', devName)
+
        local item = self:_getItemFromDevName(devName)
 
        local titleToken   = 'EJECT_CONFIRM'
@@ -696,11 +699,60 @@
                        },
        })
 
-       menu:setHeaderWidget( Textarea("help_text", self:string(confirmToken, 
item and item.devName) ) )
+       local headerTextStrings = {
+               tostring(self:string(confirmToken, devName))
+       }
+       local extraHeaderText = _getExtraHeaderText(self, devName)
+       for k, v in pairs(extraHeaderText) do
+               table.insert(headerTextStrings, v)
+       end
+       local headerText = table.concat(headerTextStrings, "\n")
+       menu:setHeaderWidget( Textarea("help_text", headerText ) )
+       
        window:addWidget(menu)
        self.confirmEjectWindow = window
        self:tieAndShowWindow(window)
        return window
+end
+
+
+function _getExtraHeaderText(self, devName)
+       log:info('compiling ejectWarningText table')
+       local returnTable = {}
+       for k, v in pairs(self.mmOnEjectHandlers) do
+               local insertIt = true
+               if v.ejectWarningText then
+                       if v.ejectWarningTextOnlyIfTrue and 
v.ejectWarningTextOnlyIfFalse then
+                               log:info('needs to return true for 
ejectWarningTextOnlyIfTrue and false for ejectWarningTextOnlyIfFalse to add 
this warning text')
+                               insertIt = 
appletManager:callService(v.ejectWarningTextOnlyIfTrue, devName) 
+                                               and not 
appletManager:callService(v.ejectWarningTextOnlyIfFalse, devName)
+
+                       elseif v.ejectWarningTextOnlyIfTrue then
+                               log:info('ejectWarningTextOnlyIfTrue method 
needs to return true to add this warning text')
+                               insertIt = 
appletManager:callService(v.ejectWarningTextOnlyIfTrue, devName)
+
+                       elseif v.ejectWarningTextOnlyIfFalse then
+                               log:info('ejectTextOnlyIfFalse method needs to 
return false to add this menu item')
+                               insertIt = not 
appletManager:callService(v.ejectTextOnlyIfFalse, devName)
+
+                       else
+                               log:info('no conditional on this eject warning 
text, so add it: ', v.ejectWarningText)
+                       end
+
+                       if insertIt then
+                               log:info('---> add warning text ', 
v.ejectWarningText)
+                               table.insert(returnTable, 
tostring(v.ejectWarningText))
+
+                       else
+                               log:info('---> insertIt says false, so do not 
add ', v.ejectWarningText)
+
+                       end
+
+               end
+
+       end
+       return returnTable
+
 end
 
 

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerMeta.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerMeta.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerMeta.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/MediaManager/MediaManagerMeta.lua
 Fri Apr 30 11:46:24 2010
@@ -43,7 +43,7 @@
                         serviceMethod     = "mmConfirmEject",
                         menuToken         = "EJECT_DRIVE",
                         devNameAsTokenArg = true,
-                       weight            = 10, -- default is 50, so this will 
put it at/near the top
+                       weight            = 1000, -- default is 50, so this 
will put it at/near the bottom
                 }
         )
 

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
 Fri Apr 30 11:46:24 2010
@@ -287,10 +287,13 @@
                popup:addWidget(Icon(icon))
                popup:addWidget(Label("text", self:string(text)))
                
-               if (subtext ~= nil) then popup:addWidget(Textarea("subtext", 
self:string(subtext))) end
+               if (subtext ~= nil) then 
+                       popup:addWidget(Textarea("subtext", 
self:string(subtext))) 
+               end
                
                -- don't hide starting SC popup until scan.json file is detected
                if action == 'start' or action == 'restart' then
+
                        local count = 0
                        popup:addTimer(1000,
                                function()
@@ -431,6 +434,7 @@
        if devName == self:_scDrive() then
                log:warn('stopping server pointed to ', devName)
                self:_stopServer()
+
        else
                log:warn('devName ', devName, ' does not equal ', self.SCDrive)
        end
@@ -578,6 +582,8 @@
                        self:_writeSCPrefsFile(devName)
                        break --table is 1 element long, but breaking here 
can't hurt
                end
+               -- XXX re-enable subtext after bug 16157 is fixed
+               --self:_squeezecenterAction("icon_connecting", 
"STARTING_SQUEEZECENTER", "STARTING_SQUEEZECENTER_TEXT", 5000, "start")
                self:_squeezecenterAction("icon_connecting", 
"STARTING_SQUEEZECENTER", nil, 5000, "start")
                return EVENT_CONSUMED
 
@@ -607,6 +613,8 @@
                                callback = function()
                                        log:debug('write prefs.json file to use 
', devName)
                                        self:_writeSCPrefsFile(devName)
+                                       -- XXX re-enable subtext after bug 
16157 is fixed
+                                       
--self:_squeezecenterAction("icon_connecting", "STARTING_SQUEEZECENTER", 
"STARTING_SQUEEZECENTER_TEXT", 5000, "start")
                                        
self:_squeezecenterAction("icon_connecting", "STARTING_SQUEEZECENTER", nil, 
5000, "start")
                                        self:settingsShow()
                                        window:hide()
@@ -808,7 +816,7 @@
 
 function _scDrive(self)
        local prefsData = self:readSCPrefsFile()
-       if prefsData.devName then
+       if prefsData and prefsData.devName then
                return prefsData.devName
        else
                return false

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
 Fri Apr 30 11:46:24 2010
@@ -55,7 +55,9 @@
        )
        appletManager:callService("mmRegisterOnEjectHandler", 
                {
-               serviceMethod = "mmStopSqueezeCenter"
+               serviceMethod = "mmStopSqueezeCenter",
+               ejectWarningText = 
meta:string('SQUEEZEBOX_SERVER_DISK_EJECT_WARNING'),
+               ejectWarningTextOnlyIfTrue = "isBuiltInSCRunning",
                }
        )
        appletManager:callService("squeezecenterStartupCheck")

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt?rev=8759&r1=8758&r2=8759&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/strings.txt
 Fri Apr 30 11:46:24 2010
@@ -1027,3 +1027,7 @@
 
 SWITCH_MEDIA
        EN      Use %s for Squeezebox Server 
+
+SQUEEZEBOX_SERVER_DISK_EJECT_WARNING
+       EN      Warning: This device is currently running Squeezebox Server. 
All playback from this Squeezebox Server will cease when this drive is ejected.
+

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins

Reply via email to