diff options
| -rw-r--r-- | perl-install/harddrake/data.pm | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 04e6a1406..c0ffa80d6 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -267,20 +267,6 @@ our @tree = }, { - class => "MOUSE", - string => N("Mouse"), - icon => "hw_mouse.png", - configurator => "$sbindir/mousedrake", - detector => sub { - require mouse; - require modules; - mouse::detect($modules_conf); - }, - checked_on_boot => 1, - automatic => 1, - }, - - { class => "JOYSTICK", string => N("Joystick"), icon => "joystick.png", @@ -376,6 +362,31 @@ our @tree = }, { + class => "KEYBOARD", + string => N("Keyboard"), + icon => "usb.png", + configurator => "$sbindir/keyboardrake", + detector => sub { + f(grep { $_->{description} =~ /Keyboard/i } @devices), + grep { $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' } detect_devices::getInputDevices(); + }, + checked_on_boot => 0, + }, + + { + class => "MOUSE", + string => N("Mouse"), + icon => "hw_mouse.png", + configurator => "$sbindir/mousedrake", + detector => sub { + f(grep { $_->{driver} =~ /^Mouse:/ } @devices), + grep { $_->{bus} ne 'usb' && $_->{driver} =~ /mouse/ } detect_devices::getInputDevices(); + }, + checked_on_boot => 1, + automatic => 1, + }, + + { class => "SCANNER", string => N("Scanner"), icon => "scanner.png", |