From cd3dd2cbdb007c774c2485a7e14cf12b75249dfd Mon Sep 17 00:00:00 2001 From: "Jan \"Yenya\" Kasprzak" Date: Thu, 9 Dec 2010 22:58:22 +0100 Subject: [PATCH] Button reporting, fullscreen mode. --- SCX/Car.pm | 11 +- SCX/GUI.pm | 55 ++++++- SCX/Reader.pm | 6 +- gui.pl | 4 +- img/throttle0.svg | 31 +++- img/throttle0button.svg | 273 ++++++++++++++++++++++++++++++++++ img/throttle1.svg | 33 ++++- img/throttle10.svg | 37 +++-- img/throttle10button.svg | 312 +++++++++++++++++++++++++++++++++++++++ img/throttle11.svg | 37 +++-- img/throttle11button.svg | 312 +++++++++++++++++++++++++++++++++++++++ img/throttle12.svg | 37 +++-- img/throttle12button.svg | 312 +++++++++++++++++++++++++++++++++++++++ img/throttle13.svg | 30 +++- img/throttle1button.svg | 286 +++++++++++++++++++++++++++++++++++ img/throttle2.svg | 33 ++++- img/throttle2button.svg | 286 +++++++++++++++++++++++++++++++++++ img/throttle3.svg | 33 ++++- img/throttle3button.svg | 286 +++++++++++++++++++++++++++++++++++ img/throttle4.svg | 31 +++- img/throttle4button.svg | 286 +++++++++++++++++++++++++++++++++++ img/throttle5.svg | 33 ++++- img/throttle5button.svg | 286 +++++++++++++++++++++++++++++++++++ img/throttle6.svg | 33 ++++- img/throttle6button.svg | 286 +++++++++++++++++++++++++++++++++++ img/throttle7.svg | 35 ++++- img/throttle7button.svg | 299 +++++++++++++++++++++++++++++++++++++ img/throttle8.svg | 35 ++++- img/throttle8button.svg | 299 +++++++++++++++++++++++++++++++++++++ img/throttle9.svg | 37 +++-- img/throttle9button.svg | 312 +++++++++++++++++++++++++++++++++++++++ slotcarman.glade | 28 +++- 32 files changed, 4288 insertions(+), 126 deletions(-) create mode 100644 img/throttle0button.svg create mode 100644 img/throttle10button.svg create mode 100644 img/throttle11button.svg create mode 100644 img/throttle12button.svg create mode 100644 img/throttle1button.svg create mode 100644 img/throttle2button.svg create mode 100644 img/throttle3button.svg create mode 100644 img/throttle4button.svg create mode 100644 img/throttle5button.svg create mode 100644 img/throttle6button.svg create mode 100644 img/throttle7button.svg create mode 100644 img/throttle8button.svg create mode 100644 img/throttle9button.svg diff --git a/SCX/Car.pm b/SCX/Car.pm index 31149a2..b6466be 100644 --- a/SCX/Car.pm +++ b/SCX/Car.pm @@ -12,6 +12,7 @@ sub new { gui => $args->{gui}, driver => $args->{driver} || '--', throttle => undef, + button => undef, fuel => 0, lap => 0, laptime => 0, @@ -44,9 +45,10 @@ sub same { } sub set_throttle { - my ($self, $val, $time) = @_; + my ($self, $val, $button, $time) = @_; - return if $self->same('throttle', $val); + return if $self->same('throttle', $val) + && $self->same('button', $button); if ($self->track->{start_in_progress} && $val) { $self->{early_start} = 1; @@ -60,7 +62,7 @@ sub set_throttle { } } - $self->gui->set_throttle($self->{order}, $val); + $self->gui->set_throttle($self->{order}, $val, $button); } @@ -169,7 +171,8 @@ sub set_order { $self->gui->set_name($self->{order}, $self->{driver}); $self->gui->set_car_icon($self->{order}, $self->{car_img}); - $self->gui->set_throttle($self->{order}, $self->{throttle}); + $self->gui->set_throttle($self->{order}, $self->{throttle}, + $self->{button}); $self->gui->set_lap($self->{order}, $self->{lap}); $self->gui->set_laptime($self->{order}, $self->{laptime}); $self->gui->set_best_lap($self->{order}, $self->{best_lap}); diff --git a/SCX/GUI.pm b/SCX/GUI.pm index da3f9f4..08b4ea9 100755 --- a/SCX/GUI.pm +++ b/SCX/GUI.pm @@ -8,6 +8,7 @@ use utf8; use Carp; use Encode; use Gtk2 '-init'; +use Gtk2::Gdk::Keysyms; use Glib qw(TRUE FALSE); our $BASE_SIZE; @@ -26,7 +27,7 @@ sub new { $self->{builder}->add_from_file('slotcarman.glade'); - $self->{builder}->connect_signals(undef); + $self->{builder}->connect_signals($self); $self->load_all_images; $self->set_font_sizes; @@ -60,14 +61,52 @@ sub delete_event { Gtk2->main_quit; } sub quit { Gtk2->main_quit; } +use Data::Dumper; + +sub hotkey { + my ($window, $key, $self) = @_; + + if ($key->keyval == $Gtk2::Gdk::Keysyms{F5}) { + if ($self->{fullscreen}) { + leave_fullscreen($window, $self); + } else { + fullscreen($window, $self); + } + return 1; + } + return 0; +} + sub fullscreen { - my ($self) = @_; + my ($widget, $self) = @_; + + return if $self->{fullscreen}; + $self->get_object('menubar1')->hide; + $self->get_object('statusbar1')->hide; $self->get_object('slotcarman')->fullscreen; + + $self->{fullscreen} = 1; my $h = $self->get_object('image_car1')->allocation->height; - print "h=$h\n"; + my $h1 = $self->get_object('slotcarman')->allocation->height; + print "h=$h, h1=$h1\n"; } - + +sub leave_fullscreen { + my ($widget, $self) = @_; + + return if !$self->{fullscreen}; + + $self->get_object('menubar1')->show; + $self->get_object('statusbar1')->show; + $self->get_object('slotcarman')->unfullscreen; + + $self->{fullscreen} = undef;; + my $h = $self->get_object('image_car1')->allocation->height; + my $h1 = $self->get_object('slotcarman')->allocation->height; + print "h=$h, h1=$h1\n"; +} + sub watch_resize { my ($window, $rectangle, $self) = @_; print "w=", $rectangle->width, ", h=", $rectangle->height, "\n"; @@ -110,6 +149,9 @@ sub load_all_images { $self->{throttle_images} = [ load_image_set('img/throttle%d.svg', 13, $h) ]; + $self->{throttle_button_images} = [ + load_image_set('img/throttle%dbutton.svg', 12, $h) + ]; $self->{fuel_images} = [ load_image_set('img/fuel%d.svg', 8, int(0.6 * $h)) ]; @@ -194,10 +236,11 @@ sub set_image { } sub set_throttle { - my ($self, $row, $val) = @_; + my ($self, $row, $val, $button) = @_; $val = 13 if !defined $val; - $self->set_image('image_throttle', $row, 'throttle', $val); + $self->set_image('image_throttle', $row, + $button ? 'throttle_button' : 'throttle', $val); } sub set_fuel { diff --git a/SCX/Reader.pm b/SCX/Reader.pm index ff5894d..59f7ca3 100644 --- a/SCX/Reader.pm +++ b/SCX/Reader.pm @@ -442,7 +442,8 @@ sub controller_status_packet { my $byte = $bytes[$car]; if ($byte == 0xAA) { - $self->track->car($car)->set_throttle(undef); + $self->track->car($car)->set_throttle(undef, undef, + $self->{last_read_time}); next; } @@ -450,10 +451,9 @@ sub controller_status_packet { my $backbutton = !($byte & 0x10); my $throttle = $byte & 0x0f; - $self->track->car($car)->set_throttle($throttle, + $self->track->car($car)->set_throttle($throttle, $backbutton, $self->{last_read_time}); $self->track->car($car)->set_light($light); - $self->track->car($car)->set_backbutton($backbutton); } return $msg; diff --git a/gui.pl b/gui.pl index 85b994d..3f74cc4 100755 --- a/gui.pl +++ b/gui.pl @@ -10,7 +10,7 @@ use SCX::GUI; use SCX::Track; use SCX::Reader; -my $gui = SCX::GUI->new({ img_height => 100 }); +my $gui = SCX::GUI->new({ img_height => 80 }); my $track = SCX::Track->new({ gui => $gui }); my $reader; @@ -72,7 +72,7 @@ if ($reader) { $track->car(2)->set_fuel(8); $track->car(0)->set_throttle(0); - $track->car(1)->set_throttle(8); + $track->car(1)->set_throttle(8, 1); $track->car(2)->set_throttle(12); } diff --git a/img/throttle0.svg b/img/throttle0.svg index b1926bb..dba9a47 100644 --- a/img/throttle0.svg +++ b/img/throttle0.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle1.svg"> + sodipodi:docname="throttle0.svg"> @@ -140,7 +140,7 @@ image/svg+xml - + @@ -245,10 +245,29 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" sodipodi:open="true" /> + + diff --git a/img/throttle0button.svg b/img/throttle0button.svg new file mode 100644 index 0000000..a1c0a36 --- /dev/null +++ b/img/throttle0button.svg @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle1.svg b/img/throttle1.svg index 1d9de7f..bdefca3 100644 --- a/img/throttle1.svg +++ b/img/throttle1.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle2.svg"> + sodipodi:docname="throttle1.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -254,7 +254,7 @@ sodipodi:end="2.7488936" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 42.067227,125.461" + d="M 55.073593,144.92641 C 49.502077,139.35489 45.08251,132.74054 42.067227,125.461" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -263,5 +263,24 @@ style="fill:none;stroke:#66ff00;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle10.svg b/img/throttle10.svg index c5dadab..984bc27 100644 --- a/img/throttle10.svg +++ b/img/throttle10.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle11.svg"> + sodipodi:docname="throttle10.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -255,7 +255,7 @@ sodipodi:end="4.7355553" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 98.889855,42.5161" + d="M 55.073593,144.92641 C 31.642135,121.49495 31.642136,83.50505 55.073594,60.073593 66.666757,48.48043 82.499046,42.136317 98.889855,42.5161" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -271,7 +271,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="M 97.500001,42.5 A 60,60 0 0 1 142.17892,62.452602" + d="m 97.500001,42.5 c 17.051569,0 33.297739,7.255174 44.678919,19.952602" transform="translate(2.5,292.5)" sodipodi:start="4.712389" sodipodi:end="5.5523973" @@ -280,7 +280,7 @@ sodipodi:end="6.2831853" sodipodi:start="5.4977871" transform="translate(2.5,292.5)" - d="M 139.92641,60.073591 A 60,60 0 0 1 157.5,102.5" + d="M 139.92641,60.073591 C 151.17859,71.325774 157.5,86.587009 157.5,102.5" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -289,5 +289,24 @@ style="fill:none;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle10button.svg b/img/throttle10button.svg new file mode 100644 index 0000000..c92387e --- /dev/null +++ b/img/throttle10button.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle11.svg b/img/throttle11.svg index 1b7d964..0b46b15 100644 --- a/img/throttle11.svg +++ b/img/throttle11.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle12.svg"> + sodipodi:docname="throttle11.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -255,7 +255,7 @@ sodipodi:end="4.7355553" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 98.889855,42.5161" + d="M 55.073593,144.92641 C 31.642135,121.49495 31.642136,83.50505 55.073594,60.073593 66.666757,48.48043 82.499046,42.136317 98.889855,42.5161" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -271,7 +271,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="M 97.500001,42.5 A 60,60 0 0 1 142.17892,62.452602" + d="m 97.500001,42.5 c 17.051569,0 33.297739,7.255174 44.678919,19.952602" transform="translate(2.5,292.5)" sodipodi:start="4.712389" sodipodi:end="5.5523973" @@ -280,7 +280,7 @@ sodipodi:end="6.6758844" sodipodi:start="5.4977871" transform="translate(2.5,292.5)" - d="m 139.92641,60.073591 a 60,60 0 0 1 13.00636,65.387419" + d="m 139.92641,60.073591 c 17.15988,17.15988 22.29322,42.966949 13.00636,65.387419" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -289,5 +289,24 @@ style="fill:none;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle11button.svg b/img/throttle11button.svg new file mode 100644 index 0000000..3befd44 --- /dev/null +++ b/img/throttle11button.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle12.svg b/img/throttle12.svg index ffad572..03f8452 100644 --- a/img/throttle12.svg +++ b/img/throttle12.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle0.svg"> + sodipodi:docname="throttle12.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -255,7 +255,7 @@ sodipodi:end="4.7355553" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 98.889855,42.5161" + d="M 55.073593,144.92641 C 31.642135,121.49495 31.642136,83.50505 55.073594,60.073593 66.666757,48.48043 82.499046,42.136317 98.889855,42.5161" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -271,7 +271,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="M 97.500001,42.5 A 60,60 0 0 1 142.17892,62.452602" + d="m 97.500001,42.5 c 17.051569,0 33.297739,7.255174 44.678919,19.952602" transform="translate(2.5,292.5)" sodipodi:start="4.712389" sodipodi:end="5.5523973" @@ -281,7 +281,7 @@ sodipodi:end="7.0685835" sodipodi:start="5.4977871" transform="translate(2.5,292.5)" - d="m 139.92641,60.073591 a 60,60 0 0 1 0,84.852819" + d="m 139.92641,60.073591 c 23.43145,23.431457 23.43146,61.421359 0,84.852819 0,0 0,0 0,0" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -289,5 +289,24 @@ id="path6737" style="fill:none;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" /> + + diff --git a/img/throttle12button.svg b/img/throttle12button.svg new file mode 100644 index 0000000..c2ab040 --- /dev/null +++ b/img/throttle12button.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle13.svg b/img/throttle13.svg index c3a4505..995574b 100644 --- a/img/throttle13.svg +++ b/img/throttle13.svg @@ -104,14 +104,14 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4.3825079" - inkscape:cx="36.830122" - inkscape:cy="107.25171" + inkscape:zoom="2.191254" + inkscape:cx="82.835915" + inkscape:cy="52.264305" inkscape:current-layer="layer1" inkscape:document-units="px" - showgrid="true" - inkscape:window-width="1900" - inkscape:window-height="1120" + showgrid="false" + inkscape:window-width="1580" + inkscape:window-height="1121" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1"> @@ -241,5 +241,23 @@ sodipodi:start="2.3561945" sodipodi:end="7.0685835" sodipodi:open="true" /> + + diff --git a/img/throttle1button.svg b/img/throttle1button.svg new file mode 100644 index 0000000..71510d0 --- /dev/null +++ b/img/throttle1button.svg @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle2.svg b/img/throttle2.svg index 0c81a83..612b246 100644 --- a/img/throttle2.svg +++ b/img/throttle2.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle3.svg"> + sodipodi:docname="throttle2.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -254,7 +254,7 @@ sodipodi:end="3.1415927" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 37.5,102.5" + d="M 55.073593,144.92641 C 43.82141,133.67422 37.499999,118.41299 37.5,102.5" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -263,5 +263,24 @@ style="fill:none;stroke:#66ff00;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle2button.svg b/img/throttle2button.svg new file mode 100644 index 0000000..5bb9b9b --- /dev/null +++ b/img/throttle2button.svg @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle3.svg b/img/throttle3.svg index d8b7408..9003a87 100644 --- a/img/throttle3.svg +++ b/img/throttle3.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle4.svg"> + sodipodi:docname="throttle3.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -254,7 +254,7 @@ sodipodi:end="3.5342917" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 42.067227,79.538996" + d="M 55.073593,144.92641 C 37.913714,127.76653 32.780368,101.95946 42.067227,79.538996" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -263,5 +263,24 @@ style="fill:none;stroke:#66ff00;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle3button.svg b/img/throttle3button.svg new file mode 100644 index 0000000..0508e3a --- /dev/null +++ b/img/throttle3button.svg @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle4.svg b/img/throttle4.svg index f615e2c..4d1f8a7 100644 --- a/img/throttle4.svg +++ b/img/throttle4.svg @@ -119,9 +119,9 @@ inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="true" - inkscape:window-width="1900" - inkscape:window-height="1120" - inkscape:window-x="0" + inkscape:window-width="1580" + inkscape:window-height="1121" + inkscape:window-x="1600" inkscape:window-y="0" inkscape:window-maximized="1"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -254,7 +254,7 @@ sodipodi:end="3.9269908" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="m 55.073593,144.92641 a 60,60 0 0 1 -1e-6,-84.852816" + d="M 55.073593,144.92641 C 31.642136,121.49495 31.642136,83.505051 55.073592,60.073594" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -263,5 +263,24 @@ style="fill:none;stroke:#66ff00;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle4button.svg b/img/throttle4button.svg new file mode 100644 index 0000000..f540fe7 --- /dev/null +++ b/img/throttle4button.svg @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle5.svg b/img/throttle5.svg index 61c6897..dbe096a 100644 --- a/img/throttle5.svg +++ b/img/throttle5.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle6.svg"> + sodipodi:docname="throttle5.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -254,7 +254,7 @@ sodipodi:end="4.3196899" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 74.538994,47.067228" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 5.571515,-5.571515 12.185865,-9.991083 19.4654,-13.006365" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -263,5 +263,24 @@ style="fill:none;stroke:#66ff00;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle5button.svg b/img/throttle5button.svg new file mode 100644 index 0000000..bfd358c --- /dev/null +++ b/img/throttle5button.svg @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle6.svg b/img/throttle6.svg index 0198a0d..06ef668 100644 --- a/img/throttle6.svg +++ b/img/throttle6.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle7.svg"> + sodipodi:docname="throttle6.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -254,7 +254,7 @@ sodipodi:end="4.712389" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 97.500001,42.5" + d="M 55.073593,144.92641 C 31.642135,121.49495 31.642136,83.50505 55.073594,60.073593 66.325777,48.82141 81.587012,42.5 97.500001,42.5" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -263,5 +263,24 @@ style="fill:none;stroke:#66ff00;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle6button.svg b/img/throttle6button.svg new file mode 100644 index 0000000..0751fba --- /dev/null +++ b/img/throttle6button.svg @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle7.svg b/img/throttle7.svg index 3989948..515e2bc 100644 --- a/img/throttle7.svg +++ b/img/throttle7.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle8.svg"> + sodipodi:docname="throttle7.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -255,7 +255,7 @@ sodipodi:end="4.7355553" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 98.889855,42.5161" + d="M 55.073593,144.92641 C 31.642135,121.49495 31.642136,83.50505 55.073594,60.073593 66.666757,48.48043 82.499046,42.136317 98.889855,42.5161" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -271,10 +271,29 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 97.500001,42.5 a 60,60 0 0 1 22.961009,4.567229" + d="m 97.500001,42.5 c 7.879309,0 15.681469,1.551946 22.961009,4.567229" transform="translate(2.5,292.5)" sodipodi:start="4.712389" sodipodi:end="5.1050881" sodipodi:open="true" /> + + diff --git a/img/throttle7button.svg b/img/throttle7button.svg new file mode 100644 index 0000000..32c7876 --- /dev/null +++ b/img/throttle7button.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle8.svg b/img/throttle8.svg index 3ae361c..f3939b5 100644 --- a/img/throttle8.svg +++ b/img/throttle8.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle9.svg"> + sodipodi:docname="throttle8.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -255,7 +255,7 @@ sodipodi:end="4.7355553" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 98.889855,42.5161" + d="M 55.073593,144.92641 C 31.642135,121.49495 31.642136,83.50505 55.073594,60.073593 66.666757,48.48043 82.499046,42.136317 98.889855,42.5161" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -271,10 +271,29 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="M 97.500001,42.5 A 60,60 0 0 1 139.92641,60.073591" + d="m 97.500001,42.5 c 15.912989,0 31.174219,6.32141 42.426409,17.573591" transform="translate(2.5,292.5)" sodipodi:start="4.712389" sodipodi:end="5.4977871" sodipodi:open="true" /> + + diff --git a/img/throttle8button.svg b/img/throttle8button.svg new file mode 100644 index 0000000..3818123 --- /dev/null +++ b/img/throttle8button.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/throttle9.svg b/img/throttle9.svg index 37f233c..a1a4c4f 100644 --- a/img/throttle9.svg +++ b/img/throttle9.svg @@ -16,7 +16,7 @@ id="svg4265" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="throttle10.svg"> + sodipodi:docname="throttle9.svg"> image/svg+xml - + @@ -245,7 +245,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="m 55.073593,144.92641 a 60,60 0 1 1 84.852817,0" + d="m 55.073593,144.92641 c -23.431458,-23.43146 -23.431457,-61.42136 10e-7,-84.852817 23.431457,-23.431458 61.421356,-23.431457 84.852816,10e-7 23.43145,23.431457 23.43145,61.421356 0,84.852816 0,0 0,0 0,0" transform="translate(2.5,292.5)" sodipodi:start="2.3561945" sodipodi:end="7.0685835" @@ -255,7 +255,7 @@ sodipodi:end="4.7355553" sodipodi:start="2.3561945" transform="translate(2.5,292.5)" - d="M 55.073593,144.92641 A 60,60 0 0 1 98.889855,42.5161" + d="M 55.073593,144.92641 C 31.642135,121.49495 31.642136,83.50505 55.073594,60.073593 66.666757,48.48043 82.499046,42.136317 98.889855,42.5161" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -271,7 +271,7 @@ sodipodi:cy="102.5" sodipodi:rx="60" sodipodi:ry="60" - d="M 97.500001,42.5 A 60,60 0 0 1 142.17892,62.452602" + d="m 97.500001,42.5 c 17.051569,0 33.297739,7.255174 44.678919,19.952602" transform="translate(2.5,292.5)" sodipodi:start="4.712389" sodipodi:end="5.5523973" @@ -280,7 +280,7 @@ sodipodi:end="5.8904862" sodipodi:start="5.4977871" transform="translate(2.5,292.5)" - d="m 139.92641,60.073591 a 60,60 0 0 1 13.00636,19.465402" + d="m 139.92641,60.073591 c 5.57151,5.571515 9.99108,12.185866 13.00636,19.465402" sodipodi:ry="60" sodipodi:rx="60" sodipodi:cy="102.5" @@ -289,5 +289,24 @@ style="fill:none;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc" sodipodi:open="true" /> + + diff --git a/img/throttle9button.svg b/img/throttle9button.svg new file mode 100644 index 0000000..17e1870 --- /dev/null +++ b/img/throttle9button.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/slotcarman.glade b/slotcarman.glade index 2f002d7..6b2f874 100644 --- a/slotcarman.glade +++ b/slotcarman.glade @@ -4,6 +4,7 @@ Slot Cars Race Manager + True @@ -130,6 +131,21 @@ False _View True + + + True + + + gtk-fullscreen + True + False + True + True + + + + + @@ -1121,12 +1137,6 @@ 3 - - - - - - True @@ -1277,6 +1287,12 @@ 13 + + + + + + 3 -- 2.43.0