diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-13 12:00:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-13 12:00:36 +0000 |
| commit | 136c59737310c46e3e736786ad3c6dca9b3725a8 (patch) | |
| tree | ba83bd12bc0eeedad351ba7e9897ff5408880f57 | |
| parent | f3e304fafab539ecd097dbc3a45621c873eb984f (diff) | |
| download | drakx-backup-do-not-use-136c59737310c46e3e736786ad3c6dca9b3725a8.tar drakx-backup-do-not-use-136c59737310c46e3e736786ad3c6dca9b3725a8.tar.gz drakx-backup-do-not-use-136c59737310c46e3e736786ad3c6dca9b3725a8.tar.bz2 drakx-backup-do-not-use-136c59737310c46e3e736786ad3c6dca9b3725a8.tar.xz drakx-backup-do-not-use-136c59737310c46e3e736786ad3c6dca9b3725a8.zip | |
- {interactive_help} is a function returning text, it doesn't need to do the help window
- drop global interactive_help during install. Will be done per ->ask_*
| -rw-r--r-- | perl-install/harddrake/sound.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 8 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 6e0083747..4668ecd37 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -182,8 +182,7 @@ sub switch { $device->{description}) . N("\n\nYour card currently use the %s\"%s\" driver (default driver for your card is \"%s\")", ($driver =~ /^snd-/ ? "ALSA " : "OSS "), $driver, $device->{driver}), interactive_help => sub { - $in->ask_warn(N("Switching between ALSA and OSS help"), - N("OSS (Open Sound System) was the first sound API. It's an OS independant sound API (it's available on most unices systems) but it's a very basic and limited API. + N("OSS (Open Sound System) was the first sound API. It's an OS independant sound API (it's available on most unices systems) but it's a very basic and limited API. What's more, OSS drivers all reinvent the wheel. ALSA (Advanced Linux Sound Architecture) is a modularized architecture which @@ -192,7 +191,7 @@ It also provides a much higher API than OSS.\n To use alsa, one can either use: - the old compatibility OSS api - the new ALSA api that provides many enhanced features but requires using the ALSA library. -")) +"); }, }, [ diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index cc6b2e168..bfe920546 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -125,14 +125,6 @@ sub new($$) { install_gtk::install_theme($o, install_gtk::default_theme($o)); install_gtk::create_logo_window($o); - $o->{interactive_help} = sub { - my $w = ugtk2->new(''); - $w->{rwindow}->set_size_request($::windowwidth * 0.92, $::windowheight * 0.9); - gtkadd($w->{window}, gtkpack__(create_box_with_title($w, $o->{current_help}), - $w->create_okcancel(N("Ok")))); - $w->{ok}->grab_focus; - $w->main; - }; $ugtk2::force_center = [ $::rootwidth - $::windowwidth, $::logoheight, $::windowwidth, $::windowheight ]; $o = (bless {}, ref($type) || $type)->SUPER::new($o); diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index be7d634c5..f7d934fa0 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -637,7 +637,7 @@ sub ask_fromW { 0, Gtk2::HSeparator->new, 1, $create_widgets->($advanced_total_size, @widgets_advanced)); - my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', if_($common->{interactive_help}, [ N("Help"), $common->{interactive_help}, 1 ]), if_(@$l2, $advanced_button)); + my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', if_($common->{interactive_help}, [ N("Help"), sub { $o->ask_warn(N("Help"), $common->{interactive_help}->()) }, 1 ]), if_(@$l2, $advanced_button)); $pack->pack_start($always_pack, 1, 1, 0); $always_pack->show; $pack->pack_start($advanced_pack, 1, 1, 0); |