Lap/time counting, car icon displaing.

diff --git a/SCX/Car.pm b/SCX/Car.pm
index e55676dc43b9dc0cc005fe10648107abfb1f3e63..21d6c682051f765ecf8e1ea85b9e56954351f93c 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -55,5 +55,61 @@ sub set_backbutton {
        # TODO
 }
 
+sub set_model {
+       my ($self, $name) = @_;
+
+       return if (!defined $self->{car_icon} && !defined $name)
+               || (defined $self->{car_icon} && defined $name
+                       && $self->{car_icon} ne $name);
+
+       $self->{car_icon} = $name;
+       $self->gui->set_car_icon($self->{order}, $name);
+}
+
+sub set_lap {
+       my ($self, $lap_nr) = @_;
+
+       return if (!defined $self->{lap} && !defined $lap_nr)
+               || (defined $self->{lap} && defined $lap_nr
+                       && $self->{lap} != $lap_nr);
+
+       $self->{lap} = $lap_nr;
+       $self->gui->set_lap($self->{order}, $lap_nr || 'N/A');
+}
+
+sub set_laptime {
+       my ($self, $lap_time) = @_;
+
+       if (defined $lap_time) {
+               $lap_time = sprintf("%.2f", $lap_time);
+               if (!defined $self->{best_lap}
+                       || $self->{best_lap} > $lap_time) {
+
+                       $self->gui->set_best_lap($self->{order}, $lap_time);
+                       $self->{best_lap} = $lap_time;
+               }
+               
+       }
+
+       return if (!defined $self->{laptime} && !defined $lap_time)
+               || (defined $self->{laptime} && defined $lap_time
+                       && $self->{laptime} != $lap_time);
+
+       $self->{laptime} = $lap_time;
+
+       $self->gui->set_laptime($self->{order}, $lap_time || 'N/A');
+}
+
+sub set_driver {
+       my ($self, $driver_name) = @_;
+
+       return if (!defined $self->{driver} && !defined $driver_name)
+               || (defined $self->{driver} && defined $driver_name
+                       && $self->{driver} != $driver_name);
+
+       $self->{driver} = $driver_name;
+       $self->gui->set_driver($self->{order}, $driver_name || 'N/A');
+}
+
 1;
 

diff --git a/SCX/GUI.pm b/SCX/GUI.pm
index 9190fe39a328a4660dcb2e612d65893751aeea24..a0fd69122f6a36a7521020bdac13268f2fc1ab56 100755 (executable)
--- a/SCX/GUI.pm
+++ b/SCX/GUI.pm
@@ -5,6 +5,7 @@ package SCX::GUI;
 use strict;
 use utf8;
 
+use Encode;
 use Gtk2 '-init';
 use Glib qw(TRUE FALSE);
 
@@ -20,6 +21,7 @@ sub new {
                fuel_images => [
                        load_image_set('img/fuel%d.svg', 8, 100)
                ],
+               car_images => load_image_dir('img/SCXCars', 100),
                builder => Gtk2::Builder->new,
        };
 
@@ -57,6 +59,30 @@ sub load_image_set {
        return @rv;
 }
 
