From 6ed6b5341362f87e3c70420f206a33f71c72a3de Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 23 Jul 2002 10:35:55 +0000 Subject: - Big Move 1: interactive::* hierarchy --- perl-install/standalone/diskdrake | 2 +- perl-install/standalone/drakautoinst | 5 ++++- perl-install/standalone/drakboot | 2 +- perl-install/standalone/drakconnect | 2 +- perl-install/standalone/drakgw | 7 +++++-- perl-install/standalone/drakxtv | 4 ++-- perl-install/standalone/mousedrake | 4 ++-- perl-install/standalone/tinyfirewall | 2 +- 8 files changed, 17 insertions(+), 11 deletions(-) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index 69b84b0dc..97fca7bde 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -112,7 +112,7 @@ if ($type eq 'hd') { $in->ask_from_listf('', '', \&diskdrake::interactive::format_raw_hd_info, $all_hds->{raw_hds}) or $in->exit(0); diskdrake::removable::main($in, $all_hds, $raw_hd); } else { - $in->ask_warn('', "Sorry only a gtk frontend is available") if !$in->isa('interactive_gtk'); + $in->ask_warn('', "Sorry only a gtk frontend is available") if !$in->isa('interactive::gtk'); require diskdrake::smbnfs_gtk; diskdrake::smbnfs_gtk::main($in, $all_hds, $type); } diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index ae7ce1e9a..54e0fd139 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -89,7 +89,7 @@ my $cfgfile = "$mountdir/auto_inst.cfg"; eval(cat_($cfgfile)); my $o_old = $o; -if (!$::isEmbedded && $in->isa('interactive_gtk')) { +if (!$::isEmbedded && $in->isa('interactive::gtk')) { require Gtk; init Gtk; require my_gtk; @@ -368,6 +368,9 @@ sub control_buttons { #------------------------------------------------- #- $Log$ +#- Revision 1.19 2002/07/23 10:35:55 tvignaud +#- - Big Move 1: interactive::* hierarchy +#- #- Revision 1.18 2002/03/06 20:17:51 damien #- corrected HASH and ARRAY label #- diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index e7e283c0d..174a40847 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -25,7 +25,7 @@ my $in = 'interactive'->vnew('su', 'bootloader'); $::lilo_choice = \&lilo_choice; -if ($in->isa('interactive_gtk')) { +if ($in->isa('interactive::gtk')) { require 'bootlook.pm'; } else { lilo_choice(); diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index fdbe4bda4..aceef3f82 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -51,7 +51,7 @@ my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'la #$::wizard_xpm = "/usr/share/pixmaps/internet.xpm"; my $in = 'interactive'->vnew('su', 'network'); -!$::isEmbedded && $in->isa('interactive_gtk') and $::isWizard=1; +!$::isEmbedded && $in->isa('interactive::gtk') and $::isWizard=1; $::Wizard_pix_up = "wiz_drakconnect.png"; $::Wizard_title = "Network & Internet Configuration"; diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index cc35a1dc2..08119a6a9 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -56,9 +56,9 @@ my $drakgw_setup = "/etc/sysconfig/inet_sharing"; my $in = 'interactive'->vnew('su', 'default'); -!$::isEmbedded && $in->isa('interactive_gtk') and $::isWizard=1; +!$::isEmbedded && $in->isa('interactive::gtk') and $::isWizard=1; -pur_gtk_mode() if $::isEmbedded && $in->isa('interactive_gtk'); +pur_gtk_mode() if $::isEmbedded && $in->isa('interactive::gtk'); sub sys { system(@_) == 0 or log::l("[drakgw] Warning, sys failed for $_[0]") } @@ -611,6 +611,9 @@ Click on Configure to launch the setup wizard.", $setup_state)); #------------------------------------------------- #- $Log$ +#- Revision 1.62 2002/07/23 10:35:55 tvignaud +#- - Big Move 1: interactive::* hierarchy +#- #- Revision 1.61 2002/04/09 08:50:36 gc #- time to remove ipchains/2.2 stuff since now ipchains and iptables #- packages conflict diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 16b64ecec..7250ab5f8 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -120,8 +120,8 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); # we provide scantv a bogus table (france) which will # will be ignored since "All" is selected (because of -a) $ftable_id = "france -a " if ($ftable_id eq -1); - # Note that this'll be broken if/when we implement interactive_qt - my $use_X =$in->isa('interactive_gtk') && -x "/usr/X11R6/bin/xvt"; + # Note that this'll be broken if/when we implement interactive::qt + my $use_X =$in->isa('interactive::gtk') && -x "/usr/X11R6/bin/xvt"; my $home = $ENV{HOME}; my $i=system ( (($use_X ) ? "xvt -T '"._("Scanning for TV channels")." ...' -e ":"") diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 90cb8994c..f8bb9a02e 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -58,7 +58,7 @@ $mouse->{XMOUSETYPE} eq $curr_env->{mouse}{XMOUSETYPE} || $::isEmbedded and kill USR2, $::CCPID; if (!$mouse || !$::auto) { $mouse ||= mouse::fullname2mouse("serial|Generic 2 Button Mouse"); - if ($::isEmbedded && $in->isa('interactive_gtk')) { + if ($::isEmbedded && $in->isa('interactive::gtk')) { require my_gtk; my $time_tag = Gtk->timeout_add(100, sub { defined $::Plug && defined $::Plug->child or return 1; @@ -70,7 +70,7 @@ if (!$mouse || !$::auto) { sub { join '|', map { translate($_) } split '\|', $_[0] }, [ mouse::fullnames ], $mouse->{type} . '|' . $mouse->{name}); - Gtk->timeout_remove($time_tag2) if $::isEmbedded && $in->isa('interactive_gtk'); + Gtk->timeout_remove($time_tag2) if $::isEmbedded && $in->isa('interactive::gtk'); $name or $::isEmbedded ? do { kill(USR1, $::CCPID); goto begin } : $in->exit(0); my $mouse_chosen = mouse::fullname2mouse($name); $mouse->{type} eq $mouse_chosen->{type} && $mouse->{name} eq $mouse_chosen->{name} or $mouse = $mouse_chosen; diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall index 3f91a0027..40dbd5f21 100755 --- a/perl-install/standalone/tinyfirewall +++ b/perl-install/standalone/tinyfirewall @@ -34,7 +34,7 @@ local $_ = join '', @ARGV; my $in = 'interactive'->vnew('su', 'default'); -$::isEmbedded && $in->isa('interactive_gtk') or goto dd; +$::isEmbedded && $in->isa('interactive::gtk') or goto dd; require Gtk; init Gtk; -- cgit v1.2.1