Author: bklaas
Date: Tue Mar 9 11:16:38 2010
New Revision: 8642
URL: http://svn.slimdevices.com/jive?rev=8642&view=rev
Log:
r38...@daddymac-520 (orig r8625): bklaas | 2010-03-03 14:56:57 -0500
Bug: n/a
Description: some changes to assist in skin testing debug
r38...@daddymac-520 (orig r8626): bklaas | 2010-03-03 15:25:05 -0500
Fixed Bug: 15823
Description: add hide popup callback to cancel action for rbutton on alarm
window
r38...@daddymac-520 (orig r8627): bklaas | 2010-03-03 16:51:02 -0500
Bug: 12013
Description: clean up title widget button so it uses a label instead of a
nested label in a group
tidy up skins to support that change
add back animation to text label now that it is no longer broken after this
change
r38...@daddymac-520 (orig r8631): ayoung | 2010-03-04 09:05:25 -0500
Re-enable parallelism in builds
r38...@daddymac-520 (orig r8633): bklaas | 2010-03-04 13:39:11 -0500
Fixed Bug: 13607
Description: on track change NP window is now being recreated as a workaround
for making sure windowListeners still work.
When replacing the window, make sure to update the repeat and shuffle buttons
as needed for the new window.
r38...@daddymac-520 (orig r8634): adrian | 2010-03-06 06:19:51 -0500
Bug: N/A
Description: change order of window updates to avoid window transition when
doing automatic update
r38...@daddymac-520 (orig r8635): adrian | 2010-03-06 06:20:43 -0500
Bug: N/A
Description: add smoothscroll state to group widgets, just in case something
calls redraw on a group rather than the widgets inside it
r38...@daddymac-520 (orig r8636): adrian | 2010-03-07 06:07:32 -0500
Bug: N/A
Description: rendering null strings causes an error message - hide it
r38...@daddymac-520 (orig r8637): adrian | 2010-03-07 15:51:16 -0500
Bug: N/A
Description: add IR and touch support for NetTest so it can be used on Touch,
could still do with layout improvements
r38...@daddymac-520 (orig r8638): fmueller | 2010-03-08 08:55:38 -0500
Bug: 14972
Description: Do not remove last known remote SC from music source list so it
can be selected and wake on lan is sent.
r38...@daddymac-520 (orig r8639): agrundman | 2010-03-08 10:11:43 -0500
Add 40x40 playlist icons to build
r38...@daddymac-520 (orig r8641): bklaas | 2010-03-09 10:27:38 -0500
Fixed Bug: 13691
Description: children of NP child windows are also NP child windows
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
7.6/trunk/squeezeos/poky/parabuild/build.sh
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Group.lua
7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c
7.6/trunk/squeezeplay/src/squeezeplay_test/share/applets/SkinTest/SkinTestApplet.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Mar 9 11:16:38 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:8622
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8641
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/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
(original)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
Tue Mar 9 11:16:38 2010
@@ -2,7 +2,7 @@
LICENSE = "GPL"
PV = "7.5+svnr${SRCREV}"
-PR = "r30"
+PR = "r31"
RDEPENDS += "perl perl-modules libcompress-raw-zlib-perl
libclass-xsaccessor-perl"
RDEPENDS += "libdbi-perl sqlite3 libdbd-sqlite-perl"
@@ -64,7 +64,7 @@
mv ${D}/${prefix}/squeezecenter/HTML
${D}/${prefix}/squeezecenter/HTML.tmp
mkdir -p ${D}/${prefix}/squeezecenter/HTML/Default/html/images
mkdir -p ${D}/${prefix}/squeezecenter/HTML/EN/html/images
- for i in radio.png cover.png playlistclear.png playlistsave.png; do
+ for i in radio.png cover.png playlistclear.png
playlistclear_40x40_m.png playlistsave.png playlistsave_40x40_m.png; do
cp ${D}/${prefix}/squeezecenter/HTML.tmp/Default/html/images/$i
${D}/${prefix}/squeezecenter/HTML/Default/html/images
done
for i in playall.png; do
Modified: 7.6/trunk/squeezeos/poky/parabuild/build.sh
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/parabuild/build.sh?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/parabuild/build.sh (original)
+++ 7.6/trunk/squeezeos/poky/parabuild/build.sh Tue Mar 9 11:16:38 2010
@@ -55,17 +55,15 @@
echo "INHERIT += \"rm_work\"" >> conf/local.conf
# Make build use all available CPUs
-(
- echo BB_NUMBER_THREADS = \"$CPUCOUNT\"
- echo BB_GENERATE_MIRROR_TARBALLS = \"0\"
+echo "BB_NUMBER_THREADS = $CPUCOUNT
+BB_GENERATE_MIRROR_TARBALLS = 0
echo DL_DIR = \"/opt/parabuild/etc/build/poky_dl_dir\"
echo CVSDIR = \"/opt/parabuild/etc/build/poky_cvs_dir\"
echo GITDIR = \"/opt/parabuild/etc/build/poky_git_dir\"
echo SVNDIR = \"/opt/parabuild/etc/build/poky_svn_dir\"
- echo PARALLEL_MAKE = \"-j $CPUCOUNT\"
-) >> conf/local.conf
+PARALLEL_MAKE = \"-j $CPUCOUNT\" " >> conf/local.conf
# Build firmware images, multiple machines can be built here
echo "*** Building ***"
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Tue Mar 9 11:16:38 2010
@@ -512,6 +512,11 @@
menu:setHeaderWidget(headerGroup)
window:setButtonAction('rbutton', 'cancel')
+ window:addActionListener("cancel", self,
+ function()
+ window:hide(Window.transitionNone)
+ end
+ )
window:setButtonAction('lbutton', nil, nil)
window:addWidget(menu)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Tue Mar 9 11:16:38 2010
@@ -833,6 +833,7 @@
function _updateShuffle(self, mode)
+ log:debug("_updateShuffle(): ", mode)
-- don't update this if SC/SN has remapped shuffle button
if self.player then
local playerStatus = self.player:getPlayerStatus()
@@ -849,12 +850,14 @@
return
end
if self.controlsGroup then
+ log:warn("shuffle button style changed to: ",
shuffleModes[token])
self.shuffleButton:setStyle(shuffleModes[token])
end
end
function _updateRepeat(self, mode)
+ log:debug("_updateRepeat(): ", mode)
-- don't update this if SC/SN has remapped repeat button
if self.player then
local playerStatus = self.player:getPlayerStatus()
@@ -871,6 +874,7 @@
return
end
if self.controlsGroup then
+ log:warn("repeat button style changed to: ", repeatModes[token])
self.repeatButton:setStyle(repeatModes[token])
end
end
@@ -1083,9 +1087,13 @@
self.window = _createUI(self)
if self.player and self.player:getPlayerStatus() then
self:_updateButtons(self.player:getPlayerStatus())
+ self:_updateRepeat(self.player:getPlayerStatus()['playlist
repeat'])
+ self:_updateShuffle(self.player:getPlayerStatus()['playlist
shuffle'])
end
self:_refreshRightButton()
self.window:replace(oldWindow, Window.transitionFadeIn)
+
+
end
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Tue Mar 9 11:16:38 2010
@@ -454,8 +454,9 @@
s.title.textButton = _uses(s.title.text, {
padding = 0,
- text = s.title.text,
- })
+ })
+ s.title.pressed = {}
+ s.title.pressed.textButton = s.title.textButton
s.text_block_black = {
hidden = 1,
@@ -866,8 +867,10 @@
s.text_list.title.textButton = _uses(s.text_list.title.text, {
padding = 0,
border = 0,
- text = s.text_list.title.text,
- })
+ })
+ s.text_list.title.pressed = {}
+ s.text_list.title.pressed.textButton = s.text_list.title.textButton
+
-- popup "spinny" window
s.waiting_popup = _uses(s.popup)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
Tue Mar 9 11:16:38 2010
@@ -214,9 +214,6 @@
end
- self:tieAndShowWindow(self.window)
- self.popup:hide()
-
-- if called from meta at restart then reinstall or quit
if self.auto then
if self.reinstall then
@@ -224,9 +221,12 @@
self.todownload = self.reinstall
self:action()
end
- self.window:hide()
+ self.popup:hide()
return
end
+
+ self:tieAndShowWindow(self.window)
+ self.popup:hide()
if self.reinstall then
self.menu:addItem({
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
Tue Mar 9 11:16:38 2010
@@ -25,10 +25,14 @@
local Window = require("jive.ui.Window")
local Textarea = require("jive.ui.Textarea")
local Label = require("jive.ui.Label")
+local Button = require("jive.ui.Button")
+local RadioButton = require("jive.ui.RadioButton")
+local RadioGroup = require("jive.ui.RadioGroup")
local Surface = require("jive.ui.Surface")
local Icon = require("jive.ui.Icon")
local Popup = require("jive.ui.Popup")
local Timer = require("jive.ui.Timer")
+local ContextMenuWindow = require("jive.ui.ContextMenuWindow")
local debug = require("jive.utils.debug")
@@ -75,6 +79,8 @@
}
})
+ local title = Button(Label("textButton",
self:string('SETUPNETTEST_TESTING')), function() self:showContextMenu() end)
+ self.window:setIconWidget("text", title)
self:tieAndShowWindow(self.window)
local timer = Timer(1000, function()
self.window:addWidget(Textarea("text", self:string('SETUPNETTEST_NOSERVER')))
end, true)
@@ -108,7 +114,7 @@
self.window:focusWidget(nil)
self.window:addActionListener("add", self, _event_handler)
self.window:addActionListener("go", self, _event_handler)
- self.window:addListener(EVENT_SCROLL,
+ self.window:addListener(EVENT_SCROLL | EVENT_IR_ALL,
function(event)
return _event_handler(self, event)
end
@@ -127,11 +133,12 @@
local type = event:getType()
- if type == EVENT_SCROLL then
+ if type == EVENT_SCROLL or
+ (type == EVENT_IR_DOWN and (event:isIRCode("arrow_up") or
event:isIRCode("arrow_down"))) then
local rate = self.rate or 0
local index = self.index[rate] or 1
- if event:getScroll() > 0 then
+ if (type == EVENT_SCROLL and event:getScroll() > 0) or (type ==
EVENT_IR_DOWN and event:isIRCode("arrow_down")) then
if index < #self.rates then index = index + 1 end
else
if index > 1 then index = index - 1 end
@@ -155,6 +162,11 @@
return EVENT_CONSUME
end
+ if type == EVENT_IR_DOWN and event:isIRCode("arrow_right") then
+ self:showHelpWindow()
+ return EVENT_CONSUME
+ end
+
return EVENT_UNUSED
end
@@ -168,6 +180,37 @@
self:tieAndShowWindow(window)
return window
+end
+
+
+function showContextMenu(self)
+ local window = ContextMenuWindow(self:string('SETUPNETTEST_TESTING'))
+ local menu = SimpleMenu("menu")
+ local group = RadioGroup()
+
+ for index, rate in ipairs(self.rates) do
+ menu:addItem({
+ text = rate .. " kbps",
+ style = 'item_choice',
+ check = RadioButton("radio",
+ group,
+ function(_,
isSelected)
+
self:startTest(rate)
+ end,
+ rate ==
self.rate
+ )
+ })
+ end
+
+ menu:addItem({
+ text = self:string('SETUPNETTEST_INFO'),
+ callback = function()
+ self:showHelpWindow()
+ end
+ })
+
+ window:addWidget(menu)
+ self:tieAndShowWindow(window)
end
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
Tue Mar 9 11:16:38 2010
@@ -23,30 +23,29 @@
return 1, 1
end
-
-function registerApplet(meta)
- jnt:subscribe(meta)
-
- meta.menu = meta:menuItem('appletSetupNetTest', 'hidden',
meta:string('SETUPNETTEST'), function(applet, ...) applet:open(...) end, 100)
- -- add the menu item to homeMenu but 'hidden', or else the
playerCurrent notification method below quits happening (not sure why this is
the case, but it is)
- -- item will be made visible by moving it to advancedSettings in the
playerCurrent notification below
- jiveMain:addItem(meta.menu)
+function registerApplet(self)
+ jnt:subscribe(self)
+ self.menu = self:menuItem('appletSetupNetTest', 'hidden',
self:string("SETUPNETTEST"), function(applet, ...) applet:open(...) end, 100)
+ -- to begin with, we place this in the 'hidden' node
+ jiveMain:addItem(self.menu)
end
--- hide menu item when player goes away
-function notify_playerDelete(meta, player)
- jiveMain:removeItemFromNode(meta.menu, 'advancedSettings')
+function notify_serverConnected(self, server)
+ self:_checkServer()
end
-function notify_playerCurrent(meta, player)
- -- don't show this item if the player object:
- -- a. doesn't exist
- -- b. isn't connected to a server (now possible)
- -- c. connected to SN
- if player == nil or not player:getSlimServer() or (
player:getSlimServer() and player:getSlimServer():isSqueezeNetwork() ) then
- jiveMain:removeItemFromNode(meta.menu, 'advancedSettings')
- else
- jiveMain:setCustomNode('appletSetupNetTest', 'advancedSettings')
- end
+function notify_serverDisconnected(self, server)
+ self:_checkServer()
end
+function _checkServer(self)
+ for _, server in appletManager:callService("iterateSqueezeCenters") do
+ if server:isConnected() and not server:isSqueezeNetwork() then
+ -- found a local server - show menu entry
+ jiveMain:setCustomNode('appletSetupNetTest',
'advancedSettings')
+ return
+ end
+ end
+ -- hide menu entry
+ jiveMain:removeItemFromNode(self.menu, 'advancedSettings')
+end
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
Tue Mar 9 11:16:38 2010
@@ -124,7 +124,7 @@
CS Pro výbÄr rychlosti testovánà dat použijte koleÄko a
nechte bÄžet test po stanovenou dobu.\n\nHornà graf ukazuje aktuálnÃ
výkon sÃtÄ jakožto zlomek rychlosti testu.\n\nNa spodnÃm grafu je
znázornÄna historie výsledků testů, které jsou seskupeny do
výkonnostnÃch pásem a oznaÄeny barevnÄ: ÄervenÄ, žlutÄ a
zelenÄ.\n\nDobrá výkonnost sÃtÄ je indikována minimálnÃm množstvÃm
klipů v hornÃm grafu a pouze zelenými liÅ¡tami na spodnÃm grafu.
\n\nVidÃte-li mnoho klipů v hornÃm grafu a výrazné Äervené liÅ¡ty na
spodnÃm grafu, výkonnost sÃtÄ nenà pÅijatelná pro pÅehrávánÃ
datových proudů pÅi této datové rychlosti.
DA Brug drejeknappen til at vælge den datahastighed der skal
bruges i testen, og lad testen køre i et stykke tid.\n\nDen øverste graf
viser den nuværende netværkshastighed som en procentdel af
testhastigheden.\n\nDen nederste graf viser en oversigt over testresultaterne,
der er grupperet efter hastighed og farvet hhv. røde, gule og grønne.\n\nEn
god netværksforbindelse er kendetegnet ved at der kun er minimale drop i den
øverste graf og udelukkende grønne bjælker i den nederste.\n\nHvis der er
mange drop i den øverste graf og en del røde bjælker i den nederste, er
netværksforbindelsen sandsynligvis ikke god nok til at der kan streames med
denne datahastighed.
DE Wählen Sie mit dem Rad eine Datenrate, um sie zu testen und
lassen Sie den Test eine gewisse Zeit laufen.\n\nDer obere Graph zeigt die
aktuelle Netzwerkleistung als Bruch der Testrate.\n\nDer untere Graph zeigt den
Verlauf der Testergebnisse nach Leistungsgruppen (Rot, Bernstein und Grün)
geordnet.\n\nDie Netzwerkleistung ist gut, wenn geringe Abfälle im oberen
Graphen und nur grüne Balken im unteren Graphen angezeigt werden.\n\nEnthält
der obere Graph viele Abfälle und der untere viele rote Balken, ist die
Netzwerkleistung eventuell zur Ãbertragung mit dieser Datenrate nicht
ausreichend.
- EN Use the scroll wheel to select a data rate to test at and leave
the test running for a period of time.\n\nThe top graph shows the current
network performance as a fraction of the test rate.\n\nThe lower graph shows
the history of test results grouped into performance bands which are colour
coded Red, Amber and Green.\n\nGood network performance is indicated by minimal
dips in the top graph and only Green bars on the lower graph.\n\nIf you see
frequent dips in the top graph and significant Red bars on the lower graph,
network performance may not be acceptable for streaming at this data rate.
+ EN Select a data rate to test at and leave the test running for a
period of time.\n\nThe top graph shows the current network performance as a
fraction of the test rate.\n\nThe lower graph shows the history of test results
grouped into performance bands which are colour coded Red, Amber and
Green.\n\nGood network performance is indicated by minimal dips in the top
graph and only Green bars on the lower graph.\n\nIf you see frequent dips in
the top graph and significant Red bars on the lower graph, network performance
may not be acceptable for streaming at this data rate.
ES Utilice la rueda de desplazamiento para seleccionar la
velocidad de datos a la que desea realizar la prueba y deje la prueba en
ejecución durante un tiempo.\n\nEl gráfico superior muestra el rendimiento
actual de la red en forma de fracción de la velocidad de la prueba.\n\nEl
gráfico inferior muestra el historial de los resultados de la prueba, los
cuales se agrupan mediante colores según el rendimiento: rojo, ámbar y
verde.\n\nSi el rendimiento es bueno, el gráfico superior mostrará pocas
bajadas y sólo se verán barras verdes en el gráfico inferior.\n\nSi ve
muchas bajadas en el gráfico superior y bastantes barras rojas en el gráfico
inferior, puede que el rendimiento de la red no sea suficiente para transmitir
por secuencias a esta velocidad de datos.
FI Valitse testattava siirtonopeus vierityskiekolla ja anna testin
olla käynnissä jonkin aikaa.\n\nYläkaaviossa näkyy verkon suorituskyky
testinopeuden osana.\n\nAlakaaviossa näkyvät aiemmat testitulokset
ryhmitettyinä suorituskykykaistoihin, jotka ovat väreiltään punaisia,
keltaisia ja vihreitä.\n\nHyvä verkon suorituskyky näkyy minimaalisina
pudotuksina yläkaaviossa ja pelkästään vihreinä palkkeina
alakaaviossa.\n\nJos yläkaaviossa näkyy useita pudotuksia ja alakaaviossa on
huomattavasti punaisia palkkeja, verkon suorituskyky ei ehkä riitä
virtauttamiseen tällä siirtonopeudella.
FR Utilisez la molette pour sélectionner un débit à tester et
laissez le test s'exécuter pour une certaine période.\n\nLe graphique
supérieur illustre la performance actuelle du réseau en pour cent du débit
testé.\n\nLe graphique inférieur affiche l'historique des résultats du test
groupés d'après leur performance, signalée par les couleurs rouge, orange et
vert.\n\nUn graphique supérieur ne présentant que des baisses minimales et un
graphique inférieur ne contenant que des barres vertes témoignent d'un bon
niveau de performance du réseau.\n\nL'apparition fréquente de baisses dans le
graphique supérieur et de barres rouges dans le graphique inférieur indiquent
que le niveau de performance du réseau n'est probablement pas suffisant pour
diffuser à ce débit.
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=8642&r1=8641&r2=8642&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
Tue Mar 9 11:16:38 2010
@@ -2519,10 +2519,9 @@
-- it will turn the title text into a button in unwanted spots
along XMLBrowse trees
if containerContextMenu and containerContextMenu.cmd and
containerContextMenu.cmd[1] == 'contextmenu' then
log:debug('Turn the title text into a button')
- local titleText = Label("text", windowSpec.text)
local titleWidget = Group('title', {
text = Button(
- Group( "textButton", {
titleText } ),
+ Label("textButton",
windowSpec.text),
function()
local step, sink =
_newDestination(_getCurrentStep(), item, _newWindowSpec(db, item, true),
_browseSink, containerContextMenu)
local from, qty
@@ -2539,9 +2538,6 @@
rbutton = _nowPlayingButton(),
})
window:setTitleWidget(titleWidget)
- --FIXME: the animation in the textButton widget yields
a broken UI
- -- Possibly part of Bug 15557
- titleText:animate(false)
titleWidgetComplete = true
end
end
@@ -2611,6 +2607,7 @@
sink = false, -- sink closure embedding this step
data = data, -- data (generic)
actionModifier = false, -- modifier
+ _isNpChildWindow = origin and origin._isNpChildWindow,
--children of NP children are also NP children
}
log:debug("new step: " , step)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
Tue Mar 9 11:16:38 2010
@@ -195,13 +195,22 @@
-- removes old servers
local function _squeezeCenterCleanup(self)
local now = Framework:getTicks()
+ local settings = self:getSettings()
for i, server in SlimServer.iterate() do
if not server:isConnected() and
now - server:getLastSeen() > DISCOVERY_TIMEOUT then
-
- log:debug("Removing server ", server)
- server:free()
+
+ -- Bug 14972: Do not remove last known remote SC from
music source list.
+ -- This allows to select it as music source and send
wake on lan.
+ if (server.id == settings.serverUuid) and
+ (server.name == settings.serverName) and
+ (server.mac ~= nil) then
+ log:debug("SC cleanup: Leave last known remote
SC in list: ", server)
+ else
+ log:debug("SC cleanup: Removing server ",
server)
+ server:free()
+ end
end
end
end
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
Tue Mar 9 11:16:38 2010
@@ -574,9 +574,9 @@
sh = NONE,
}
}
- s.title.textButton = _uses(s.title.text, {
- text = s.title.text
- })
+ s.title.textButton = s.title.text
+ s.title.pressed = {}
+ s.title.pressed.textButton = s.title.textButton
s.text_block_black = {
bgImg = Tile:fillColor(0x000000ff),
@@ -1040,9 +1040,10 @@
},
},
})
- s.text_list.title.textButton = _uses(s.text_list.title.text, {
- text = s.text_list.title.text,
- })
+ s.text_list.title.textButton = s.text_list.title.text
+
+ s.text_list.title.pressed = {}
+ s.text_list.title.pressed.textButton = s.text_list.title.textButton
-- choose player window. identical to text_list on all windows except
WQVGAlarge, which needs to show the icon
s.choose_player = _uses(s.text_list, {
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Tue Mar 9 11:16:38 2010
@@ -809,9 +809,7 @@
s.title.textButton = _uses(s.title.text, {
bgImg = titlebarButtonBox,
- text = _uses(s.title.text, {
- padding = { 4, 15, 4, 15 },
- }),
+ padding = { 4, 15, 4, 15 },
})
s.title.pressed = {}
@@ -1483,14 +1481,12 @@
s.text_list.title.textButton = _uses(s.text_list.title.text, {
bgImg = titlebarButtonBox,
- text = _uses(s.text_list.title.text, {
- padding = { 4, 15, 4, 15 },
- }),
+ padding = { 4, 15, 4, 15 },
})
s.text_list.title.pressed = {}
s.text_list.title.pressed.textButton = _uses(s.text_list.title.text, {
bgImg = pressedTitlebarButtonBox,
- text = _uses(s.text_list.title.text, { h = WH_FILL }),
+ padding = { 4, 15, 4, 15 },
})
-- choose player window is exactly the same as text_list on all windows
except WQVGAlarge
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Group.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Group.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Group.lua (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Group.lua Tue Mar 9
11:16:38 2010
@@ -236,6 +236,7 @@
for _,widget in pairs (self.widgets) do
widget:setSmoothScrollingMenu(val)
end
+ self.smoothscroll = val
end
--[[
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_font.c Tue Mar 9
11:16:38 2010
@@ -238,6 +238,11 @@
#endif //JIVE_PROFILE_BLIT
SDL_Color clr;
SDL_Surface *srf;
+
+ // don't call render for null strings as it produces an error which we
want to hide
+ if (*str == '\0') {
+ return NULL;
+ }
clr.r = (color >> 24) & 0xFF;
clr.g = (color >> 16) & 0xFF;
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_test/share/applets/SkinTest/SkinTestApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_test/share/applets/SkinTest/SkinTestApplet.lua?rev=8642&r1=8641&r2=8642&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_test/share/applets/SkinTest/SkinTestApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_test/share/applets/SkinTest/SkinTestApplet.lua
Tue Mar 9 11:16:38 2010
@@ -139,6 +139,7 @@
sound = "WINDOWSHOW",
callback = function()
item[3](self, item):show()
+ self:showStack()
end,
})
end
@@ -478,6 +479,7 @@
menu:setHeaderWidget(headerGroup)
window:setButtonAction('rbutton', 'cancel')
+ window:addActionListener("cancel", self, function()
window:hide(Window.transitionNone) end )
window:setButtonAction('lbutton', nil, nil)
window:addWidget(menu)
@@ -862,6 +864,7 @@
local group = Group("group", {
text = Textarea("toast_popup_textarea", data[1])
+ --text = Label("text", data[1])
})
popup:addWidget(group)
@@ -870,6 +873,13 @@
return popup
end
+function showStack(self)
+ local stack = Framework.windowStack
+ for i in ipairs(stack) do
+ log:warn(stack[i])
+ end
+end
+
--[[
Popup: "toast_popup"
Group: "group"
@@ -1209,7 +1219,8 @@
{ "3121\nPrince - Some Very Long Album Title That Goes off
Screen" },
},
toast_popup = {
- "Your toast_popup is done",
+ "Your toast_popup is done\nline 2 has more information\nYour
toast_popup is done\nline 2 has more information\nYour toast_popup is
done\nline 2 has more information\nYour toast_popup is done\nline 2 has more
information\nYour toast_popup is done\nline 2 has more information\nYour
toast_popup is done\nline 2 has more information\nYour toast_popup is
done\nline 2 has more information\nYour toast_popup is done\nline 2 has more
information",
+ --"Your toast_popup is done\nline 2 has more information",
},
toast_popup_withicon = {
"United States. A country of central and northwest North
America with coastlines on the Atlantic and Pacific oceans.",
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
