diff options
Diffstat (limited to 'drakwizard.pl')
-rwxr-xr-x | drakwizard.pl | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/drakwizard.pl b/drakwizard.pl index 0df835e8..866ea8a2 100755 --- a/drakwizard.pl +++ b/drakwizard.pl @@ -25,9 +25,7 @@ use vars qw($Wizard_title $Wizard_pix_up $lib_script $perl_module %variable $in use XML::Parser; use standalone; use interactive; -#use MDK::Common::Func; use common; -use Data::Dumper; #- I18N. push @::textdomains, 'drakwizard'; @@ -64,14 +62,14 @@ if (!defined($ARGV[0])) { N("Please select a wizard"), [{ val => \$ARGV[0], list => [sort keys %wiz], format => sub { $wiz{$_[0]}[1] }}] ); - $ARGV[0] = $wiz{$ARGV[0]}[0]; + $ARGV[0] = $wiz{$ARGV[0]}[0]; } my $o = []; my $o2 = []; my $xmltree = XML::Parser->new(Style => 'Tree')->parsefile($ARGV[0]); -local $_ = join '', @ARGV; +local $_ = join '', @ARGV; if (/-debug/) { $::verbose = 1; } @@ -135,9 +133,9 @@ sub load_wizard { sub map_freetext { my @liste; my $valeur; - + my @data = map { - my $toto = $_->{variableName}; + my $str = $_->{variableName}; my $page = $_; if ($_->{fillScript}) { @@ -148,13 +146,13 @@ sub map_freetext { $ENV{$variable{$_->{variableName}}} = $::{$perl_module_name."::"}{"$_->{fillfunc}"}->(); } { label => N($_->{helpText}), - val => \$ENV{$variable{$_->{variableName}}}, type => $_->{main_order}, + val => \$ENV{$variable{$_->{variableName}}}, type => $_->{main_order}, disabled => $disabled{$_->{variableName}}, help => $_->{help}} } elsif ($_->{main_order} eq 'field' && $_->{fillfunc}) { { label => N($_->{helpText}), - val => $::{$perl_module_name."::"}{"$_->{fillfunc}"}->(), type => $_->{main_order}, + val => $::{$perl_module_name."::"}{"$_->{fillfunc}"}->(), type => $_->{main_order}, disabled => $disabled{$_->{variableName}}, help => $_->{help}} } @@ -179,13 +177,13 @@ sub map_freetext { # map { if (length($_)) { - $disabled{$toto} = sub { callback($toto)}; + $disabled{$str} = sub { callback($str)}; { val => \$bool{$_}, label => "", type => 'bool', text => "$_", help => "", - disabled => $disabled{$toto} + disabled => $disabled{$str} } } } @checklist; @@ -219,7 +217,7 @@ sub map_freetext { list => [@liste], type => $_->{main_order}, disabled => $disabled{$_->{variableName}} }} elsif ($_->{main_order} eq 'field') { - { val => $description{$ENV{$variable{$_->{variableName}}}}? + { val => $description{$ENV{$variable{$_->{variableName}}}} ? $description{$ENV{$variable{$_->{variableName}}}} : $ENV{$variable{$_->{variableName}}}, label => $_->{helpText}, @@ -230,7 +228,7 @@ sub map_freetext { sub get_parameter { my ($o, $tree, $tag ,$page) = @_; - + foreach my $leaf (@$tree) { if (ref($leaf) eq 'ARRAY') { $page = get_parameter($o, $leaf, $tag, $page); @@ -267,11 +265,11 @@ sub get_parameter { $page->{info} = xml_text($leaf->{helpText} ? "$page->{info}\n$leaf->{helpText}" : "$page->{info}\n"); $page->{info} = c::from_utf8($page->{info}); - $page->{info} .= translate(`source $lib_script; $leaf->{fillScript}`) if + $page->{info} .= translate(`source $lib_script; $leaf->{fillScript}`) if ($leaf->{fillScript}) }, - Freetext => $common_freetext_chooser = sub { - my $main_order = ($tag eq 'Chooser') ? 'combo' + Freetext => $common_freetext_chooser = sub { + my $main_order = ($tag eq 'Chooser') ? 'combo' : ($tag eq 'Boolean') ? 'bool' : ($leaf->{editable} eq 'true') ? 'entry' : 'field'; @@ -304,7 +302,7 @@ sub find_page { sub display { my ($o, $page) = @_; my $data; - + if ($page->{no_prev} || $page->{name} eq $welcome->{name}) { $::Wizard_no_previous = 1; } @@ -346,7 +344,7 @@ sub display { sub navigation { my ($o, $page, $previous_page) = @_; $page->{old_page} ||= $previous_page; - + $current_page = $page; display($o, $page); my ($next, $prev) = do { @@ -391,7 +389,7 @@ sub navigation { sub is_disabled_summary { my ($widget, $page) = @_; - + if ($page->{is}) { my ($page_val, $page_arg) = split(/\s*?=\s*/, $page->{is}); if ($page_val eq $widget) { @@ -410,7 +408,7 @@ sub is_disabled_summary { sub is_disabled { my ($widget, $page) = @_; my $ret; - + foreach (@{$page->{freetext}}) { if ($_->{is}) { my ($val, $arg) = split(/\s*?=\s*/, $_->{is}); @@ -423,11 +421,11 @@ sub is_disabled { sub callback_common { return 1 if ($disabled{$_[0]} == 1); foreach (keys %variable) { - my $toto = $ENV{$variable{$_}}; - my $tata = $_; + my $str = $ENV{$variable{$_}}; + my $str2 = $_; foreach (keys %chooser_hash) { - if ($toto eq $_) { - $ENV{$variable{$tata}} = $chooser_hash{$_}; + if ($str eq $_) { + $ENV{$variable{$str2}} = $chooser_hash{$_}; } } } @@ -439,14 +437,14 @@ sub callback_summary { is_disabled_summary($_[0], $o2->[0]); } -sub callback { +sub callback { return 1 if callback_common($_[0]); is_disabled($_[0], $current_page); } sub get_summary { my ($o, $tree, $tag, $page) = @_; - + foreach my $leaf (@$tree) { if (ref($leaf) eq 'ARRAY') { $page = get_summary($o, $leaf, $tag, $page); |