[Slim-Checkins] r11121 - in /trunk/server: HTML/EN/progress.html Plugins/MusicMagic/Importer.pm Plugins/MusicMagic/strings.txt Plugins/iTunes/Importer.pm Plugins/iTunes/strings.txt strings.txt

[kdf at svn.slimdevices.com]

Author: kdf
Date: Fri Jan  5 18:10:51 2007
New Revision: 11121

URL: http://svn.slimdevices.com?rev=11121&view=rev
Log:
Bug: n/a
Description: add progress details for MusicIP and iTunes importing, plus a page header string for the scan progress page


Modified:
    trunk/server/HTML/EN/progress.html
    trunk/server/Plugins/MusicMagic/Importer.pm
    trunk/server/Plugins/MusicMagic/strings.txt
    trunk/server/Plugins/iTunes/Importer.pm
    trunk/server/Plugins/iTunes/strings.txt
    trunk/server/strings.txt

Modified: trunk/server/HTML/EN/progress.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/progress.html?rev=11121&r1=11120&r2=11121&view=diff
==============================================================================
--- trunk/server/HTML/EN/progress.html (original)
+++ trunk/server/HTML/EN/progress.html Fri Jan  5 18:10:51 2007
@@ -1,4 +1,4 @@
-[% pagetitle = "STATISTICS" | string %]
+[% pagetitle = "SCANNER_PROGRESS" | string %]
 [% pageHeaderMenu = pagetitle %]
 
 [% PROCESS pageheader.html %]

Modified: trunk/server/Plugins/MusicMagic/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/Importer.pm?rev=11121&r1=11120&r2=11121&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/Importer.pm (original)
+++ trunk/server/Plugins/MusicMagic/Importer.pm Fri Jan  5 18:10:51 2007
@@ -194,7 +194,12 @@
 	my $class = shift;
 	my $count = shift;
 
-	my $progress = Slim::Utils::ProgressBar->new({ 'total' => $count });
+	my $progress = Slim::Utils::Progress->new({ 
+		'type'  => 'importer', 
+		'name'  => 'musicmagic', 
+		'total' => $count, 
+		'bar'   => 1
+	});
 
 	# MMM Version 1.5+ adds support for /api/songs?extended, which pulls
 	# down the entire library, separated by $LF$LF - this allows us to make

Modified: trunk/server/Plugins/MusicMagic/strings.txt
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/strings.txt?rev=11121&r1=11120&r2=11121&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/strings.txt (original)
+++ trunk/server/Plugins/MusicMagic/strings.txt Fri Jan  5 18:10:51 2007
@@ -318,3 +318,7 @@
 	DE	MusicIP Mix & Export
 	EN	MusicIP Mix & Export Debugging
 
+MUSICMAGIC_PROGRESS
+	EN	MusicIP Import Progress
+
+

Modified: trunk/server/Plugins/iTunes/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/iTunes/Importer.pm?rev=11121&r1=11120&r2=11121&view=diff
==============================================================================
--- trunk/server/Plugins/iTunes/Importer.pm (original)
+++ trunk/server/Plugins/iTunes/Importer.pm Fri Jan  5 18:10:51 2007
@@ -150,7 +150,12 @@
 		return;
 	}
 
-	$progress = Slim::Utils::ProgressBar->new({ 'total' => $class->getTotalTrackCount($file) });
+	my $progress = Slim::Utils::Progress->new({ 
+		'type'  => 'importer', 
+		'name'  => 'itunes', 
+		'total' => $class->getTotalTrackCount($file), 
+		'bar'   => 1
+	});
 
 	$iTunesScanStartTime = time();
 

Modified: trunk/server/Plugins/iTunes/strings.txt
URL: http://svn.slimdevices.com/trunk/server/Plugins/iTunes/strings.txt?rev=11121&r1=11120&r2=11121&view=diff
==============================================================================
--- trunk/server/Plugins/iTunes/strings.txt (original)
+++ trunk/server/Plugins/iTunes/strings.txt Fri Jan  5 18:10:51 2007
@@ -261,3 +261,6 @@
 	DE	iTunes Synchronisation
 	EN	iTunes Synchronization Information
 
+ITUNES_PROGRESS
+	EN	iTunes Import Progress
+

Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=11121&r1=11120&r2=11121&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Fri Jan  5 18:10:51 2007
@@ -12314,6 +12314,9 @@
 	EN	Enlarge
 	SV	Förstora
 
+SCANNER_PROGRESS
+	EN	Music Scan Details
+
 DIRECTORY_PROGRESS
 	EN	Directory Scan