diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-29 19:41:39 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-29 19:41:39 +0000 |
| commit | 6e23dc5807f4251b35ef37550b3ef58b88c6dc10 (patch) | |
| tree | dc85eb1049bf3db52c74019a3e3994963175d349 | |
| parent | b79a22b24f0a5bfe15b3c1deba7460577b8410c4 (diff) | |
| download | drakx-6e23dc5807f4251b35ef37550b3ef58b88c6dc10.tar drakx-6e23dc5807f4251b35ef37550b3ef58b88c6dc10.tar.gz drakx-6e23dc5807f4251b35ef37550b3ef58b88c6dc10.tar.bz2 drakx-6e23dc5807f4251b35ef37550b3ef58b88c6dc10.tar.xz drakx-6e23dc5807f4251b35ef37550b3ef58b88c6dc10.zip | |
- don't display "To activate the mouse, MOVE YOUR WHEEL!" when not install
- don't display "Please test the mouse" either
| -rw-r--r-- | perl-install/mouse.pm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 799d4fba8..3907def87 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -438,16 +438,18 @@ sub test_mouse { my $w = $font->string_width($t); $darea->window->draw_string($font, $darea->style->black_gc, ($darea->allocation->[2]-$width)/2 + ($width - $w) / 2, ($darea->allocation->[3]-$height)/2 + $y, $t); }; - my $drawarea; $drawarea = sub { $darea->window->draw_pixmap ($darea->style->bg_gc('normal'), - $image, 0, 0, - ($darea->allocation->[2]-$width)/2, ($darea->allocation->[3]-$height)/2, - 210, 350); - $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 $drawarea; + $drawarea = sub { $darea->window->draw_pixmap($darea->style->bg_gc('normal'), + $image, 0, 0, + ($darea->allocation->[2]-$width)/2, ($darea->allocation->[3]-$height)/2, + 210, 350); + if ($::isInstall) { + $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'; + $darea->window->draw_rectangle($darea->style->bg_gc('normal'), 1, 0, $height-65, $width, $height); + } + }; my $paintButton = sub { my ($nb, $pressed) = @_; |