[Slim-Checkins] r12580 - in /trunk/server: Slim/Plugin/Jive/Plugin.pm strings.txt
bklaas at svn.slimdevices.com
bklaas at svn.slimdevices.com
Thu Aug 16 15:56:16 PDT 2007
Author: bklaas
Date: Thu Aug 16 15:56:16 2007
New Revision: 12580
URL: http://svn.slimdevices.com?rev=12580&view=rev
Log:
Reorder Jive menuing per GPS
Modified:
trunk/server/Slim/Plugin/Jive/Plugin.pm
trunk/server/strings.txt
Modified: trunk/server/Slim/Plugin/Jive/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/Jive/Plugin.pm?rev=12580&r1=12579&r2=12580&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/Jive/Plugin.pm (original)
+++ trunk/server/Slim/Plugin/Jive/Plugin.pm Thu Aug 16 15:56:16 2007
@@ -719,69 +719,212 @@
my @menu = (
{
- 'text' => Slim::Utils::Strings::string('BROWSE_BY_ALBUM'),
+ 'text' => Slim::Utils::Strings::string('MY_MUSIC'),
+ 'count' => 8,
+ 'offset' => 0,
+ 'item_loop' => [
+ {
+ 'text' => Slim::Utils::Strings::string('BROWSE_BY_ALBUM'),
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['albums'],
+ 'params' => {
+ 'menu' => 'track',
+ },
+ },
+ },
+ 'window' => {
+ 'menuStyle' => 'album',
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('BROWSE_BY_ARTIST'),
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['artists'],
+ 'params' => {
+ 'menu' => 'album',
+ },
+ },
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('BROWSE_BY_GENRE'),
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['genres'],
+ 'params' => {
+ 'menu' => 'artist',
+ },
+ },
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('BROWSE_BY_YEAR'),
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['years'],
+ 'params' => {
+ 'menu' => 'album',
+ },
+ },
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('BROWSE_NEW_MUSIC'),
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['albums'],
+ 'params' => {
+ 'menu' => 'track',
+ 'sort' => 'new',
+ },
+ },
+ },
+ 'window' => {
+ 'menuStyle' => 'album',
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('BROWSE_MUSIC_FOLDER'),
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['musicfolder'],
+ 'params' => {
+ 'menu' => 'musicfolder',
+ },
+ },
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('SAVED_PLAYLISTS'),
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['playlists'],
+ 'params' => {
+ 'menu' => 'track',
+ },
+ },
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('SEARCHMUSIC'),
+ 'count' => 4,
+ 'offset' => 0,
+ 'item_loop' => [
+ {
+ 'text' => Slim::Utils::Strings::string('ARTISTS'),
+ 'input' => {
+ 'len' => 2, # Richard says "we can't search for U2!"
+ 'help' => {
+ 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
+ },
+ },
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['artists'],
+ 'params' => {
+ 'menu' => 'album',
+ 'search' => '__INPUT__',
+ },
+ },
+ },
+ 'window' => {
+ 'text' => Slim::Utils::Strings::string('SEARCHFOR_ARTISTS'),
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('ALBUMS'),
+ 'input' => {
+ 'len' => 3,
+ 'help' => {
+ 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
+ },
+ },
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['albums'],
+ 'params' => {
+ 'menu' => 'track',
+ 'search' => '__INPUT__',
+ },
+ },
+ },
+ 'window' => {
+ 'text' => Slim::Utils::Strings::string('SEARCHFOR_ALBUMS'),
+ 'menuStyle' => 'album',
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('SONGS'),
+ 'input' => {
+ 'len' => 3,
+ 'help' => {
+ 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
+ },
+ },
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['tracks'],
+ 'params' => {
+ 'menu' => 'track',
+ 'search' => '__INPUT__',
+ },
+ },
+ },
+ 'window' => {
+ 'text' => Slim::Utils::Strings::string('SEARCHFOR_SONGS'),
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('PLAYLISTS'),
+ 'input' => {
+ 'len' => 3,
+ 'help' => {
+ 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
+ },
+ },
+ 'actions' => {
+ 'go' => {
+ 'cmd' => ['playlists'],
+ 'params' => {
+ 'menu' => 'track',
+ 'search' => '__INPUT__',
+ },
+ },
+ },
+ 'window' => {
+ 'text' => Slim::Utils::Strings::string('SEARCHFOR_PLAYLISTS'),
+ },
+ },
+ ],
+ },
+ ],
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('RADIO'),
'actions' => {
'go' => {
- 'cmd' => ['albums'],
+ 'cmd' => ['radios'],
'params' => {
- 'menu' => 'track',
- },
- },
- },
- 'window' => {
- 'menuStyle' => 'album',
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('BROWSE_BY_ARTIST'),
+ 'menu' => 'radio',
+ },
+ },
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('MUSIC_SERVICES'),
'actions' => {
'go' => {
- 'cmd' => ['artists'],
+ 'cmd' => ['services'],
'params' => {
- 'menu' => 'album',
- },
- },
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('BROWSE_BY_GENRE'),
- 'actions' => {
- 'go' => {
- 'cmd' => ['genres'],
- 'params' => {
- 'menu' => 'artist',
- },
- },
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('BROWSE_BY_YEAR'),
- 'actions' => {
- 'go' => {
- 'cmd' => ['years'],
- 'params' => {
- 'menu' => 'album',
- },
- },
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('BROWSE_NEW_MUSIC'),
- 'actions' => {
- 'go' => {
- 'cmd' => ['albums'],
- 'params' => {
- 'menu' => 'track',
- 'sort' => 'new',
- },
- },
- },
- 'window' => {
- 'menuStyle' => 'album',
- },
- },
- {
- 'text' => 'Favorites',
+ 'menu' => 'services',
+ },
+ },
+ },
+ },
+ {
+ 'text' => Slim::Utils::Strings::string('FAVORITES'),
'actions' => {
'go' => {
'cmd' => ['favorites', 'items'],
@@ -791,131 +934,6 @@
},
},
},
- {
- 'text' => Slim::Utils::Strings::string('BROWSE_MUSIC_FOLDER'),
- 'actions' => {
- 'go' => {
- 'cmd' => ['musicfolder'],
- 'params' => {
- 'menu' => 'musicfolder',
- },
- },
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('SAVED_PLAYLISTS'),
- 'actions' => {
- 'go' => {
- 'cmd' => ['playlists'],
- 'params' => {
- 'menu' => 'track',
- },
- },
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('SEARCHMUSIC'),
- 'count' => 4,
- 'offset' => 0,
- 'item_loop' => [
- {
- 'text' => Slim::Utils::Strings::string('ARTISTS'),
- 'input' => {
- 'len' => 2, # Richard says "we can't search for U2!"
- 'help' => {
- 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
- },
- },
- 'actions' => {
- 'go' => {
- 'cmd' => ['artists'],
- 'params' => {
- 'menu' => 'album',
- 'search' => '__INPUT__',
- },
- },
- },
- 'window' => {
- 'text' => Slim::Utils::Strings::string('SEARCHFOR_ARTISTS'),
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('ALBUMS'),
- 'input' => {
- 'len' => 3,
- 'help' => {
- 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
- },
- },
- 'actions' => {
- 'go' => {
- 'cmd' => ['albums'],
- 'params' => {
- 'menu' => 'track',
- 'search' => '__INPUT__',
- },
- },
- },
- 'window' => {
- 'text' => Slim::Utils::Strings::string('SEARCHFOR_ALBUMS'),
- 'menuStyle' => 'album',
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('SONGS'),
- 'input' => {
- 'len' => 3,
- 'help' => {
- 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
- },
- },
- 'actions' => {
- 'go' => {
- 'cmd' => ['tracks'],
- 'params' => {
- 'menu' => 'track',
- 'search' => '__INPUT__',
- },
- },
- },
- 'window' => {
- 'text' => Slim::Utils::Strings::string('SEARCHFOR_SONGS'),
- },
- },
- {
- 'text' => Slim::Utils::Strings::string('PLAYLISTS'),
- 'input' => {
- 'len' => 3,
- 'help' => {
- 'text' => Slim::Utils::Strings::string('JIVE_SEARCHFOR_HELP')
- },
- },
- 'actions' => {
- 'go' => {
- 'cmd' => ['playlists'],
- 'params' => {
- 'menu' => 'track',
- 'search' => '__INPUT__',
- },
- },
- },
- 'window' => {
- 'text' => Slim::Utils::Strings::string('SEARCHFOR_PLAYLISTS'),
- },
- },
- ],
- },
- {
- 'text' => 'Internet Radio',
- 'actions' => {
- 'go' => {
- 'cmd' => ['radios'],
- 'params' => {
- 'menu' => 'radio',
- },
- },
- },
- },
);
my $numitems = scalar(@menu);
Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=12580&r1=12579&r2=12580&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Thu Aug 16 15:56:16 2007
@@ -473,6 +473,9 @@
NO Internettradio
SV Internetradio
ZH_CN 互è”网收音机
+
+MUSIC_SERVICES
+ EN Music Services
MUSIC_ON_DEMAND
DE Musik auf Abruf
More information about the checkins
mailing list