Author: titmuss
Date: Mon Oct 6 06:17:12 2008
New Revision: 3076
URL: http://svn.slimdevices.com?rev=3076&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3069): tom | 2008-10-03 21:57:37 +0100
trying again 3 to use a more standard reference for share dir
[EMAIL PROTECTED] (orig r3071): bklaas | 2008-10-04 05:30:33 +0100
Bug: 9639
Description: add getModel method to player class.
[EMAIL PROTECTED] (orig r3072): bklaas | 2008-10-04 20:33:36 +0100
Bug: 9577
Description: cleanup of FullScreenSkin code in relation to rework for bug 9577
[EMAIL PROTECTED] (orig r3073): bklaas | 2008-10-04 22:04:15 +0100
Bug: 9639
Description: first pass at adding images of hardware in choose player menu
fullscreen skin layout still needs work, but at least the UI doesn't crash :)
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png
(with props)
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png
(with props)
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Oct 6 06:17:12 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3063
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3073
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.4/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am Mon Oct 6 06:17:12 2008
@@ -16,6 +16,8 @@
@find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
@test \! -s badsyntax
@rm -f badsyntax
+
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
include Makefile.am.jive-install.include
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include Mon
Oct 6 06:17:12 2008
@@ -2,9 +2,6 @@
# if you are making changes to it consider making the changes in each of the
locations.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
-
-#touching to try to get jive_73 build to see this file
jive-static-install:
##Copy selectively, currently overwrites all, not just newer
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in Mon Oct 6 06:17:12 2008
@@ -228,7 +228,7 @@
# Rules for tolua++ binding files
SUFFIXES = .pkg
TOLUA = tolua++
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
OSX_LIB_DIR = $(PREFIX)/lib
OSX_BUILD_DIR = $(PREFIX)
JIVE_DEPENDENCIES_LIB_DIR = $(top_builddir)/.libs
@@ -1093,8 +1093,6 @@
@test \! -s badsyntax
@rm -f badsyntax
-#touching to try to get jive_73 build to see this file
-
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Mon Oct 6 06:17:12 2008
@@ -404,7 +404,6 @@
}
})
-
-- checked menu item, with no action
s.checkedNoAction = _uses(s.checked)
@@ -1016,6 +1015,109 @@
s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
s.albumitem.icon.border = { 8, 0, 0, 0 }
+ -- checked albummenu item
+ s.albumchecked =
+ _uses(s.albumitem, {
+ order = { "icon", "text", "check" },
+ check = {
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check.png"),
+ align = "right"
+
+ }
+ })
+
+ -- styles for choose player menu
+ s.chooseplayer = _uses(s.albumitem, {
+ text = { font = FONT_BOLD_13px }
+ })
+ s.transporter = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/transporter.png"),
+ w = 56,
+ }
+ })
+ s.transporterchecked = _uses(s.transporter, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.squeezebox2 = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ }
+ })
+ s.squeezebox2checked = _uses(s.squeezebox2, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.boom = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/boom.png"),
+ w = 56,
+ }
+ })
+ s.boomchecked = _uses(s.boom, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.slimp3 = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/slimp3.png"),
+ }
+ })
+ s.slimp3checked = _uses(s.slimp3, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.softsqueeze = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/softsqueeze.png"),
+ }
+ })
+ s.softsqueezechecked = _uses(s.softsqueeze, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.controller = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/controller.png"),
+ }
+ })
+ s.controllerchecked = _uses(s.controller, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.receiver = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/receiver.png"),
+ }
+ })
+ s.receiverchecked = _uses(s.receiver, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
s.albumitemplay = _uses(s.albumitem)
s.albumitemadd = _uses(s.albumitem)
@@ -1083,7 +1185,118 @@
s.selected.albumitemadd = _uses(s.selected.albumitem, {
play = { img = Surface:loadImage(imgpath ..
"Icons/selection_add.png") }
})
-
+
+ s.selected.albumchecked = _uses(s.selected.albumitem, {
+ order = { "icon", "text", "check", "play" },
+ play = {
+ img = Surface:loadImage(imgpath ..
"Icons/selection_right.png")
+ },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.selected.chooseplayer = _uses(s.selected.albumitem, {
+ order = { "icon", "text", "play" },
+ play = {
+ img = Surface:loadImage(imgpath ..
"Icons/selection_right.png")
+ },
+ text = { font = FONT_BOLD_13px }
+ })
+
+ s.selected.transporter = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/transporter.png"),
+ }
+ })
+ s.selected.transporterchecked = _uses(s.selected.transporter, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.selected.squeezebox2 = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ }
+ })
+ s.selected.squeezebox2checked = _uses(s.selected.squeezebox2, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+
+ s.selected.boom = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/boom.png"),
+ }
+ })
+ s.selected.boomchecked = _uses(s.selected.boom, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+
+ s.selected.slimp3 = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/slimp3.png"),
+ }
+ })
+
+ s.selected.slimp3checked = _uses(s.selected.slimp3, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.selected.softsqueeze = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/softsqueeze.png"),
+ }
+ })
+ s.selected.softsqueezechecked = _uses(s.selected.softsqueeze, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.selected.controller = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/controller.png"),
+ }
+ })
+ s.selected.controllerchecked = _uses(s.selected.controller, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.selected.receiver = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/receiver.png"),
+ }
+ })
+ s.selected.receiverchecked = _uses(s.selected.receiver, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
-- locked item with artwork and song info
s.locked.albumitem = {}
s.locked.albumitem.text = {}
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Mon Oct 6 06:17:12 2008
@@ -32,6 +32,7 @@
local Icon = require("jive.ui.Icon")
local Label = require("jive.ui.Label")
local Framework = require("jive.ui.Framework")
+local Surface = require("jive.ui.Surface")
local hasWireless, Wireless = pcall(require, "jive.net.Wireless")
@@ -51,7 +52,6 @@
local PLAYER_WEIGHT = 1
local SERVER_WEIGHT = 10
local ACTIVATE_WEIGHT = 20
-
function init(self, ...)
self.playerItem = {}
@@ -170,6 +170,8 @@
local playerName = player:getName()
local playerWeight = PLAYER_WEIGHT
+ local playerModel = player:getModel() or 'softsqueeze'
+
-- if waiting for a SN pin modify name
if player:getPin() then
if not self.setupMode then
@@ -183,7 +185,8 @@
local item = {
id = mac,
- text = playerName,
+ style = playerModel,
+ text = "\n" .. playerName,
sound = "WINDOWSHOW",
callback = function()
if self:selectPlayer(player) then
@@ -197,7 +200,7 @@
}
if player == self.selectedPlayer and player:isConnected() then
- item.style = "checked"
+ item.style = playerModel .. "checked"
end
self.playerMenu:addItem(item)
@@ -275,7 +278,7 @@
local window = Window("window", self:string("SELECT_PLAYER"),
'settingstitle')
window:setAllowScreensaver(false)
- local menu = SimpleMenu("menu")
+ local menu = SimpleMenu("albummenu")
menu:setComparator(SimpleMenu.itemComparatorWeightAlpha)
self.playerMenu = menu
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Mon Oct 6
06:17:12 2008
@@ -505,6 +505,18 @@
--[[
+=head2 jive.slim.Player:getModel()
+
+returns the model of player
+
+=cut
+--]]
+function getModel(self)
+ return self.info.model
+end
+
+--[[
+
=head2 jive.slim.Player:getPlaylistTimestamp()
returns the playlist timestamp for a given player object
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am Mon Oct 6
06:17:12 2008
@@ -1,5 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
include Makefile.am.jive-install.include
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
Mon Oct 6 06:17:12 2008
@@ -1,10 +1,6 @@
#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
# if you are making changes to it consider making the changes in each of the
locations.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
-
-#touching to try to get jive_73 build to see this file
jive-static-install:
##Copy selectively, currently overwrites all, not just newer
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in Mon Oct 6
06:17:12 2008
@@ -134,7 +134,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
all: all-am
.SUFFIXES:
@@ -395,8 +395,6 @@
pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
-#touching to try to get jive_73 build to see this file
-
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Mon Oct 6 06:17:12 2008
@@ -141,18 +141,6 @@
imgpath ..
"Screen_Formats/Titlebar/titlebar.png",
})
- local selectionBox =
- Tile:loadTiles({
- imgpath .. "selector_M.png",
- imgpath .. "selector_TL.png",
- imgpath .. "selector_M.png",
- imgpath .. "selector_TR.png",
- imgpath .. "selector_M.png",
- imgpath .. "selector_BR.png",
- imgpath .. "selector_M.png",
- imgpath .. "selector_BL.png",
- imgpath .. "selector_M.png"
- })
local selectionBox =
Tile:loadTiles({
imgpath ..
"Screen_Formats/5_line_lists/menu_selection_box.png",
@@ -178,19 +166,6 @@
imgpath ..
"Screen_Formats/Albums/menu_selection_box_album_bl.png",
imgpath ..
"Screen_Formats/Albums/menu_selection_box_album_l.png",
})
-
- local helpBox =
- Tile:loadTiles({
- imgpath .. "helpbox.png",
- imgpath .. "helpbox_tl.png",
- imgpath .. "helpbox_t.png",
- imgpath .. "helpbox_tr.png",
- imgpath .. "helpbox_r.png",
- nil,
- nil,
- nil,
- imgpath .. "helpbox_l.png",
- })
local helpBox =
Tile:loadTiles({
@@ -828,7 +803,7 @@
s.searchtitle =
_uses(s.minititle, {
icon = {
- img = Surface:loadImage(imgpath ..
"Icons/Mini/icon_searchpng")
+ img = Surface:loadImage(imgpath ..
"Icons/Mini/icon_search.png")
}
})
@@ -963,8 +938,115 @@
s.albumitem.icon.h = WH_FILL
s.albumitem.icon.align = "left"
--FIXME, this path likely needs changing
- s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork_125.png")
+ --s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork_125.png")
s.albumitem.icon.padding = 0
+
+ -- checked albummenu item
+ s.albumchecked =
+ _uses(s.albumitem, {
+ order = { "icon", "text", "check" },
+ check = {
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check.png"),
+ align = "right"
+
+ }
+ })
+
+ -- styles for choose player menu
+ s.chooseplayer = _uses(s.albumitem, {
+ text = { font = FONT_BOLD_13px }
+ })
+ s.transporter = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/transporter.png"),
+ w = 56,
+ }
+ })
+ s.transporterchecked = _uses(s.transporter, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.squeezebox2 = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ }
+ })
+ s.squeezebox2checked = _uses(s.squeezebox2, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.boom = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/boom.png"),
+ w = 56,
+ }
+ })
+ s.boomchecked = _uses(s.boom, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.slimp3 = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/slimp3.png"),
+ }
+ })
+ s.slimp3checked = _uses(s.slimp3, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.softsqueeze = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/softsqueeze.png"),
+ }
+ })
+ s.softsqueezechecked = _uses(s.softsqueeze, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.controller = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/controller.png"),
+ }
+ })
+ s.controllerchecked = _uses(s.controller, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.receiver = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/receiver.png"),
+ }
+ })
+ s.receiverchecked = _uses(s.receiver, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+
+ s.albumitemplay = _uses(s.albumitem)
+ s.albumitemadd = _uses(s.albumitem)
s.popupToast = _uses(s.albumitem,
{
@@ -1017,6 +1099,129 @@
s.selected.albumitem.text.fg = SELECT_COLOR
s.selected.albumitem.text.sh = SELECT_SH_COLOR
s.selected.albumitem.bgImg = albumSelectionBox
+
+ s.selected.albumitemplay = _uses(s.selected.albumitem)
+ s.selected.albumitemadd = _uses(s.selected.albumitem)
+
+--[[
+ s.selected.albumitemplay = _uses(s.selected.albumitem, {
+ play = { img = Surface:loadImage(imgpath ..
"Icons/selection_play.png") }
+ })
+ s.selected.albumitemadd = _uses(s.selected.albumitem, {
+ play = { img = Surface:loadImage(imgpath ..
"Icons/selection_add.png") }
+ })
+--]]
+ s.selected.albumchecked = _uses(s.selected.albumitem, {
+ order = { "icon", "text", "check", "play" },
+ play = {
+ img = Surface:loadImage(imgpath ..
"Icons/selection_right.png")
+ },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.selected.chooseplayer = _uses(s.selected.albumitem, {
+ order = { "icon", "text", "play" },
+ play = {
+ img = Surface:loadImage(imgpath ..
"Icons/selection_right.png")
+ },
+ text = { font = FONT_BOLD_13px }
+ })
+
+ s.selected.transporter = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/transporter.png"),
+ }
+ })
+ s.selected.transporterchecked = _uses(s.selected.transporter, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.selected.squeezebox2 = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ }
+ })
+ s.selected.squeezebox2checked = _uses(s.selected.squeezebox2, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+
+ s.selected.boom = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/boom.png"),
+ }
+ })
+ s.selected.boomchecked = _uses(s.selected.boom, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+
+ s.selected.slimp3 = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/slimp3.png"),
+ }
+ })
+
+ s.selected.slimp3checked = _uses(s.selected.slimp3, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.selected.softsqueeze = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/softsqueeze.png"),
+ }
+ })
+ s.selected.softsqueezechecked = _uses(s.selected.softsqueeze, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.selected.controller = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/controller.png"),
+ }
+ })
+ s.selected.controllerchecked = _uses(s.selected.controller, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+ s.selected.receiver = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/receiver.png"),
+ }
+ })
+ s.selected.receiverchecked = _uses(s.selected.receiver, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
-- locked item with artwork and song info
@@ -1038,7 +1243,6 @@
})
s.selected.albumitemwaiting = _uses(s.waiting)
-
-- titles with artwork and song info
s.nowplayingtitle = {}
@@ -1233,19 +1437,6 @@
local SELECT_SH_COLOR = { }
- local titleBox =
- Tile:loadTiles({
- imgpath .. "header_M.png",
- imgpath .. "header_TL.png",
- imgpath .. "header_M.png",
- imgpath .. "header_TR.png",
- imgpath .. "header_M.png",
- imgpath .. "header_BR.png",
- imgpath .. "header_M.png",
- imgpath .. "header_BL.png",
- imgpath .. "header_M.png"
- })
-
-- Title
s.ssnptitle = _uses(s.title)
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png?rev=3076&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am Mon Oct 6 06:17:12
2008
@@ -27,6 +27,8 @@
src/jive_watchdog.c
+JIVE_BUILD_DIR = $(DESTDIR)$(datadir)/jive
+
include Makefile.am.jive-install.include
install-data-local: jive-static-install
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
Mon Oct 6 06:17:12 2008
@@ -1,10 +1,6 @@
#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
# if you are making changes to it consider making the changes in each of the
locations.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
-
-#touching to try to get jive_73 build to see this file
jive-static-install:
##Copy selectively, currently overwrites all, not just newer
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in?rev=3076&root=Jive&r1=3075&r2=3076&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in Mon Oct 6 06:17:12
2008
@@ -222,7 +222,7 @@
jiveWatchdog_la_SOURCES = \
src/jive_watchdog.c
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
+JIVE_BUILD_DIR = $(DESTDIR)$(datadir)/jive
all: all-am
.SUFFIXES:
@@ -664,8 +664,6 @@
@test \! -s badsyntax
@rm -f badsyntax
-#touching to try to get jive_73 build to see this file
-
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
