diff options
| -rw-r--r-- | docs/SHORTCUTS | 2 | ||||
| -rwxr-xr-x | make_boot_img | 9 | ||||
| -rw-r--r-- | perl-install/help.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 6 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 79 |
5 files changed, 89 insertions, 9 deletions
diff --git a/docs/SHORTCUTS b/docs/SHORTCUTS index 37ebed203..47ff9661a 100644 --- a/docs/SHORTCUTS +++ b/docs/SHORTCUTS @@ -31,4 +31,4 @@ to find the entry beginning with the 2 letters you have given. In case it fails the starting_word is reset. - incremental search a la emacs: searches trough the list -Use control-s to switch between the possibilities +Use control-s to use incremental search and then to search next occurence diff --git a/make_boot_img b/make_boot_img index 41113fb07..172c8bfcc 100755 --- a/make_boot_img +++ b/make_boot_img @@ -46,8 +46,13 @@ sub initrd { _ "$sudo cp -f modules/${type}_modules.cgz $mnt/modules/modules.cgz"; _ "$sudo cp -f modules/modules.dep $mnt/modules/"; _ "$sudo umount $mnt"; - _ "gzip -9 -c $tmp > $img"; - _ "rm -f $tmp"; + +# Workaround for vfat-loop bug (quite touchy) + _ "gzip -9f $tmp"; + _ "cp -f $tmp.gz $img"; + _ "rm -f $tmp.gz"; +# _ "gzip -9 -c $tmp > $img"; +# _ "rm -f $tmp"; } sub boot_img { diff --git a/perl-install/help.pm b/perl-install/help.pm index 278dd0bbf..b3423b239 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -330,7 +330,7 @@ doInstallStep => __("The packages selected are now being installed. This operation should only take a few minutes."), -configureMouse => +selectMouse => __("If DrakX failed to find your mouse, or if you want to check what it has done, you will be presented the list of mice above. diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index a79132b28..7090e6c75 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -57,9 +57,9 @@ sub selectLanguage($) { lang::lang2text($o->{lang}))); install_steps::selectLanguage($o); - $o->{useless_thing_accepted} = $o->ask_from_list_('', -"Warning no warranty", - [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or exit(1) unless $o->{useless_thing_accepted}; +#- $o->{useless_thing_accepted} = $o->ask_from_list_('', +#-"Warning no warranty", +#- [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or exit(1) unless $o->{useless_thing_accepted}; } #------------------------------------------------------------------------------ sub selectKeyboard($) { diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 7eefa8685..f0f92807b 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $border @grabbed); @ISA = qw(Exporter); %EXPORT_TAGS = ( - helpers => [ qw(create_okcancel createScrolledWindow create_menu create_notebook create_packtable create_hbox create_vbox create_adjustment create_box_with_title) ], + helpers => [ qw(create_okcancel createScrolledWindow create_menu create_notebook create_packtable create_hbox create_vbox create_adjustment create_box_with_title create_treeitem) ], wrappers => [ qw(gtksignal_connect gtkpack gtkpack_ gtkpack__ gtkappend gtkadd gtktext_insert gtkset_usize gtkset_justify gtkset_active gtkshow gtkdestroy gtkset_mousecursor gtkset_background gtkset_default_fontset) ], ask => [ qw(ask_warn ask_okcancel ask_yesorno ask_from_entry ask_from_list ask_file) ], ); @@ -212,7 +212,7 @@ sub create_box_with_title($@) { sub createScrolledWindow($) { my ($W) = @_; - if (ref $W eq "Gtk::Text") { + if (member(ref $W, qw(Gtk::Text)) { gtkpack_(new Gtk::HBox(0,0), 1, $W, 0, new Gtk::VScrollbar($W->vadj)); @@ -334,6 +334,81 @@ sub _create_window($$) { $o->{rwindow} = $w; } +my ($next_child, $left, $right, $up, $down); +{ + my $next_child = sub { + my ($c, $dir) = @_; + + my @childs = $c->parent->children; + + my $i; for ($i = 0; $i < @childs; $i++) { + last if $childs[$i] == $c || $childs[$i]->subtree == $c; + } + $i += $dir; + 0 <= $i && $i < @childs ? $childs[$i] : undef; + }; + $left = sub { &$next_child($_[0]->parent, 0); }; + $right = sub { + my ($c) = @_; + if ($c->subtree) { + $c->expand; + ($c->subtree->children)[0]; + } else { + $c; + } + }; + $down = sub { + my ($c) = @_; + return &$right($c) if ref $c eq "Gtk::TreeItem" && $c->subtree && $c->expanded; + + if (my $n = &$next_child($c, 1)) { + $n; + } else { + return if ref $c->parent ne 'Gtk::Tree'; + &$down($c->parent); + } + }; + $up = sub { + my ($c) = @_; + if (my $n = &$next_child($c, -1)) { + $n = ($n->subtree->children)[-1] while ref $n eq "Gtk::TreeItem" && $n->subtree && $n->expanded; + $n; + } else { + return if ref $c->parent ne 'Gtk::Tree'; + &$left($c); + } + }; +} + +sub create_treeitem($$) { + my ($name) = @_; + + my $w = new Gtk::TreeItem($name); + $w->signal_connect(key_press_event => sub { + my (undef, $e) = @_; + local $_ = chr ($e->{keyval} & 0xff); + + if ($e->{keyval} > 0x100) { + my $n; + $n = &$left($w) if /[Q´\x96]/; + $n = &$right($w) if /[S¶\x98]/; + $n = &$up($w) if /[R¸\x97]/; + $n = &$down($w) if /[T²\x99]/; + if ($n) { + $n->focus('up'); + $w->signal_emit_stop("key_press_event"); + } + $w->expand if /[+«]/; + $w->collapse if /[-\xad]/; + do { + $w->expanded ? $w->collapse : $w->expand; + $w->signal_emit_stop("key_press_event"); + } if /[\r\x8d]/; + } + 1; + }); + $w; +} |