[Jive-Checkins] r8524 - in /7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser: SlimBrowserApplet.lua strings.txt

Thu, 18 Feb 2010 12:42:10 -0800 

Author: bklaas
Date: Thu Feb 18 12:42:06 2010
New Revision: 8524

URL: http://svn.slimdevices.com/jive?rev=8524&view=rev
Log:
Fixed Bug: 15674
Description: Add Switch Library as the 2nd choice in a server connection error 
screen from SlimBrowser
Use string for Switch Library instead of Choose Music Source for consistency

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=8524&r1=8523&r2=8524&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
 Thu Feb 18 12:42:06 2010
@@ -3012,6 +3012,18 @@
                })
        end
 
+       if _anyCompatibleSqueezeCenterFound() then
+               menu:addItem({
+                                    text = 
self:string("SLIMBROWSER_CHOOSE_MUSIC_SOURCE"),
+                                    callback = function()
+                                                       self.inSetup = false
+                                                       
self:_removeRequestAndUnlock(server)
+                                                       
appletManager:callService("selectCompatibleMusicSource")
+                                               end,
+                                    sound = "WINDOWSHOW",
+                            })
+       end
+       
        if not self.inSetup then
                --bug 12843 - offer "go home" (rather than try to autoswitch) 
since it is difficult/impossible to autoswitch to the desired item.
                menu:addItem({
@@ -3021,6 +3033,7 @@
                                        goHome()
                                end,
                        })
+
 
                        -- change player, only if multiple players
                        -- NOTE also only display this if we have a player 
selected, this is
@@ -3050,17 +3063,7 @@
                window:setAllowScreensaver(false)
                --Offer local SC's in setup if they exist
                if Player:getCurrentPlayer() then
-                       if _anyCompatibleSqueezeCenterFound() then
-                               menu:addItem({
-                                                    text = 
self:string("SLIMBROWSER_CHOOSE_MUSIC_SOURCE"),
-                                                    callback = function()
-                                                                       
self.inSetup = false
-                                                                       
self:_removeRequestAndUnlock(server)
-                                                                       
appletManager:callService("selectCompatibleMusicSource")
-                                                               end,
-                                                    sound = "WINDOWSHOW",
-                                            })
-                       end
+                       -- don't offer choose player if the current player can 
be selected
                else
                        menu:addItem({
                                             text = 
self:string("SLIMBROWSER_CHOOSE_PLAYER"),
@@ -3079,22 +3082,6 @@
                                sound = "WINDOWSHOW",
                        })
        end
-       -- change music source, only for udap players
---     if player and player:canUdap() and 
appletManager:hasApplet("SetupSqueezebox") then
---             menu:addItem({
---                                  text = 
self:string("SLIMBROWSER_CHOOSE_MUSIC_SOURCE"),
---                                  callback = function()
---                                                     
self:_removeRequestAndUnlock(server)
---                                                     
appletManager:callService("selectMusicSource")
---
---                                                     --todo autoswitch - 
test Receiver setup
-----                                                   
appletManager:callService("setCurrentPlayer", nil)
-----                                                   
appletManager:callService('startSqueezeboxSetup', player:getMacAddress(), nil)
---                                             end,
---                                  sound = "WINDOWSHOW",
---                          })
---     end
-
 
        local cancelAction =    function ()
                                        self:_removeRequestAndUnlock(server)

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=8524&r1=8523&r2=8524&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 
Thu Feb 18 12:42:06 2010
@@ -153,19 +153,19 @@
        SV      Försök igen
 
 SLIMBROWSER_CHOOSE_MUSIC_SOURCE
-       CS      Zvolit zdroj hudby
-       DA      Vælg musikkilde
-       DE      Musikquelle wählen
-       EN      Choose Music Source
-       ES      Elija origen de música
-       FI      Valitse musiikkilähde
-       FR      Sélection d'une source musicale
-       IT      Scegliere la sorgente musicale
-       NL      Muziekbron kiezen
-       NO      Velg musikkilde
-       PL      Wybierz źródło muzyki
-       RU      Выберите источник музыки
-       SV      Välj musikkälla
+       CS      Přepnout knihovnu
+       DA      Skift bibliotek
+       DE      Bibliothek umschalten
+       EN      Switch Library
+       ES      Cambiar biblioteca
+       FI      Vaihda kirjastoa
+       FR      Changer de collection
+       IT      Cambia libreria
+       NL      Bibliotheek veranderen
+       NO      Bytt bibliotek
+       PL      Przełącz bibliotekę
+       RU      Сменить медиатеку
+       SV      Byt bibliotek
 
 SLIMBROWSER_CHOOSE_PLAYER
        CS      Zvolit přehrávač

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

Reply via email to