diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/modules.pm | 4 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/share/themes-blackwhite.rc | 8 | ||||
| -rw-r--r-- | perl-install/share/themes-blue.rc | 8 | ||||
| -rw-r--r-- | perl-install/share/themes-savane.rc | 8 |
5 files changed, 28 insertions, 4 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 43465ec9d..3d1c3a4d2 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -82,6 +82,7 @@ my @drivers_by_category = ( "seagate" => "Future Domain TMC-885, TMC-950", "fdomain" => "Future Domain TMC-16x0", "gdth" => "ICP Disk Array Controller", + "initio" => "Initio", "ppa" => "Iomega PPA3 (parallel port Zip)", "g_NCR5380" => "NCR 5380", "NCR53c406a" => "NCR 53c406a", @@ -165,7 +166,7 @@ sub load { } else { $conf{$name}{loaded} and return; - $type ||= $drivers{$name}{type}; + $type ||= ($drivers{$name} || { type => 'unknown'})->{type}; load($_, 'prereq') foreach @{$deps{$name}}; load_raw($name, @options); @@ -285,7 +286,6 @@ sub load_thiskind($;&$) { my %devs; foreach (@devs) { my ($text, $mod) = @$_; $devs{$mod}++ and log::l("multiple $mod devices found"), next; - $drivers{$mod} or log::l("module $mod not in install table"), next; log::l("found driver for $mod"); &$f($text, $mod) if $f; load($mod, $type); diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 8eefa123c..7eefa8685 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -319,8 +319,8 @@ sub _create_window($$) { $w->set_title($title); - $w->signal_connect("map_event" => sub { c::XSetInputFocus($w->window->XWINDOW); }) - if $my_gtk::force_focus || $o->{force_focus}; + $w->signal_connect("map_event" => sub { c::XSetInputFocus($w->window->XWINDOW); }) if $my_gtk::force_focus || $o->{force_focus}; + $w->signal_connect("expose_event" => sub { c::XSetInputFocus($w->window->XWINDOW); }) if $my_gtk::force_focus || $o->{force_focus}; $w->signal_connect("delete_event" => sub { $o->{retval} = undef; Gtk->main_quit }); $w->set_uposition(@{$my_gtk::force_position || $o->{force_position}}) if $my_gtk::force_position || $o->{force_position}; diff --git a/perl-install/share/themes-blackwhite.rc b/perl-install/share/themes-blackwhite.rc index 3e09c4b96..48d5f9400 100644 --- a/perl-install/share/themes-blackwhite.rc +++ b/perl-install/share/themes-blackwhite.rc @@ -25,6 +25,13 @@ style "entry" fg[NORMAL] = { 0.67, 0.67, 0.67 } } +style "notebook" +{ + bg[NORMAL] = { 1.0, 1.0, 1.0 } + bg[ACTIVE] = { 0.67, 0.67, 0.67 } + fg[NORMAL] = { 0, 0, 0 } +} + style "button" = "any" { bg[NORMAL] = { 1.0, 1.0, 1.0 } @@ -43,5 +50,6 @@ widget_class "*" style "any" widget_class "*GtkSpin*" style "entry" widget_class "*GtkEntry*" style "entry" widget_class "*Gtk*List*" style "entry" +widget_class "*GtkNotebook*" style "notebook" widget "*GtkButton*" style "button" widget "*background*" style "background" diff --git a/perl-install/share/themes-blue.rc b/perl-install/share/themes-blue.rc index c1ea47f97..53ed55159 100644 --- a/perl-install/share/themes-blue.rc +++ b/perl-install/share/themes-blue.rc @@ -25,6 +25,13 @@ style "entry" fg[NORMAL] = { 0.67, 0, 0.67 } } +style "notebook" +{ + bg[NORMAL] = { 0, 0, 1.0 } + bg[ACTIVE] = { 0, 0, 0.67 } + fg[NORMAL] = { 1.0, 1.0, 1.0 } +} + style "button" = "any" { bg[NORMAL] = { 0, 0, 1.0 } @@ -43,5 +50,6 @@ widget_class "*" style "any" widget_class "*GtkSpin*" style "entry" widget_class "*GtkEntry*" style "entry" widget_class "*Gtk*List*" style "entry" +widget_class "*GtkNotebook*" style "notebook" widget "*GtkButton*" style "button" widget "*background*" style "background" diff --git a/perl-install/share/themes-savane.rc b/perl-install/share/themes-savane.rc index dbf51f9f0..18a45ca32 100644 --- a/perl-install/share/themes-savane.rc +++ b/perl-install/share/themes-savane.rc @@ -25,6 +25,13 @@ style "entry" fg[NORMAL] = { 0, 0, 0 } } +style "notebook" +{ + bg[NORMAL] = { 1.0, 0.67, 0 } + bg[ACTIVE] = { 0.67, 0.33, 0 } + fg[NORMAL] = { 0, 0, 0 } +} + style "button" = "any" { bg[NORMAL] = { 1.0, 0.67, 0 } @@ -43,5 +50,6 @@ widget_class "*" style "any" widget_class "*GtkSpin*" style "entry" widget_class "*GtkEntry*" style "entry" widget_class "*Gtk*List*" style "entry" +widget_class "*GtkNotebook*" style "notebook" widget "*GtkButton*" style "button" widget "*background*" style "background" |