[Slim-Checkins] r15199 - /branches/mainMenuRework/Slim/Control/Jive.pm

[bklaas at svn.slimdevices.com]

Author: bklaas
Date: Tue Dec 11 19:51:28 2007
New Revision: 15199

URL: http://svn.slimdevices.com?rev=15199&view=rev
Log:
Fix player name change-- do action instead of go action for text input, removal of secondary CLI command editplayername
Misc cleanup of alarm settings code

Modified:
    branches/mainMenuRework/Slim/Control/Jive.pm

Modified: branches/mainMenuRework/Slim/Control/Jive.pm
URL: http://svn.slimdevices.com/branches/mainMenuRework/Slim/Control/Jive.pm?rev=15199&r1=15198&r2=15199&view=diff
==============================================================================
--- branches/mainMenuRework/Slim/Control/Jive.pm (original)
+++ branches/mainMenuRework/Slim/Control/Jive.pm Tue Dec 11 19:51:28 2007
@@ -69,7 +69,6 @@
     Slim::Control::Request::addDispatch(['sleepsettings', '_index', '_quantity'], [1, 1, 1, \&sleepSettingsQuery]);
     Slim::Control::Request::addDispatch(['crossfadesettings', '_index', '_quantity'], [1, 1, 1, \&crossfadeSettingsQuery]);
     Slim::Control::Request::addDispatch(['replaygainsettings', '_index', '_quantity'], [1, 1, 1, \&replaygainSettingsQuery]);
-    Slim::Control::Request::addDispatch(['editplayername', '_index', '_quantity'], [1, 1, 1, \&playerNameChange]);
     Slim::Control::Request::addDispatch(['playerinformation', '_index', '_quantity'], [1, 1, 1, \&playerInformationQuery]);
 	Slim::Control::Request::addDispatch(['jivefavorites', '_index', '_quantity'], [1, 1, 1, \&jiveFavoritesQuery]);
 
@@ -310,7 +309,7 @@
 
 	my %weekDayAlarms = (
 		text      => Slim::Utils::Strings::string("ALARM_WEEKDAYS"),
-		count     => 7,
+		count     => scalar(@weekDays),
 		offset    => 0,
 		item_loop => \@weekDays,
 		window    => { titleStyle => 'settings' },
@@ -325,39 +324,6 @@
 
 sub playerInformationQuery {
 	return;
-}
-
-sub playerNameChange {
-
-	my $request = shift;
-	my $client  = $request->client();
-
-	my $input = {	
-			initialText  => $client->name(),
-			len          => 1, # For those that want to name their player "X"
-			allowedChars => Slim::Utils::Strings::string('JIVE_ALLOWEDCHARS_WITHCAPS'),
-			help         => {
-				           text => Slim::Utils::Strings::string('JIVE_CHANGEPLAYERNAME_HELP')
-			},
-			softbutton1  => Slim::Utils::Strings::string('INSERT'),
-			softbutton2  => Slim::Utils::Strings::string('DELETE'),
-	};
-	my $actions = {
-			do => {
-				player => 0,
-				cmd    => ['name'],
-				params => {
-					playername => '__INPUT__',
-				},
-			},
-	};
-	my $window = {	{ titleStyle => 'settings' } };
-
-	$request->addResult('input', $input);
-	$request->addResult('actions', $actions);
-	$request->addResult('window', $window);
-	$request->setStatusDone();
-
 }
 
 sub syncSettingsQuery {
@@ -629,9 +595,12 @@
 			softbutton2  => Slim::Utils::Strings::string('DELETE'),
 		},
                 actions        => {
-                                go =>   {
-                                                cmd    => ['editplayername'],
+                                do =>   {
+                                                cmd    => ['name'],
                                                 player => 0,
+						params => {
+							playername => '__INPUT__',
+						},
                                         },
                                   },
 		window         => { titleStyle => 'settings' },
@@ -1014,6 +983,7 @@
 		$alarm_volume,
 	);
 	push @return, $alarm_fade if $day == 0;
+	#Data::Dump::dump(@return) if $day == 1;
 	return \@return;
 }
 
@@ -1024,11 +994,10 @@
 	my $string = 'ALARM_DAY' . $day;
 	my %return = (
 		text      => Slim::Utils::Strings::string($string),
-		count     => 4,
+		count     => scalar(@$elements),
 		offset    => 0,
 		item_loop => $elements,
 	);
-#	Data::Dump::dump(%return);
 	return \%return;
 }
 
@@ -1053,7 +1022,7 @@
 		id             => 'playerpower',
 		node           => 'home',
 		displayWhenOff => 1,
-		weight         => 1,
+		weight         => 100,
 		actions        => {
 			do  => {
 				player => 0,