Author: titmuss
Date: Thu Jun 19 10:22:30 2008
New Revision: 2596
URL: http://svn.slimdevices.com?rev=2596&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2581): bklaas | 2008-06-17 21:54:07 +0100
Bug: 7125
Description: add support for using a user's favorites for the flickr
screensaver
[EMAIL PROTECTED] (orig r2589): bklaas | 2008-06-18 21:40:39 +0100
Bug: 6504
Description: add "smallicon" menu item style for use with smaller images
Modified:
7.1/branches/discovery-refactor/ (props changed)
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt
Propchange: 7.1/branches/discovery-refactor/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jun 19 10:22:30 2008
@@ -1,5 +1,5 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2567
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2589
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.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2596&root=Jive&r1=2595&r2=2596&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Thu Jun 19 10:22:30 2008
@@ -1065,6 +1065,35 @@
s.locked.albumitem.play.frameRate = 4
s.locked.albumitem.play.frameWidth = 10
+
+ -- smallicon style, similar to album but smaller icon and single line
on the screen
+ s.smalliconmenu = _uses(s.albummenu,
+ {
+ itemHeight = 27,
+ }
+ )
+
+ s.smalliconitem = _uses(s.albumitem,
+ {
+ icon = { w = 25, h = 25, border = { 6, 0, 0, 0 } }
+ }
+ )
+
+ s.smalliconitemNoAction = _uses(s.albumitemNoAction)
+ s.selected.smalliconitemNoAction = _uses(s.smalliconitemNoAction,
+ {
+ bgImg = selectionBox,
+ text = {
+ fg = SELECT_COLOR,
+ sh = SELECT_SH_COLOR
+ }
+ }
+ )
+
+ s.selected.smalliconitem = _uses(s.selected.albumitem)
+ s.smalliconitemwaiting = _uses(s.albumitemwaiting)
+ s.locked.smalliconitem = _uses(s.locked.albumitem)
+
-- titles with artwork and song info
s.nowplayingtitle = {}
s.nowplayingtitle.position = LAYOUT_NORTH
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua?rev=2596&root=Jive&r1=2595&r2=2596&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
Thu Jun 19 10:22:30 2008
@@ -282,6 +282,17 @@
),
},
{
+ text = self:string("SCREENSAVER_FLICKR_DISPLAY_FAVORITES"),
+ icon = RadioButton(
+ "radio",
+ group,
+ function()
+ self:setDisplay("favorites")
+ end,
+ display == "favorites"
+ ),
+ },
+ {
text = self:string("SCREENSAVER_FLICKR_DISPLAY_CONTACTS"),
icon = RadioButton(
"radio",
@@ -353,7 +364,7 @@
function setDisplay(self, display)
- if self:getSettings()["flickr.id"] == "" and (display == "own" or
display == "contacts") then
+ if self:getSettings()["flickr.id"] == "" and (display == "own" or
display == "contacts" or display == "favorites") then
self:popupMessage(self:string("SCREENSAVER_FLICKR_ERROR"),
self:string("SCREENSAVER_FLICKR_INVALID_DISPLAY_OPTION"))
else
self:getSettings()["flickr.display"] = display
@@ -434,6 +445,9 @@
args = { per_page = 100, extras = "owner_name", user_id =
self:getSettings()["flickr.id"], include_self = 1 }
elseif displaysetting == "own" then
method = "flickr.people.getPublicPhotos"
+ args = { per_page = 100, extras = "owner_name", user_id =
self:getSettings()["flickr.id"] }
+ elseif displaysetting == "favorites" then
+ method = "flickr.favorites.getPublicList"
args = { per_page = 100, extras = "owner_name", user_id =
self:getSettings()["flickr.id"] }
else
method = "flickr.interestingness.getList"
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt?rev=2596&root=Jive&r1=2595&r2=2596&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt
Thu Jun 19 10:22:30 2008
@@ -101,6 +101,9 @@
IT Immagini personali
NL Mijn eigen foto's
+SCREENSAVER_FLICKR_DISPLAY_FAVORITES
+ EN My favorites
+
SCREENSAVER_FLICKR_DISPLAY_CONTACTS
DA Mine kontakters billeder
DE Bilder meiner Kontakte
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
