Author: titmuss
Date: Tue Apr 15 09:06:49 2008
New Revision: 2233
URL: http://svn.slimdevices.com?rev=2233&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2232): titmuss | 2008-04-15 17:06:15 +0100
[EMAIL PROTECTED] (orig r2228): titmuss | 2008-04-14 14:23:18 +0100
Bug: N/A
Description:
Tune kernel configuration, this reduces the boot time by approx 5 seconds by
removing
unused devices. mdev now takes 1.8 seconds, instead of 7.6 seconds.
[EMAIL PROTECTED] (orig r2229): titmuss | 2008-04-14 14:25:56 +0100
Bug: N/A
Description:
Use striped modules.
[EMAIL PROTECTED] (orig r2230): titmuss | 2008-04-14 14:26:15 +0100
Bug: N/A
Description:
Use striped modules.
[EMAIL PROTECTED] (orig r2231): bklaas | 2008-04-14 18:18:35 +0100
Bug: 6907
Description:
create new style 'popupToast' based on albumitem that allows for structured
display of textarea, text, and icon group elements, which may or may not be
present depending on context
tweak paddings of icon and text to better align elements
re-use self.currentsong.window for popup showBrieflys
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/.config
7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_cli
7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_passphrase
7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_supplicant
7.2/trunk/squeezeos/src/s3c2412/modules/usr/sbin/wlanconfig
7.2/trunk/squeezeos/src/system/Makefile
7.2/trunk/squeezeplay/src/Makefile.squeezeos
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Apr 15 09:06:49 2008
@@ -1,5 +1,5 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2223
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2224
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2231
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2232
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.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/.config
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/.config?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/.config (original)
+++ 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/.config Tue Apr 15 09:06:49
2008
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22
-# Thu Apr 3 13:27:53 2008
+# Mon Apr 14 11:50:24 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -307,7 +307,7 @@
# Userspace binary formats
#
CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
#
@@ -424,10 +424,7 @@
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
@@ -517,8 +514,7 @@
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
@@ -598,7 +594,7 @@
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
@@ -610,27 +606,7 @@
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_APPLETOUCH is not set
# CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-# CONFIG_JOYSTICK_XPAD is not set
+# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set
@@ -640,7 +616,6 @@
#
CONFIG_SERIO=y
CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set
@@ -651,17 +626,7 @@
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_ROCKETPORT is not set
-# CONFIG_DIGIEPCA is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_SYNCLINKMP is not set
-# CONFIG_N_HDLC is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_RIO is not set
-# CONFIG_STALDRV is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
#
# Serial drivers
@@ -676,8 +641,7 @@
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
@@ -765,58 +729,13 @@
# SPI Protocol Masters
#
# CONFIG_SPI_AT25 is not set
-CONFIG_SPI_SPIDEV=y
+# CONFIG_SPI_SPIDEV is not set
#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON is not set
#
# Misc devices
@@ -830,20 +749,15 @@
#
# LED devices
#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
+# CONFIG_NEW_LEDS is not set
#
# LED drivers
#
-CONFIG_LEDS_S3C24XX=y
#
# LED Triggers
#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
#
# Multimedia devices
@@ -880,7 +794,7 @@
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
#
@@ -925,12 +839,10 @@
CONFIG_SND_PCM_OSS=y
CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_DEBUG=y
-# CONFIG_SND_DEBUG_DETECT is not set
-# CONFIG_SND_PCM_XRUN_DEBUG is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
#
# Generic devices
@@ -1029,7 +941,7 @@
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
+# CONFIG_RTC_INTF_PROC is not set
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_RTC_DRV_TEST is not set
@@ -1081,8 +993,7 @@
CONFIG_MINI_FO=y
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY is not set
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
@@ -1241,7 +1152,7 @@
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set
CONFIG_FRAME_POINTER=y
Modified: 7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_cli
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_cli?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
Binary files - no diff available.
Modified: 7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_passphrase
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_passphrase?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
Binary files - no diff available.
Modified: 7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_supplicant
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/modules/usr/local/sbin/wpa_supplicant?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
Binary files - no diff available.
Modified: 7.2/trunk/squeezeos/src/s3c2412/modules/usr/sbin/wlanconfig
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/modules/usr/sbin/wlanconfig?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
Binary files - no diff available.
Modified: 7.2/trunk/squeezeos/src/system/Makefile
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/Makefile?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/system/Makefile (original)
+++ 7.2/trunk/squeezeos/src/system/Makefile Tue Apr 15 09:06:49 2008
@@ -79,7 +79,7 @@
cd glib-2.12.13-arm; ../glib-2.12.13/configure
--cache-file=../glib-2.12.13/arm.cache --host=${TARGET} --target=${TARGET}
--prefix=/usr
glib: glib-2.12.13-arm/Makefile
- cd glib-2.12.13-arm; make && make DESTDIR=${BUILDDIR} install
+ cd glib-2.12.13-arm; make && make DESTDIR=${BUILDDIR} install-strip
# oprofile
@@ -108,10 +108,10 @@
# popt
popt-1.7/Makefile:
- cd popt-1.7; ./configure --host=${TARGET} --target=${TARGET}
--prefix=/usr
+ cd popt-1.7; ./configure --host=${TARGET} --target=${TARGET}
--prefix=/usr --disable-nls
popt: popt-1.7/Makefile
- cd popt-1.7; make; make DESTDIR=${BUILDDIR} install
+ cd popt-1.7; make; make DESTDIR=${BUILDDIR} install-strip
# binutils
@@ -171,7 +171,7 @@
cd netperf-2.4.3 && ./configure --host=${TARGET} --target=${TARGET}
--program-prefix= --prefix=/usr
netperf:netperf-2.4.3/Makefile
- cd netperf-2.4.3 && make && make install DESTDIR=${BUILDDIR}
+ cd netperf-2.4.3 && make && make install-strip DESTDIR=${BUILDDIR}
# jpeg
@@ -180,7 +180,7 @@
jpeg: jpeg-6b/Makefile
mkdir -p ${PREFIX}/man/man1
- cd jpeg-6b; make; make install; make install-lib; make install-headers
+ cd jpeg-6b; make; make install-lib; make install-headers
# png (requires zlib)
@@ -188,7 +188,7 @@
cd libpng-1.2.12; ./configure --enable-shared --host=${TARGET}
--target=${TARGET} --prefix=${PREFIX}
png: libpng-1.2.12/Makefile
- cd libpng-1.2.12; make; make DESTDIR= install
+ cd libpng-1.2.12; make; make DESTDIR= install-strip
# freetype
@@ -205,7 +205,7 @@
.PHONY: expat
expat: expat-2.0.0/Makefile
- cd expat-2.0.0; make; make DESTDIR=${BUILDDIR} install
+ cd expat-2.0.0; make; make DESTDIR=${BUILDDIR} installlib
# opensll
@@ -218,14 +218,14 @@
cd alsa-lib-1.0.9; ./configure --enable-shared --host=${TARGET}
--target=${TARGET} --program-prefix= --prefix=/usr
alsa-lib: alsa-lib-1.0.9/Makefile
- cd alsa-lib-1.0.9; make; make DESTDIR=${BUILDDIR} install
+ cd alsa-lib-1.0.9; make; make DESTDIR=${BUILDDIR} install-strip
# alsa-utils
alsa-utils-1.0.9/Makefile:
cd alsa-utils-1.0.9; ./configure --disable-alsamixer --enable-shared
--host=${TARGET} --target=${TARGET} --program-prefix= --prefix=/usr
alsa-utils: alsa-utils-1.0.9/Makefile
- cd alsa-utils-1.0.9; make; make DESTDIR=${BUILDDIR} install
+ cd alsa-utils-1.0.9; make; make DESTDIR=${BUILDDIR} install-strip
# wavplay
wavplay:
Modified: 7.2/trunk/squeezeplay/src/Makefile.squeezeos
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.squeezeos?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.squeezeos (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.squeezeos Tue Apr 15 09:06:49 2008
@@ -59,21 +59,20 @@
cd SDL_image-1.2.5; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--disable-tif --disable-jpg-shared --disable-png-shared --host=${TARGET}
--target=${TARGET} --prefix=${PREFIX} ${ENABLE_PROFILING}
sdl-image: SDL_image-1.2.5/Makefile
- cd SDL_image-1.2.5; make && make DESTDIR= install
+ cd SDL_image-1.2.5; make && make DESTDIR= install-strip
# sdl_ttf
SDL_ttf-2.0.8/Makefile:
cd SDL_ttf-2.0.8; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--host=${TARGET} --target=${TARGET} --with-freetype-prefix=${PREFIX}
--without-opengl --prefix=${PREFIX} ${ENABLE_PROFILING}
sdl-ttf: SDL_ttf-2.0.8/Makefile
- cd SDL_ttf-2.0.8; make && make DESTDIR= install
+ cd SDL_ttf-2.0.8; make && make DESTDIR= install-strip
SDL_gfx-2.0.15/Makefile:
cd SDL_gfx-2.0.15; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--disable-mmx --host=${TARGET} --target=${TARGET} --prefix=/usr
${ENABLE_PROFILING}
sdl-gfx: SDL_gfx-2.0.15/Makefile
- cd SDL_gfx-2.0.15; make && make DESTDIR=${BUILDDIR} install
-
+ cd SDL_gfx-2.0.15; make && make DESTDIR=${BUILDDIR} install-strip
#
# LUA:
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Tue Apr 15 09:06:49 2008
@@ -956,6 +956,24 @@
s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
s.albumitem.icon.border = { 8, 0, 0, 0 }
+ s.popupToast = _uses(s.albumitem,
+ {
+ order = { 'icon', 'text', 'textarea' },
+ textarea = {
+ w = WH_FILL,
+ h = WH_FILL,
+ padding = { 12, 20, 12, 12 }
+ },
+ text = {
+ padding = { 6, 15, 8, 8 }
+ },
+ icon = {
+ align = 'top-left',
+ border = { 12, 12, 0, 0 }
+ }
+ }
+ )
+
s.albumitemNoAction = {}
s.albumitemNoAction.order = { "text" }
s.albumitemNoAction.text = {}
@@ -1158,7 +1176,15 @@
s.popupplay.y = screenHeight - 96
s.popupplay.w = screenWidth
s.popupplay.h = 96
- s.popupplay.bgImg = helpBox
+
+ -- for textarea properties in popupplay
+ s.popupplay.padding = { 12, 12, 12, 0 }
+ s.popupplay.fg = TEXT_COLOR
+ s.popupplay.font = FONT_15px
+ s.popupplay.align = "top-left"
+ s.popupplay.scrollbar = {}
+ s.popupplay.scrollbar.w = 0
+
s.popupplay.text = {}
s.popupplay.text.w = screenWidth
@@ -1175,15 +1201,6 @@
}
s.popupplay.text.fg = TEXT_COLOR
s.popupplay.text.align = "top-left"
-
- -- for textarea properties in popupplay
- s.popupplay.padding = 12
- s.popupplay.h = 72
- s.popupplay.fg = TEXT_COLOR
- s.popupplay.font = FONT_15px
- s.popupplay.align = "top-left"
- s.popupplay.scrollbar = {}
- s.popupplay.scrollbar.w = 0
-- Popup window for information display
s.popupinfo = {}
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2233&root=Jive&r1=2232&r2=2233&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Tue Apr 15
09:06:49 2008
@@ -675,10 +675,12 @@
self.currentSong.window:setAlwaysOnTop(true)
self.currentSong.artIcon = Icon("icon")
self.currentSong.text = Label("text", "")
-
- local group = Group("albumitem", {
- text = self.currentSong.text,
- icon = self.currentSong.artIcon
+ self.currentSong.textarea = Textarea('popupplay', '')
+
+ local group = Group("popupToast", {
+ text = self.currentSong.text,
+ textarea = self.currentSong.textarea,
+ icon = self.currentSong.artIcon
})
self.currentSong.window:addWidget(group)
@@ -779,11 +781,9 @@
local type = display["type"] or 'text'
local s = self.currentSong
- local showMe
if type == 'song' then
- showMe = s.window
- -- new song display from server
+ s.textarea:setValue("")
s.text:setValue(table.concat(display["text"], "\n"))
s.artIcon:setStyle("icon")
if display['icon'] then
@@ -792,13 +792,12 @@
self.slimServer:fetchArtworkThumb(display["icon-id"], s.artIcon, 56, 'png')
end
else
- local textarea = Textarea('popupplay',
table.concat(display['text'], ' '))
- showMe = Popup("currentsong")
- showMe:addWidget(textarea)
- showMe:setAllowScreensaver(true)
- showMe:setAlwaysOnTop(true)
+ s.text:setValue('')
+ s.artIcon:setStyle("noimage")
+ s.artIcon:setValue(nil)
+ s.textarea:setValue(table.concat(display["text"], "\n"))
end
- showMe:showBriefly(3000, nil, Window.transitionPushPopupUp,
Window.transitionPushPopupDown)
+ s.window:showBriefly(3000, nil, Window.transitionPushPopupUp,
Window.transitionPushPopupDown)
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
