diff options
| -rwxr-xr-x | perl-install/standalone/drakfloppy | 18 | ||||
| -rwxr-xr-x | perl-install/standalone/draksplash | 10 |
2 files changed, 11 insertions, 17 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 1adb3f039..b99012370 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -83,7 +83,7 @@ my $ker_hbox = new Gtk::HBox (1, 0); my $kernel_combo = new Gtk::Combo(); my $kernel_button = new Gtk::Button(N("default")); $kernel_combo->disable_activate(); -$kernel_combo->set_popdown_strings( do { +$kernel_combo->set_popdown_strings(do { opendir YREP, "/lib/modules" or die N("DrakFloppy Error: %s", $!); my @files_modules = grep !/^\.\.?$/, readdir YREP; closedir YREP; @@ -153,7 +153,7 @@ $global_vbox->pack_start($expert_main_frame, 1, 1, 0); # Create a ScrolledWindow for the tree my $tree_scrolled_win = new Gtk::ScrolledWindow(); -$tree_scrolled_win->set_usize( 200, $::isEmbedded ? 0 : 175); +$tree_scrolled_win->set_usize(200, $::isEmbedded ? 0 : 175); $expert_pane->add1($tree_scrolled_win); $tree_scrolled_win->set_policy('automatic', 'automatic'); @@ -302,7 +302,7 @@ sub collapse_tree { sub select_item { my ($widget, $file) = @_; return if -d $file; - my $size = (lstat( $file))[7]; + my $size = (lstat($file))[7]; my $lr = $list->rows(); my $i; $file =~ s|/lib/modules/.*?/||g; @@ -315,14 +315,6 @@ sub select_item { } #------------------------------------------------------------- -# menu callback functions -#------------------------------------------------------------- - -sub print_hello { - print "mcdtg !\n"; -} - -#------------------------------------------------------------- # the function #------------------------------------------------------------- sub build_it { @@ -348,9 +340,11 @@ sub build_it { my $b = `$a`; if ($b =~ /dd/) { create_dialog(N("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text()), 1) ? goto test : return 0 } + local *STATUS; open STATUS, $co or do { create_dialog(N("Unable to fork: %s", $!), 0); return }; + local $_; while (<STATUS>) { - $output->insert( $fixed_font, undef, undef, $_); + $output->insert($fixed_font, undef, undef, $_); } close STATUS or create_dialog(N("Unable to close properly mkbootdisk: \n %s \n %s", $!, $?), 0); diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash index f678c94ed..30fcbc8b1 100755 --- a/perl-install/standalone/draksplash +++ b/perl-install/standalone/draksplash @@ -138,14 +138,14 @@ my %boot_conf_frame = ('frame' => new Gtk::Frame(N("Configure bootsplash picture ], ); #- var action is used to hide/show the correct frame -my @action_frame = ( \%boot_conf_frame , \%first); +my @action_frame = (\%boot_conf_frame , \%first); my $VB2 = new Gtk::VBox(0,5); my $first_vbox; &mk_frame(\$VB2, \%first); #****************************- Signal event actions #- change resolution -$first{widgets}{combo}{res}->entry->signal_connect( changed => sub { +$first{widgets}{combo}{res}->entry->signal_connect(changed => sub { $theme{res}{res} = $first{widgets}{combo}{res}->entry->get_text; ($theme{res}{w}, $theme{res}{h}) = $theme{res}{res} =~ /([^x]+)x([^x]+)/; &set_scale_size; @@ -166,7 +166,7 @@ $first{widgets}{button}{file}->signal_connect(clicked => sub { $file_dialog->show; }); #- changing theme name -$first{widgets}{combo}{name}->entry->signal_connect( changed => sub { &get_this_thm_res_conf; $theme{name} = $first{widgets}{combo}{name}->entry->get_text }); +$first{widgets}{combo}{name}->entry->signal_connect(changed => sub { &get_this_thm_res_conf; $theme{name} = $first{widgets}{combo}{name}->entry->get_text }); #************************************************** @@ -377,7 +377,7 @@ sub mk_frame { and ${$1.'hb'}->add($ref->{widgets}{label}{$1}); #- look for scale $ref->{widget}{scale}{$1} - and $ref->{widgets}{scale}{$1} = new Gtk::HScale( ${$1."_adj"} = new Gtk::Adjustment(0, 0, $scale_size{$1}, 1, 10, 0)) + and $ref->{widgets}{scale}{$1} = new Gtk::HScale(${$1."_adj"} = new Gtk::Adjustment(0, 0, $scale_size{$1}, 1, 10, 0)) and ${$1."hb"}->add($ref->{widgets}{scale}{$1}) and $ref->{widgets}{scale}{$1}->set_digits(0); ${$1.'_adj'} and ${$1.'_adj'}->set_value($theme{boot_conf}{$1}); @@ -432,7 +432,7 @@ sub make_boot_frame { $color->cancel_button->signal_connect(clicked => sub { $color->destroy }); $color->ok_button->signal_connect(clicked => sub { @rgb = $color->colorsel->get_color(); - @rgb = map ( dec2hex($_*255) , @rgb); + @rgb = map (dec2hex($_*255) , @rgb); $theme{boot_conf}{pc} = "0x$rgb[0]$rgb[1]$rgb[2]"; $color->destroy; }); |