+sub load_image_dir {
+       my ($dir, $height) = @_;
+
+       my %rv;
+       for my $file (<$dir/*>) {
+               $file = Encode::decode('utf-8', $file);
+               my $name = $file;
+               $name =~ s/.*\///;
+               $name =~ s/\..*?$//;
+               $name =~ s/[-_]/ /g;
+               $name =~ s/\s+/ /g;
+
+
+               my $dummy = Gtk2::Gdk::Pixbuf->new_from_file($file)
+                       or next;
+
+               my $width = $dummy->get_width * $height / $dummy->get_height;
+               $rv{$name} = Gtk2::Gdk::Pixbuf->new_from_file_at_scale(
+                       $file, $width, $height, TRUE
+               );
+       }
+       return \%rv;
+}
+
 sub set_throttle {
        my ($self, $row, $val) = @_;
 
@@ -77,5 +103,55 @@ sub set_fuel {
        $image->set_from_pixbuf($self->{fuel_images}->[$val]);
 }
 
+sub set_car_icon {
+       my ($self, $row, $name) = @_;
+
+       $row++;
+       my $pixbuf = $self->{car_images}->{$name};
+       if (!$pixbuf) {
+               print "No car image for $name.\n";
+               return;
+       }
+
+       my $image = $self->get_object("image_car$row");
+       $image->set_from_pixbuf($pixbuf);
+}
+
+sub set_lap {
+       my ($self, $row, $text) = @_;
+
+       ++$row;
+       my $label = $self->get_object("label_lap$row")
+               or die "Can't get label_lap$row";
+       $label->set_label($text);
+}
+
+sub set_laptime {
+       my ($self, $row, $text) = @_;
+
+       ++$row;
+       my $label = $self->get_object("label_laptime$row")
+               or die "Can't get label_laptime$row";
+       $label->set_label($text);
+}
+
+sub set_best_lap {
+       my ($self, $row, $text) = @_;
+
+       ++$row;
+       my $label = $self->get_object("label_best_lap$row")
+               or die "Can't get label_best_lap$row";
+       $label->set_label($text);
+}
+
+sub set_driver {
+       my ($self, $row, $text) = @_;
+
+       ++$row;
+       my $label = $self->get_object("label_name$row")
+               or die "Can't get label_lap$row";
+       $label->set_label($text);
+}
+
 1;
 

diff --git a/SCX/Reader.pm b/SCX/Reader.pm
index e3431ad425ad40e66acd33832eb2e73ed097082a..873ffa058a09a451b217df87ed47196bd1efc37a 100644 (file)
--- a/SCX/Reader.pm
+++ b/SCX/Reader.pm
@@ -226,7 +226,19 @@ sub lap_time_packet {
                || $bytes[4] & 0x01
                || $bytes[5] & 0x01;
 
-       return $msg; # FIXME - to be implemented
+       my $car = $bytes[0];
+       my $round = 256*$bytes[1] + $bytes[2]
+               + ($bytes[3] & 2 ? 256 : 0)
+               + ($bytes[3] & 1 ? 1 : 0);
+       my $time = 256*$bytes[4] + $bytes[5]
+               + ($bytes[3] & 8 ? 256 : 0)
+               + ($bytes[3] & 4 ? 1 : 0);
+       $time *= 0.01024;
+
+       $self->track->car($car)->set_lap($round);
+       $self->track->car($car)->set_laptime($time);
+
+       return $msg;
 }
 
 

diff --git a/gui.pl b/gui.pl
index 8a00f244e431475dde98e9fe407c90da46ee1b4f..170289fb02134d87b24c17b556995764a7f75dc6 100755 (executable)
--- a/gui.pl
+++ b/gui.pl
@@ -10,7 +10,7 @@ use SCX::GUI;
 use SCX::Track;
 use SCX::Reader;
 
-my $no_reader = 0;
+my $no_reader = 1;
 
 my $gui = SCX::GUI->new;
 my $track = SCX::Track->new({ gui => $gui });
@@ -25,6 +25,28 @@ if (!$no_reader) {
        Glib::IO->add_watch(fileno($reader->fh), 'in', \&scx_read, $reader);
 }
 
+$track->car(0)->set_model('F1 Ferrari');
+$track->car(1)->set_model('F1 McLaren');
+$track->car(2)->set_model('F1 Williams');
+$track->car(3)->set_model('Citroen Xsara');
+$track->car(4)->set_model('Citroen C4');
+$track->car(5)->set_model('Ford Focus');
+
+$track->car(0)->set_lap(13);
+$track->car(1)->set_lap(11);
+$track->car(2)->set_lap(10);
+$track->car(3)->set_lap(undef);
+$track->car(4)->set_lap(undef);
+$track->car(5)->set_lap(undef);
+
+$track->car(0)->set_laptime(9.12322);
+$track->car(1)->set_laptime(15.313);
+$track->car(2)->set_laptime(8.193);
+
+$track->car(0)->set_driver('Ivi');
+$track->car(1)->set_driver('Filípek');
+$track->car(2)->set_driver('Táta');
+
 $gui->show;
 
 Gtk2->main();

diff --git a/img/SCXCars/Alfa_Romeo_156.jpg b/img/SCXCars/Alfa_Romeo_156.jpg
new file mode 100644 (file)
index 0000000..ac805d0
Binary files /dev/null and b/img/SCXCars/Alfa_Romeo_156.jpg differ

diff --git a/img/SCXCars/Aston_Martin_DBR9_L'illa.jpg b/img/SCXCars/Aston_Martin_DBR9_L'illa.jpg
new file mode 100644 (file)
index 0000000..4650e9b
Binary files /dev/null and b/img/SCXCars/Aston_Martin_DBR9_L'illa.jpg differ

diff --git a/img/SCXCars/Aston_Martin_DBR9_Salo_del_Hobby_2007.jpg b/img/SCXCars/Aston_Martin_DBR9_Salo_del_Hobby_2007.jpg
new file mode 100644 (file)
index 0000000..ffbe834
Binary files /dev/null and b/img/SCXCars/Aston_Martin_DBR9_Salo_del_Hobby_2007.jpg differ

diff --git a/img/SCXCars/Aston_Martin_Modena.jpg b/img/SCXCars/Aston_Martin_Modena.jpg
new file mode 100644 (file)
index 0000000..788a495
Binary files /dev/null and b/img/SCXCars/Aston_Martin_Modena.jpg differ

diff --git a/img/SCXCars/Aston_Martin_Red_Bull.jpg b/img/SCXCars/Aston_Martin_Red_Bull.jpg
new file mode 100644 (file)
index 0000000..217ec1f
Binary files /dev/null and b/img/SCXCars/Aston_Martin_Red_Bull.jpg differ

diff --git a/img/SCXCars/Audi_A4_Castrol.jpg b/img/SCXCars/Audi_A4_Castrol.jpg
new file mode 100644 (file)
index 0000000..2db8bfb
Binary files /dev/null and b/img/SCXCars/Audi_A4_Castrol.jpg differ

diff --git a/img/SCXCars/Audi_A4_Red_Bull.jpg b/img/SCXCars/Audi_A4_Red_Bull.jpg
new file mode 100644 (file)
index 0000000..f9991ac
Binary files /dev/null and b/img/SCXCars/Audi_A4_Red_Bull.jpg differ

diff --git a/img/SCXCars/Audi_A4_S-line.jpg b/img/SCXCars/Audi_A4_S-line.jpg
new file mode 100644 (file)
index 0000000..ad8418d
Binary files /dev/null and b/img/SCXCars/Audi_A4_S-line.jpg differ

diff --git a/img/SCXCars/Audi_A4_Siemens.jpg b/img/SCXCars/Audi_A4_Siemens.jpg
new file mode 100644 (file)
index 0000000..598ce90
Binary files /dev/null and b/img/SCXCars/Audi_A4_Siemens.jpg differ

diff --git a/img/SCXCars/Audi_R10.jpg b/img/SCXCars/Audi_R10.jpg
new file mode 100644 (file)
index 0000000..ad40bf6
Binary files /dev/null and b/img/SCXCars/Audi_R10.jpg differ

diff --git a/img/SCXCars/Audi_TT_Red_Bulle.jpg b/img/SCXCars/Audi_TT_Red_Bulle.jpg
new file mode 100644 (file)
index 0000000..493d3c3
Binary files /dev/null and b/img/SCXCars/Audi_TT_Red_Bulle.jpg differ

diff --git a/img/SCXCars/Audi_TT_S-line.jpg b/img/SCXCars/Audi_TT_S-line.jpg
new file mode 100644 (file)
index 0000000..7e3b7ee
Binary files /dev/null and b/img/SCXCars/Audi_TT_S-line.jpg differ

diff --git a/img/SCXCars/BMW_320_UK.jpg b/img/SCXCars/BMW_320_UK.jpg
new file mode 100644 (file)
index 0000000..d33f593
Binary files /dev/null and b/img/SCXCars/BMW_320_UK.jpg differ

diff --git a/img/SCXCars/BMW_320_weiss.jpg b/img/SCXCars/BMW_320_weiss.jpg
new file mode 100644 (file)
index 0000000..bfcd678
Binary files /dev/null and b/img/SCXCars/BMW_320_weiss.jpg differ

diff --git a/img/SCXCars/Chevrolet_Corvette_blau-gelb.jpg b/img/SCXCars/Chevrolet_Corvette_blau-gelb.jpg
new file mode 100644 (file)
index 0000000..ded1a53
Binary files /dev/null and b/img/SCXCars/Chevrolet_Corvette_blau-gelb.jpg differ

diff --git a/img/SCXCars/Chevrolet_Corvette_blau.jpg b/img/SCXCars/Chevrolet_Corvette_blau.jpg
new file mode 100644 (file)
index 0000000..449903b
Binary files /dev/null and b/img/SCXCars/Chevrolet_Corvette_blau.jpg differ

diff --git a/img/SCXCars/Chevrolet_Corvette_gelb.jpg b/img/SCXCars/Chevrolet_Corvette_gelb.jpg
new file mode 100644 (file)
index 0000000..1efdd26
Binary files /dev/null and b/img/SCXCars/Chevrolet_Corvette_gelb.jpg differ

diff --git a/img/SCXCars/Chevrolet_Wrangler.jpg b/img/SCXCars/Chevrolet_Wrangler.jpg
new file mode 100644 (file)
index 0000000..ef7ba92
Binary files /dev/null and b/img/SCXCars/Chevrolet_Wrangler.jpg differ

diff --git a/img/SCXCars/Citroen_C4.jpg b/img/SCXCars/Citroen_C4.jpg
new file mode 100644 (file)
index 0000000..8e15d24
Binary files /dev/null and b/img/SCXCars/Citroen_C4.jpg differ

diff --git a/img/SCXCars/Citroen_Xsara.jpg b/img/SCXCars/Citroen_Xsara.jpg
new file mode 100644 (file)
index 0000000..fc51f84
Binary files /dev/null and b/img/SCXCars/Citroen_Xsara.jpg differ

diff --git a/img/SCXCars/Dodge_Chargere.jpg b/img/SCXCars/Dodge_Chargere.jpg
new file mode 100644 (file)
index 0000000..0a96452
Binary files /dev/null and b/img/SCXCars/Dodge_Chargere.jpg differ

diff --git a/img/SCXCars/Dodge_Montoya.jpg b/img/SCXCars/Dodge_Montoya.jpg
new file mode 100644 (file)
index 0000000..a66fe8a
Binary files /dev/null and b/img/SCXCars/Dodge_Montoya.jpg differ

diff --git a/img/SCXCars/F1_BMW.jpg b/img/SCXCars/F1_BMW.jpg
new file mode 100644 (file)
index 0000000..0629f41
Binary files /dev/null and b/img/SCXCars/F1_BMW.jpg differ

diff --git a/img/SCXCars/F1_Ferrari (2).jpg b/img/SCXCars/F1_Ferrari (2).jpg
new file mode 100644 (file)
index 0000000..55f6e70
Binary files /dev/null and b/img/SCXCars/F1_Ferrari (2).jpg differ

diff --git a/img/SCXCars/F1_Ferrari (3).jpg b/img/SCXCars/F1_Ferrari (3).jpg
new file mode 100644 (file)
index 0000000..16b1f5f
Binary files /dev/null and b/img/SCXCars/F1_Ferrari (3).jpg differ

diff --git a/img/SCXCars/F1_Ferrari.jpg b/img/SCXCars/F1_Ferrari.jpg
new file mode 100644 (file)
index 0000000..dacab27
Binary files /dev/null and b/img/SCXCars/F1_Ferrari.jpg differ

diff --git a/img/SCXCars/F1_McLaren (2).jpg b/img/SCXCars/F1_McLaren (2).jpg
new file mode 100644 (file)
index 0000000..fc5ff4a
Binary files /dev/null and b/img/SCXCars/F1_McLaren (2).jpg differ

diff --git a/img/SCXCars/F1_McLaren (3).jpg b/img/SCXCars/F1_McLaren (3).jpg
new file mode 100644 (file)
index 0000000..c04f738
Binary files /dev/null and b/img/SCXCars/F1_McLaren (3).jpg differ

diff --git a/img/SCXCars/F1_McLaren.jpg b/img/SCXCars/F1_McLaren.jpg
new file mode 100644 (file)
index 0000000..8c1418f
Binary files /dev/null and b/img/SCXCars/F1_McLaren.jpg differ

diff --git a/img/SCXCars/F1_Renaulte.jpg b/img/SCXCars/F1_Renaulte.jpg
new file mode 100644 (file)
index 0000000..fb009af
Binary files /dev/null and b/img/SCXCars/F1_Renaulte.jpg differ

diff --git a/img/SCXCars/F1_Williams.jpg b/img/SCXCars/F1_Williams.jpg
new file mode 100644 (file)
index 0000000..5b47179
Binary files /dev/null and b/img/SCXCars/F1_Williams.jpg differ

diff --git a/img/SCXCars/Ferrari_360_Cric_Crac.jpg b/img/SCXCars/Ferrari_360_Cric_Crac.jpg
new file mode 100644 (file)
index 0000000..b99b6d7
Binary files /dev/null and b/img/SCXCars/Ferrari_360_Cric_Crac.jpg differ

diff --git a/img/SCXCars/Ferrari_360_Red_Bull.jpg b/img/SCXCars/Ferrari_360_Red_Bull.jpg
new file mode 100644 (file)
index 0000000..129d2e3
Binary files /dev/null and b/img/SCXCars/Ferrari_360_Red_Bull.jpg differ

diff --git a/img/SCXCars/Ferrari_360_Scot's.jpg b/img/SCXCars/Ferrari_360_Scot's.jpg
new file mode 100644 (file)
index 0000000..023e65e
Binary files /dev/null and b/img/SCXCars/Ferrari_360_Scot's.jpg differ

diff --git a/img/SCXCars/Ferrari_360_tricolore.jpg b/img/SCXCars/Ferrari_360_tricolore.jpg
new file mode 100644 (file)
index 0000000..b47b037
Binary files /dev/null and b/img/SCXCars/Ferrari_360_tricolore.jpg differ

diff --git a/img/SCXCars/Ferrari_550_Pirelli.jpg b/img/SCXCars/Ferrari_550_Pirelli.jpg
new file mode 100644 (file)
index 0000000..eae20c0
Binary files /dev/null and b/img/SCXCars/Ferrari_550_Pirelli.jpg differ

diff --git a/img/SCXCars/Ferrari_550_Red_Bull.jpg b/img/SCXCars/Ferrari_550_Red_Bull.jpg
new file mode 100644 (file)
index 0000000..ac8f5e2
Binary files /dev/null and b/img/SCXCars/Ferrari_550_Red_Bull.jpg differ

diff --git a/img/SCXCars/Ferrari_550_blau.jpg b/img/SCXCars/Ferrari_550_blau.jpg
new file mode 100644 (file)
index 0000000..20f35b5
Binary files /dev/null and b/img/SCXCars/Ferrari_550_blau.jpg differ

diff --git a/img/SCXCars/Ferrari_550_rot.jpg b/img/SCXCars/Ferrari_550_rot.jpg
new file mode 100644 (file)
index 0000000..1ae9f0f
Binary files /dev/null and b/img/SCXCars/Ferrari_550_rot.jpg differ

diff --git a/img/SCXCars/Ferrari_FXX_rot.jpg b/img/SCXCars/Ferrari_FXX_rot.jpg
new file mode 100644 (file)
index 0000000..1c9e8bd
Binary files /dev/null and b/img/SCXCars/Ferrari_FXX_rot.jpg differ

diff --git a/img/SCXCars/Ford_Escort_RS.jpg b/img/SCXCars/Ford_Escort_RS.jpg
new file mode 100644 (file)
index 0000000..87aba37
Binary files /dev/null and b/img/SCXCars/Ford_Escort_RS.jpg differ

diff --git a/img/SCXCars/Ford_Focus.jpg b/img/SCXCars/Ford_Focus.jpg
new file mode 100644 (file)
index 0000000..dfe2ea9
Binary files /dev/null and b/img/SCXCars/Ford_Focus.jpg differ

diff --git a/img/SCXCars/Ford_Sierra.jpg b/img/SCXCars/Ford_Sierra.jpg
new file mode 100644 (file)
index 0000000..a1882cc
Binary files /dev/null and b/img/SCXCars/Ford_Sierra.jpg differ

diff --git a/img/SCXCars/Honda_Accord.jpg b/img/SCXCars/Honda_Accord.jpg
new file mode 100644 (file)
index 0000000..8ee2bed
Binary files /dev/null and b/img/SCXCars/Honda_Accord.jpg differ

diff --git a/img/SCXCars/Honda_Accord_Monroe.jpg b/img/SCXCars/Honda_Accord_Monroe.jpg
new file mode 100644 (file)
index 0000000..8781b09
Binary files /dev/null and b/img/SCXCars/Honda_Accord_Monroe.jpg differ

diff --git a/img/SCXCars/Honda_Accord_schwarz.jpg b/img/SCXCars/Honda_Accord_schwarz.jpg
new file mode 100644 (file)
index 0000000..accab45
Binary files /dev/null and b/img/SCXCars/Honda_Accord_schwarz.jpg differ

diff --git a/img/SCXCars/Mercedes_CLK_Vodafone.jpg b/img/SCXCars/Mercedes_CLK_Vodafone.jpg
new file mode 100644 (file)
index 0000000..8a6080f
Binary files /dev/null and b/img/SCXCars/Mercedes_CLK_Vodafone.jpg differ

diff --git a/img/SCXCars/Mercedes_C_AMG.jpg b/img/SCXCars/Mercedes_C_AMG.jpg
new file mode 100644 (file)
index 0000000..b6a6718
Binary files /dev/null and b/img/SCXCars/Mercedes_C_AMG.jpg differ

diff --git a/img/SCXCars/Mercedes_C_Daimler-Bank.jpg b/img/SCXCars/Mercedes_C_Daimler-Bank.jpg
new file mode 100644 (file)
index 0000000..31a7553
Binary files /dev/null and b/img/SCXCars/Mercedes_C_Daimler-Bank.jpg differ

diff --git a/img/SCXCars/Mercedes_C_Trekstor.jpg b/img/SCXCars/Mercedes_C_Trekstor.jpg
new file mode 100644 (file)
index 0000000..21f6a4b
Binary files /dev/null and b/img/SCXCars/Mercedes_C_Trekstor.jpg differ

diff --git a/img/SCXCars/Mercedes_C_Vodafone.jpg b/img/SCXCars/Mercedes_C_Vodafone.jpg
new file mode 100644 (file)
index 0000000..b712415
Binary files /dev/null and b/img/SCXCars/Mercedes_C_Vodafone.jpg differ

diff --git a/img/SCXCars/Mitsubishi_Evo8 (2).JPG b/img/SCXCars/Mitsubishi_Evo8 (2).JPG
new file mode 100644 (file)
index 0000000..f7607f5
Binary files /dev/null and b/img/SCXCars/Mitsubishi_Evo8 (2).JPG differ

diff --git a/img/SCXCars/Mitsubishi_Evo8 (3).JPG b/img/SCXCars/Mitsubishi_Evo8 (3).JPG
new file mode 100644 (file)
index 0000000..f2a8db9
Binary files /dev/null and b/img/SCXCars/Mitsubishi_Evo8 (3).JPG differ

diff --git a/img/SCXCars/Mitsubishi_Evo8.jpg b/img/SCXCars/Mitsubishi_Evo8.jpg
new file mode 100644 (file)
index 0000000..e06d7df
Binary files /dev/null and b/img/SCXCars/Mitsubishi_Evo8.jpg differ

diff --git a/img/SCXCars/Morgan_Plus_8.jpg b/img/SCXCars/Morgan_Plus_8.jpg
new file mode 100644 (file)
index 0000000..b44c852
Binary files /dev/null and b/img/SCXCars/Morgan_Plus_8.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Chevrolet_AT&T.jpg b/img/SCXCars/Nascar_COT_Chevrolet_AT&T.jpg
new file mode 100644 (file)
index 0000000..a4baf44
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Chevrolet_AT&T.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Chevrolet_Caterpillar.jpg b/img/SCXCars/Nascar_COT_Chevrolet_Caterpillar.jpg
new file mode 100644 (file)
index 0000000..277a55c
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Chevrolet_Caterpillar.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Chevrolet_National_Guard.jpg b/img/SCXCars/Nascar_COT_Chevrolet_National_Guard.jpg
new file mode 100644 (file)
index 0000000..6f41c5c
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Chevrolet_National_Guard.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Chevrolet_National_Guard_blau.jpg b/img/SCXCars/Nascar_COT_Chevrolet_National_Guard_blau.jpg
new file mode 100644 (file)
index 0000000..f92fa10
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Chevrolet_National_Guard_blau.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Chevrolet_Pennzoil.jpg b/img/SCXCars/Nascar_COT_Chevrolet_Pennzoil.jpg
new file mode 100644 (file)
index 0000000..d729da1
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Chevrolet_Pennzoil.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Chevrolet_Reese's.jpg b/img/SCXCars/Nascar_COT_Chevrolet_Reese's.jpg
new file mode 100644 (file)
index 0000000..bb66fdc
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Chevrolet_Reese's.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Ford_3M.jpg b/img/SCXCars/Nascar_COT_Ford_3M.jpg
new file mode 100644 (file)
index 0000000..a021893
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Ford_3M.jpg differ

diff --git a/img/SCXCars/Nascar_COT_Ford_Aflac (2).jpg b/img/SCXCars/Nascar_COT_Ford_Aflac (2).jpg
new file mode 100644 (file)
index 0000000..8b8768e
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Ford_Aflac (2).jpg differ

diff --git a/img/SCXCars/Nascar_COT_Ford_Aflac.jpg b/img/SCXCars/Nascar_COT_Ford_Aflac.jpg
new file mode 100644 (file)
index 0000000..0dbfd4c
Binary files /dev/null and b/img/SCXCars/Nascar_COT_Ford_Aflac.jpg differ

diff --git a/img/SCXCars/Nascar_Chevrolet_Goodwrench.jpg b/img/SCXCars/Nascar_Chevrolet_Goodwrench.jpg
new file mode 100644 (file)
index 0000000..1a6e925
Binary files /dev/null and b/img/SCXCars/Nascar_Chevrolet_Goodwrench.jpg differ

diff --git a/img/SCXCars/Nascar_Chevrolet_Pennzoil.jpg b/img/SCXCars/Nascar_Chevrolet_Pennzoil.jpg
new file mode 100644 (file)
index 0000000..0e408ec
Binary files /dev/null and b/img/SCXCars/Nascar_Chevrolet_Pennzoil.jpg differ

diff --git a/img/SCXCars/Nascar_Dodge_Charger (2).jpg b/img/SCXCars/Nascar_Dodge_Charger (2).jpg
new file mode 100644 (file)
index 0000000..625f17c
Binary files /dev/null and b/img/SCXCars/Nascar_Dodge_Charger (2).jpg differ

diff --git a/img/SCXCars/Nascar_Dodge_Charger.jpg b/img/SCXCars/Nascar_Dodge_Charger.jpg
new file mode 100644 (file)
index 0000000..f9a792c
Binary files /dev/null and b/img/SCXCars/Nascar_Dodge_Charger.jpg differ

diff --git a/img/SCXCars/Nascar_Ford_De_Walt.jpg b/img/SCXCars/Nascar_Ford_De_Walt.jpg
new file mode 100644 (file)
index 0000000..587c0a4
Binary files /dev/null and b/img/SCXCars/Nascar_Ford_De_Walt.jpg differ

diff --git a/img/SCXCars/Nissan R390.gif b/img/SCXCars/Nissan R390.gif
new file mode 100644 (file)
index 0000000..05b17a3
Binary files /dev/null and b/img/SCXCars/Nissan R390.gif differ

diff --git a/img/SCXCars/Opel_Astra_PM.jpg b/img/SCXCars/Opel_Astra_PM.jpg
new file mode 100644 (file)
index 0000000..10d37a4
Binary files /dev/null and b/img/SCXCars/Opel_Astra_PM.jpg differ

diff --git a/img/SCXCars/Opel_Astra_Service-Fit.jpg b/img/SCXCars/Opel_Astra_Service-Fit.jpg
new file mode 100644 (file)
index 0000000..f93ec29
Binary files /dev/null and b/img/SCXCars/Opel_Astra_Service-Fit.jpg differ

diff --git a/img/SCXCars/Opel_Astra_VitaPhone.jpg b/img/SCXCars/Opel_Astra_VitaPhone.jpg
new file mode 100644 (file)
index 0000000..f712d6e
Binary files /dev/null and b/img/SCXCars/Opel_Astra_VitaPhone.jpg differ

diff --git a/img/SCXCars/Opel_Vectra_Stern.jpg b/img/SCXCars/Opel_Vectra_Stern.jpg
new file mode 100644 (file)
index 0000000..76bf8d3
Binary files /dev/null and b/img/SCXCars/Opel_Vectra_Stern.jpg differ

diff --git a/img/SCXCars/Opel_Vectra_Valvoline.jpg b/img/SCXCars/Opel_Vectra_Valvoline.jpg
new file mode 100644 (file)
index 0000000..34e755c
Binary files /dev/null and b/img/SCXCars/Opel_Vectra_Valvoline.jpg differ

diff --git a/img/SCXCars/Peugeot_307.jpg b/img/SCXCars/Peugeot_307.jpg
new file mode 100644 (file)
index 0000000..d6488a0
Binary files /dev/null and b/img/SCXCars/Peugeot_307.jpg differ

diff --git a/img/SCXCars/Peugeot_908.jpg b/img/SCXCars/Peugeot_908.jpg
new file mode 100644 (file)
index 0000000..4185849
Binary files /dev/null and b/img/SCXCars/Peugeot_908.jpg differ

diff --git a/img/SCXCars/Porsche_GT3_Club.jpg b/img/SCXCars/Porsche_GT3_Club.jpg
new file mode 100644 (file)
index 0000000..61fdd3c
Binary files /dev/null and b/img/SCXCars/Porsche_GT3_Club.jpg differ

diff --git a/img/SCXCars/Porsche_GT3_Cup.jpg b/img/SCXCars/Porsche_GT3_Cup.jpg
new file mode 100644 (file)
index 0000000..9317d82
Binary files /dev/null and b/img/SCXCars/Porsche_GT3_Cup.jpg differ

diff --git a/img/SCXCars/Porsche_GT3_UPS.jpg b/img/SCXCars/Porsche_GT3_UPS.jpg
new file mode 100644 (file)
index 0000000..ca7c2d5
Binary files /dev/null and b/img/SCXCars/Porsche_GT3_UPS.jpg differ

diff --git a/img/SCXCars/Renault_R5.jpg b/img/SCXCars/Renault_R5.jpg
new file mode 100644 (file)
index 0000000..4deb9de
Binary files /dev/null and b/img/SCXCars/Renault_R5.jpg differ

diff --git a/img/SCXCars/ScalexSafety.jpeg b/img/SCXCars/ScalexSafety.jpeg
new file mode 100644 (file)
index 0000000..247a190
Binary files /dev/null and b/img/SCXCars/ScalexSafety.jpeg differ

diff --git a/img/SCXCars/Seat_131.jpg b/img/SCXCars/Seat_131.jpg
new file mode 100644 (file)
index 0000000..620622b
Binary files /dev/null and b/img/SCXCars/Seat_131.jpg differ

diff --git a/img/SCXCars/Seat_Cupra_Dommo.jpg b/img/SCXCars/Seat_Cupra_Dommo.jpg
new file mode 100644 (file)
index 0000000..2a13077
Binary files /dev/null and b/img/SCXCars/Seat_Cupra_Dommo.jpg differ

diff --git a/img/SCXCars/Seat_Cupra_Puma.jpg b/img/SCXCars/Seat_Cupra_Puma.jpg
new file mode 100644 (file)
index 0000000..72a2ec1
Binary files /dev/null and b/img/SCXCars/Seat_Cupra_Puma.jpg differ

diff --git a/img/SCXCars/Seat_Leon_Monroe.jpg b/img/SCXCars/Seat_Leon_Monroe.jpg
new file mode 100644 (file)
index 0000000..c095e7d
Binary files /dev/null and b/img/SCXCars/Seat_Leon_Monroe.jpg differ

diff --git a/img/SCXCars/Seat_Leon_Monteiro.jpg b/img/SCXCars/Seat_Leon_Monteiro.jpg
new file mode 100644 (file)
index 0000000..4ef1a87
Binary files /dev/null and b/img/SCXCars/Seat_Leon_Monteiro.jpg differ

diff --git a/img/SCXCars/Seat_Leon_Red_Bull.jpg b/img/SCXCars/Seat_Leon_Red_Bull.jpg
new file mode 100644 (file)
index 0000000..e9a30e1
Binary files /dev/null and b/img/SCXCars/Seat_Leon_Red_Bull.jpg differ

diff --git a/img/SCXCars/Seat_Leon_SCX (2).jpg b/img/SCXCars/Seat_Leon_SCX (2).jpg
new file mode 100644 (file)
index 0000000..5208cd2
Binary files /dev/null and b/img/SCXCars/Seat_Leon_SCX (2).jpg differ

diff --git a/img/SCXCars/Seat_Leon_SCX.jpg b/img/SCXCars/Seat_Leon_SCX.jpg
new file mode 100644 (file)
index 0000000..e17c16c
Binary files /dev/null and b/img/SCXCars/Seat_Leon_SCX.jpg differ

diff --git a/img/SCXCars/Seat_Leon_Scalextric.jpg b/img/SCXCars/Seat_Leon_Scalextric.jpg
new file mode 100644 (file)
index 0000000..526d691
Binary files /dev/null and b/img/SCXCars/Seat_Leon_Scalextric.jpg differ

diff --git a/img/SCXCars/Seat_Leon_Valeo.jpg b/img/SCXCars/Seat_Leon_Valeo.jpg
new file mode 100644 (file)
index 0000000..96c5575
Binary files /dev/null and b/img/SCXCars/Seat_Leon_Valeo.jpg differ

diff --git a/img/SCXCars/Skoda_Fabia (2).jpg b/img/SCXCars/Skoda_Fabia (2).jpg
new file mode 100644 (file)
index 0000000..c2e3c4c
Binary files /dev/null and b/img/SCXCars/Skoda_Fabia (2).jpg differ

diff --git a/img/SCXCars/Skoda_Fabia.jpg b/img/SCXCars/Skoda_Fabia.jpg
new file mode 100644 (file)
index 0000000..3eca87f
Binary files /dev/null and b/img/SCXCars/Skoda_Fabia.jpg differ

diff --git a/img/SCXCars/Spirit_Peugeot_406_Silber.jpg b/img/SCXCars/Spirit_Peugeot_406_Silber.jpg
new file mode 100644 (file)
index 0000000..1f47766
Binary files /dev/null and b/img/SCXCars/Spirit_Peugeot_406_Silber.jpg differ

diff --git a/img/SCXCars/Subaru_Impreza_Rossi.jpg b/img/SCXCars/Subaru_Impreza_Rossi.jpg
new file mode 100644 (file)
index 0000000..f9c7974
Binary files /dev/null and b/img/SCXCars/Subaru_Impreza_Rossi.jpg differ

diff --git a/img/SCXCars/Subaru_Impreza_blau.jpg b/img/SCXCars/Subaru_Impreza_blau.jpg
new file mode 100644 (file)
index 0000000..d68179c
Binary files /dev/null and b/img/SCXCars/Subaru_Impreza_blau.jpg differ

diff --git a/img/SCXCars/Subaru_Impreza_new.jpg b/img/SCXCars/Subaru_Impreza_new.jpg
new file mode 100644 (file)
index 0000000..21785ae
Binary files /dev/null and b/img/SCXCars/Subaru_Impreza_new.jpg differ

diff --git a/img/SCXCars/Tuning_Car_1.jpg b/img/SCXCars/Tuning_Car_1.jpg
new file mode 100644 (file)
index 0000000..25792b7
Binary files /dev/null and b/img/SCXCars/Tuning_Car_1.jpg differ

diff --git a/img/SCXCars/Tuning_Car_2 (2).jpg b/img/SCXCars/Tuning_Car_2 (2).jpg
new file mode 100644 (file)
index 0000000..9a4b463
Binary files /dev/null and b/img/SCXCars/Tuning_Car_2 (2).jpg differ

diff --git a/img/SCXCars/Tuning_Car_2.jpg b/img/SCXCars/Tuning_Car_2.jpg
new file mode 100644 (file)
index 0000000..b92a2d1
Binary files /dev/null and b/img/SCXCars/Tuning_Car_2.jpg differ

diff --git a/img/SCXCars/Tuning_Car_3.jpg b/img/SCXCars/Tuning_Car_3.jpg
new file mode 100644 (file)
index 0000000..e65525c
Binary files /dev/null and b/img/SCXCars/Tuning_Car_3.jpg differ

diff --git a/img/SCXCars/Umbau_Aston_Martin_DBR9_Gulf.jpg b/img/SCXCars/Umbau_Aston_Martin_DBR9_Gulf.jpg
new file mode 100644 (file)
index 0000000..360b817
Binary files /dev/null and b/img/SCXCars/Umbau_Aston_Martin_DBR9_Gulf.jpg differ

diff --git a/img/SCXCars/Umbau_Audi_R8_Pro.jpg b/img/SCXCars/Umbau_Audi_R8_Pro.jpg
new file mode 100644 (file)
index 0000000..1e4ac6b
Binary files /dev/null and b/img/SCXCars/Umbau_Audi_R8_Pro.jpg differ

diff --git a/img/SCXCars/Volvo_S60_Volvo_Original.jpg b/img/SCXCars/Volvo_S60_Volvo_Original.jpg
new file mode 100644 (file)
index 0000000..0e5f643
Binary files /dev/null and b/img/SCXCars/Volvo_S60_Volvo_Original.jpg differ

diff --git a/slotcarman.glade b/slotcarman.glade
index e31b0566fb3bd1662d52c7b197836a51d9d828f2..1bd3738ed3fba1667a5576aa926254a10f4f47e5 100644 (file)
--- a/slotcarman.glade
+++ b/slotcarman.glade
@@ -254,7 +254,6 @@
             <child>
               <object class="GtkLabel" id="label_name1">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Ivi</property>
                 <property name="ellipsize">end</property>
                 <property name="width_chars">25</property>
                 <property name="single_line_mode">True</property>
@@ -351,88 +350,362 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_throttle2">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">9</property>
+                <property name="right_attach">10</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_throttle3">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">9</property>
+                <property name="right_attach">10</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_throttle4">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">9</property>
+                <property name="right_attach">10</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_throttle5">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">9</property>
+                <property name="right_attach">10</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_throttle6">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">9</property>
+                <property name="right_attach">10</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_car1">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_car2">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_car3">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_car4">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_car5">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkImage" id="image_car6">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_lap1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="justify">right</property>
+                <property name="width_chars">4</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_lap2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="justify">right</property>
+                <property name="width_chars">4</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_lap3">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="justify">right</property>
+                <property name="width_chars">4</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_lap4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="justify">right</property>
+                <property name="width_chars">4</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_lap5">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="justify">right</property>
+                <property name="width_chars">4</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_lap6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="justify">right</property>
+                <property name="width_chars">4</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_name2">
+                <property name="visible">True</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">25</property>
+                <property name="single_line_mode">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_name3">
+                <property name="visible">True</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">25</property>
+                <property name="single_line_mode">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_name4">
+                <property name="visible">True</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">25</property>
+                <property name="single_line_mode">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_name5">
+                <property name="visible">True</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">25</property>
+                <property name="single_line_mode">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_name6">
+                <property name="visible">True</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">25</property>
+                <property name="single_line_mode">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_laptime1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="right_attach">5</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_laptime2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="right_attach">5</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_laptime3">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="right_attach">5</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_laptime4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="right_attach">5</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_laptime5">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="right_attach">5</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_laptime6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="right_attach">5</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
             </child>
             <child>
               <placeholder/>
@@ -522,64 +795,74 @@
               <placeholder/>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label_best_lap1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="width_chars">7</property>
+              </object>
+              <packing>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
             </child>
             <child>
-              <object class="GtkImage" id="image_throttle2">
+              <object class="GtkLabel" id="label_best_lap2">
                 <property name="visible">True</property>
-                <property name="stock">gtk-missing-image</property>
+                <property name="label" translatable="yes">label</property>
               </object>
               <packing>
-                <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="image_throttle3">
+              <object class="GtkLabel" id="label_best_lap3">
                 <property name="visible">True</property>
-                <property name="stock">gtk-missing-image</property>
+                <property name="label" translatable="yes">label</property>
               </object>
               <packing>
-                <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
                 <property name="top_attach">3</property>
                 <property name="bottom_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="image_throttle4">
+              <object class="GtkLabel" id="label_best_lap4">
                 <property name="visible">True</property>
-                <property name="stock">gtk-missing-image</property>
+                <property name="label" translatable="yes">label</property>
               </object>
               <packing>
-                <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
                 <property name="top_attach">4</property>
                 <property name="bottom_attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="image_throttle5">
+              <object class="GtkLabel" id="label_best_lap5">
                 <property name="visible">True</property>
-                <property name="stock">gtk-missing-image</property>
+                <property name="label" translatable="yes">label</property>
               </object>
               <packing>
-                <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
                 <property name="top_attach">5</property>
                 <property name="bottom_attach">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="image_throttle6">
+              <object class="GtkLabel" id="label_best_lap6">
                 <property name="visible">True</property>
-                <property name="stock">gtk-missing-image</property>
+                <property name="label" translatable="yes">label</property>
               </object>
               <packing>
-                <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
                 <property name="top_attach">6</property>
                 <property name="bottom_attach">7</property>
               </packing>