[Slim-Checkins] r8918 - in /trunk/server: Plugins/DateTime/Plugin.pm Plugins/Snow.pm Plugins/Visualizer.pm Slim/Buttons/AlarmClock.pm Slim/Buttons/Common.pm Slim/Buttons/Input/Choice.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Thu Aug 10 14:01:21 2006
New Revision: 8918

URL: http://svn.slimdevices.com?rev=8918&view=rev
Log:
Bug: N/A
Description: Use font icons for checkBoxOverlay on graphic players

Modified:
    trunk/server/Plugins/DateTime/Plugin.pm
    trunk/server/Plugins/Snow.pm
    trunk/server/Plugins/Visualizer.pm
    trunk/server/Slim/Buttons/AlarmClock.pm
    trunk/server/Slim/Buttons/Common.pm
    trunk/server/Slim/Buttons/Input/Choice.pm

Modified: trunk/server/Plugins/DateTime/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/DateTime/Plugin.pm?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- trunk/server/Plugins/DateTime/Plugin.pm (original)
+++ trunk/server/Plugins/DateTime/Plugin.pm Thu Aug 10 14:01:21 2006
@@ -139,7 +139,7 @@
 	
 	my $saver = Slim::Player::Source::playmode($client) eq 'play' ? 'screensaver' : 'idlesaver';
 	my $line2 = $client->string('SETUP_SCREENSAVER_USE');
-	my $overlay2 = Slim::Buttons::Common::checkBoxOverlay($client->prefGet($saver) eq 'SCREENSAVER.datetime');
+	my $overlay2 = Slim::Buttons::Common::checkBoxOverlay($client, $client->prefGet($saver) eq 'SCREENSAVER.datetime');
 	
 	return {
 		'line'    => [ $client->string('PLUGIN_SCREENSAVER_DATETIME'), $line2 ],

Modified: trunk/server/Plugins/Snow.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/Snow.pm?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- trunk/server/Plugins/Snow.pm (original)
+++ trunk/server/Plugins/Snow.pm Thu Aug 10 14:01:21 2006
@@ -296,7 +296,7 @@
 		if ($nextParams{'useMode'} eq 'boolean') {
 			return (
 				undef,
-				Slim::Buttons::Common::checkBoxOverlay(
+				Slim::Buttons::Common::checkBoxOverlay($client,
 					$client->prefGet($saver) eq 'SCREENSAVER.snow'
 				),
 			);

Modified: trunk/server/Plugins/Visualizer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/Visualizer.pm?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- trunk/server/Plugins/Visualizer.pm (original)
+++ trunk/server/Plugins/Visualizer.pm Thu Aug 10 14:01:21 2006
@@ -191,7 +191,7 @@
 
 	$line1 = $client->string('PLUGIN_SCREENSAVER_VISUALIZER');
 	$line2 = $client->string($screensaver_info{$item}->{name});
-	my $overlay2 = Slim::Buttons::Common::checkBoxOverlay($client->prefGet($saver) eq $item);
+	my $overlay2 = Slim::Buttons::Common::checkBoxOverlay($client, $client->prefGet($saver) eq $item);
 
 	return {
 		'line'    => [ $line1, $line2 ],

Modified: trunk/server/Slim/Buttons/AlarmClock.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/AlarmClock.pm?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/AlarmClock.pm (original)
+++ trunk/server/Slim/Buttons/AlarmClock.pm Thu Aug 10 14:01:21 2006
@@ -504,7 +504,7 @@
 		if ($nextParams{'useMode'} eq 'boolean') {
 			return (
 				undef,
-				Slim::Buttons::Common::checkBoxOverlay(
+				Slim::Buttons::Common::checkBoxOverlay($client,
 					$client->prefGet($nextParams{'pref'},useWeekday($client,$nextParams{'pref'}))
 				),
 			);

Modified: trunk/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Common.pm?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Common.pm (original)
+++ trunk/server/Slim/Buttons/Common.pm Thu Aug 10 14:01:21 2006
@@ -1126,8 +1126,21 @@
 
 # standard UI feature enable/disable a setting
 sub checkBoxOverlay {
+	my $client = shift;
 	my $value = shift;
-	
+
+	unless (blessed($client) && $client->isa('Slim::Player::Client')) {
+
+		msg ("PLUGIN WARNING: plugins must now provide client when calling checkBoxOverlay\n");
+		bt();
+		$value = $client;
+
+	} elsif ($client->display->isa('Slim::Display::Graphics')) {
+
+		return $client->symbols( $value ? 'filledcircle' : 'circle' );
+
+	}
+
 	return $value ? "[X]" : "[ ]";
 }
 

Modified: trunk/server/Slim/Buttons/Input/Choice.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Input/Choice.pm?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Input/Choice.pm (original)
+++ trunk/server/Slim/Buttons/Input/Choice.pm Thu Aug 10 14:01:21 2006
@@ -421,7 +421,7 @@
 		
 		# assume a single non-descending list of items, 'pref' item must be given in the params
 		my $val = ref $pref eq 'CODE' ? $pref->($client) : $client->prefGet($pref);
-		$overlay2 = Slim::Buttons::Common::checkBoxOverlay($val eq getItemValue($client));
+		$overlay2 = Slim::Buttons::Common::checkBoxOverlay($client, $val eq getItemValue($client));
 	}
 
 	my $parts = {