diff options
| author | damien <damien@mandriva.com> | 2001-09-16 14:38:23 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-09-16 14:38:23 +0000 |
| commit | f209b850ff926eddc77a75697d45fdf6c639c509 (patch) | |
| tree | 2fb8b192b18bb2598688c082ce895a6453570950 | |
| parent | ab7cc969195e009633b574d00bb1ca6abc70bc4b (diff) | |
| download | drakx-f209b850ff926eddc77a75697d45fdf6c639c509.tar drakx-f209b850ff926eddc77a75697d45fdf6c639c509.tar.gz drakx-f209b850ff926eddc77a75697d45fdf6c639c509.tar.bz2 drakx-f209b850ff926eddc77a75697d45fdf6c639c509.tar.xz drakx-f209b850ff926eddc77a75697d45fdf6c639c509.zip | |
bugfix + cosmetic changes
| -rw-r--r-- | perl-install/mouse.pm | 15 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index cad364d90..eca8df739 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -427,12 +427,13 @@ sub test_mouse_install { gtkadd($w->{window}, gtkpack(my $vbox_grab = new Gtk::VBox(0,0), gtksize(gtkset_usize($darea, $width+1, $height+1), $width+1, $height+1), - my $okcancel = gtkset_sensitive(create_okcancel($w, '', '', "edge"), 0), + my $okcancel = gtkset_sensitive(create_okcancel($w, '', '', "edge"), 1) ), ); - $okcancel->set_uposition(7, $height-23); - Gtk->timeout_add(2000, sub { gtkset_sensitive($okcancel, 1) }); + $okcancel->set_uposition(7, $height-43); + Gtk->timeout_add(2000, sub { gtkset_sensitive($okcancel, 1); $okcancel->draw(undef); }); test_mouse($mouse, $w, $darea, $width, $height); + $w->{window}->set_usize(undef, $height+10); $w->sync; # HACK Gtk::Gdk->pointer_grab($darea->window, 1, [ 'pointer_motion_mask'], @@ -479,9 +480,11 @@ sub test_mouse { $image, 0, 0, ($darea->allocation->[2]-$width)/2, ($darea->allocation->[3]-$height)/2, 210, 350); - $draw_text->(_("Please test the mouse"), $height - 80); - $draw_text->(_("To activate the mouse,"), $height - 65) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; - $draw_text->(_("MOVE YOUR WHEEL!"), $height - 50) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; + $draw_text->(_("Please test the mouse"), $height - 120); + $draw_text->(_("To activate the mouse,"), $height - 105) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; + $draw_text->(_("MOVE YOUR WHEEL!"), $height - 90) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; + return if $::isStandalone; + $darea->window->draw_rectangle($darea->style->bg_gc('normal'), 1, 0, $height-65, $width, $height); }; my $paintButton = sub { diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index b4d2353b9..93dcbf258 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -536,8 +536,8 @@ sub _create_window($$) { my $gc = Gtk::Gdk::GC->new(gtkroot()); !$::isStandalone && !$::live && !$::g_auto_install and $my_gtk::shape_width = 5; #- $gc->set_foreground(gtkcolor(8448, 17664, 40191)); #- in hex : 33, 69, 157 -#- $gc->set_foreground(gtkcolor(5120, 10752, 22784)); #- in hex : 20, 42, 89 - $gc->set_foreground(gtkcolor(16896, 16896, 16896)); #- in hex : 66, 66, 66 + $gc->set_foreground(gtkcolor(5120, 10752, 22784)); #- in hex : 20, 42, 89 +#- $gc->set_foreground(gtkcolor(16896, 16896, 16896)); #- in hex : 66, 66, 66 my $inner = gtkadd(my $f_ = gtkset_shadow_type(new Gtk::Frame(undef), 'out'), my $f = gtkset_border_width(gtkset_shadow_type(new Gtk::Frame(undef), 'none'), 3) ); |