X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=SCX%2FGUI.pm;h=371f919b85e0a6a0c134826686a70b64236583c3;hb=HEAD;hp=08b4ea90354f1de859c069aaa0819d7e551fc0e0;hpb=cd3dd2cbdb007c774c2485a7e14cf12b75249dfd;p=slotcarman.git

diff --git a/SCX/GUI.pm b/SCX/GUI.pm
index 08b4ea9..371f919 100755
--- a/SCX/GUI.pm
+++ b/SCX/GUI.pm
@@ -66,7 +66,7 @@ use Data::Dumper;
 sub hotkey {
 	my ($window, $key, $self) = @_;
 
-	if ($key->keyval == $Gtk2::Gdk::Keysyms{F5}) {
+	if ($key->keyval && $key->keyval == $Gtk2::Gdk::Keysyms{F5}) {
 		if ($self->{fullscreen}) {
 			leave_fullscreen($window, $self);
 		} else {
@@ -120,7 +120,7 @@ sub set_font_sizes {
 
 	if ($self->{img_height} <= 80) {
 		$self->{label_size} = 10;
-		$self->{value_size} = 18;
+		$self->{value_size} = 16;
 		$self->{lap_size} = 24;
 	} elsif ($self->{img_height} <= 100) {
 		$self->{label_size} = 12;
@@ -246,6 +246,8 @@ sub set_throttle {
 sub set_fuel {
 	my ($self, $row, $val) = @_;
 
+	return if $val > 8;
+
 	$self->set_image('image_fuel', $row, 'fuel', $val || 0);
 }
 
@@ -264,16 +266,21 @@ sub set_lap {
 }
 
 sub set_distance {
-	my ($self, $row, $time, $lap_diff, $time_diff) = @_;
+	my ($self, $row, $time, $lap_diff, $time_diff, $greyout) = @_;
 
 	my $text = '--';
 
 	if (defined $time) {
 		$text = format_race_time($time);
 	} elsif (defined $time_diff) {
-		$text = '−' . format_lap_time($time_diff);
+		$text = '+' . format_lap_time($time_diff);
 	} elsif (defined $lap_diff) {
-		$text = '−' . $lap_diff . ' laps';
+		$text = '+' . $lap_diff
+			. ($lap_diff == 1 ? ' lap' : ' laps');
+	}
+
+	if ($greyout) {
+		$text = '<span fgcolor="grey">' . $text . '</span>';
 	}
 
 	$self->set_label('label_distance', $row, $text);
@@ -285,16 +292,14 @@ sub set_laptime {
 	$self->set_label('label_laptime', $row, format_lap_time($text));
 }
 
-sub set_avg_lap {
-	my ($self, $row, $text) = @_;
-
-	$self->set_label('label_avg_lap', $row, format_lap_time($text));
-}
-
 sub set_best_lap {
-	my ($self, $row, $text) = @_;
+	my ($self, $row, $text, $overall_best) = @_;
 
-	$self->set_label('label_best_lap', $row, format_lap_time($text));
+	$text = format_lap_time($text);
+	if ($overall_best) {
+		$text = '<span fgcolor="red">' . $text . '</span>';
+	}
+	$self->set_label('label_best_lap', $row, $text);
 }
 
 sub set_name {