diff options
| -rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 13 | ||||
| -rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 468 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 368 insertions, 114 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 6622c3f90..5306fc6fa 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -44,6 +44,13 @@ notebook current_kind[] =cut +sub load_theme { + my $rc = "/usr/share/libDrakX/diskdrake.rc"; + -r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc"; + -r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc"; + Gtk2::Rc->parse($rc); +} + sub main { ($in, $all_hds, $do_force_reload) = @_; @@ -53,10 +60,8 @@ sub main { $w = ugtk2->new(N("Partitioning")); $::main_window = $w->{real_window} if !$::isEmbedded && !$::isInstall; - my $rc = "/usr/share/libDrakX/diskdrake.rc"; - -r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc"; - -r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc"; - Gtk2::Rc->parse($rc); + + load_theme(); # TODO # is_empty_array_ref($all_hds->{raids}) or raid::stopAll; diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 3aa93cdd3..d27fc7369 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -11,6 +11,7 @@ use fs::type; use fs::mount_point; use partition_table; use partition_table::raw; +use partition_table::dos; #- unit of $mb is mega bytes, min and max are in sectors, this #- function is used to convert back to sectors count the size of @@ -64,13 +65,21 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return; } sub partitionWizardSolutions { - my ($in, $all_hds, $all_fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab) = @_; - my $hds = $all_hds->{hds}; - my $fstab = [ fs::get::fstab($all_hds) ]; + my ($in, $all_hds, $all_fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $target) = @_; + my $hds; + my $fstab; + if($target) { + $hds = [ $target ]; + $fstab = [ grep { $_->{rootDevice} eq $target->{device} } fs::get::fstab($all_hds) ]; + } else { + $hds = $all_hds->{hds}; + $fstab = [ fs::get::fstab($all_hds) ]; + } + my @wizlog; my (%solutions); - my $min_linux = MB(400); + my $min_linux = MB(600); my $max_linux = MB(2000); my $min_swap = MB(50); my $max_swap = MB(300); @@ -96,62 +105,63 @@ sub partitionWizardSolutions { push @wizlog, N("There is no existing partition to use"); } - my @fats = grep { $_->{fs_type} eq 'vfat' } @$fstab; - fs::df($_) foreach @fats; - if (my @ok_forloopback = sort { $b->{free} <=> $a->{free} } grep { $_->{free} > $min_linux + $min_swap + $min_freewin } @fats) { - $solutions{loopback} = - [ -10 - @fats, N("Use the Microsoft Windows® partition for loopback"), - sub { - my ($s_root, $s_swap); - my $part = $in->ask_from_listf('', N("Which partition do you want to use for Linux4Win?"), \&partition_table::description, \@ok_forloopback) or return; - $max_swap = $min_swap + 1 if $part->{free} - $max_swap < $min_linux; - $in->ask_from('', N("Choose the sizes"), [ - { label => N("Root partition size in MB: "), val => \$s_root, min => to_Mb($min_linux), max => to_Mb(min($part->{free} - $max_swap, $max_linux)), type => 'range' }, - { label => N("Swap partition size in MB: "), val => \$s_swap, min => to_Mb($min_swap), max => to_Mb($max_swap), type => 'range' }, - ]) or return; - push @{$part->{loopback}}, - { fs_type => 'ext3', loopback_file => '/lnx4win/linuxsys.img', mntpoint => '/', size => $s_root * 2048, loopback_device => $part, notFormatted => 1 }, - { fs_type => 'swap', loopback_file => '/lnx4win/swapfile', mntpoint => 'swap', size => $s_swap * 2048, loopback_device => $part, notFormatted => 1 }; - fsedit::recompute_loopbacks($all_hds); - 1; - } ]; - } else { - push @wizlog, N("There is no FAT partition to use as loopback (or not enough space left)") . - (@fats ? "\nFAT partitions:" . join('', map { "\n $_->{device} $_->{free} (" . ($min_linux + $min_swap + $min_freewin) . ")" } @fats) : ''); - } - - if (my @ok_for_resize_fat = grep { isFat_or_NTFS($_) && !fs::get::part2hd($_, $all_hds)->{readonly} - && !isRecovery($_) } @$fstab) { - $solutions{resize_fat} = - [ 20 - @ok_for_resize_fat, N("Use the free space on a Microsoft Windows® partition"), - sub { - my $part = $in->ask_from_listf_raw({ messages => N("Which partition do you want to resize?"), - interactive_help_id => 'resizeFATChoose', - }, \&partition_table::description, \@ok_for_resize_fat) or return; - my $hd = fs::get::part2hd($part, $all_hds); - my $resize_fat = eval { - my $pkg = $part->{fs_type} eq 'vfat' ? do { - require resize_fat::main; - 'resize_fat::main'; - } : do { - require diskdrake::resize_ntfs; - 'diskdrake::resize_ntfs'; - }; - $pkg->new($part->{device}, devices::make($part->{device})); - }; - $@ and die N("The FAT resizer is unable to handle your partition, -the following error occurred: %s", formatError($@)); - my $min_win = do { - my $_w = $in->wait_message(N("Resizing"), N("Computing the size of the Microsoft Windows® partition")); - $resize_fat->min_size; - }; - #- make sure that even after normalizing the size to cylinder boundaries, the minimun will be saved, - #- this save at least a cylinder (less than 8Mb). - $min_win += partition_table::raw::cylinder_size($hd); - - $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mandriva Linux installation."); - $in->ask_okcancel('', formatAlaTeX( + && !isRecovery($_) && $_->{size} > $min_linux + $min_swap + $min_freewin} @$fstab) { + @ok_for_resize_fat = map { + my $part = $_; + my $hd = fs::get::part2hd($part, $all_hds); + my $resize_fat = eval { + my $pkg = $part->{fs_type} eq 'vfat' ? do { + require resize_fat::main; + 'resize_fat::main'; + } : do { + require diskdrake::resize_ntfs; + 'diskdrake::resize_ntfs'; + }; + $pkg->new($part->{device}, devices::make($part->{device})); + }; + if($@) { + log::l("The FAT resizer is unable to handle $part->{device} partition%s", formatError($@)); + undef $part; + } + if ($part) { + my $min_win = do { + my $_w = $in->wait_message(N("Resizing"), N("Computing the size of the Microsoft Windows® partition")); + $resize_fat->min_size; + }; + #- make sure that even after normalizing the size to cylinder boundaries, the minimun will be saved, + #- this save at least a cylinder (less than 8Mb). + $min_win += partition_table::raw::cylinder_size($hd); + + if ($part->{size} <= $min_linux + $min_swap + $min_freewin + $min_win) { +# die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mandriva Linux installation."); + undef $part; + } else { + $part->{resize_fat} = $resize_fat; + $part->{min_win} = $min_win; + } + } + $part || (); + } @ok_for_resize_fat; + if(@ok_for_resize_fat) { + $solutions{resize_fat} = + [ 20 - @ok_for_resize_fat, N("Use the free space on a Microsoft Windows® partition"), + sub { + my $part; + if ($in->{interactive} ne 'gtk') { + $part = $in->ask_from_listf_raw({ messages => N("Which partition do you want to resize?"), + interactive_help_id => 'resizeFATChoose', + }, \&partition_table::description, \@ok_for_resize_fat) or return; + } else { + ($part) = grep { $_->{req_size}} @ok_for_resize_fat; + } + my $resize_fat = $part->{resize_fat} ; + my $min_win = $part->{min_win}; + my $hd = fs::get::part2hd($part, $all_hds); + if ($in->{interactive} ne 'gtk') { + $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mandriva Linux installation."); + } + $in->ask_okcancel('', formatAlaTeX( #-PO: keep the double empty lines between sections, this is formatted a la LaTeX N("WARNING! @@ -164,36 +174,40 @@ Be careful: this operation is dangerous. If you have not already done so, you fi When sure, press %s.", N("Next")))) or return; - my $mb_size = to_Mb($part->{size}); - $in->ask_from(N("Partitionning"), N("Which size do you want to keep for Microsoft Windows® on partition %s?", partition_table::description($part)), [ - { label => N("Size"), val => \$mb_size, min => to_Mb($min_win), max => to_Mb($part->{size} - $min_linux - $min_swap), type => 'range' }, - ]) or return; - - my $oldsize = $part->{size}; - $part->{size} = from_Mb($mb_size, $min_win, $part->{size}); - - $hd->adjustEnd($part); - - eval { - my $_w = $in->wait_message(N("Resizing"), N("Resizing Microsoft Windows® partition")); - $resize_fat->resize($part->{size}); - }; - if (my $err = $@) { - $part->{size} = $oldsize; - die N("FAT resizing failed: %s", formatError($err)); - } - - $in->ask_warn('', N("To ensure data integrity after resizing the partition(s), + my $oldsize = $part->{size}; + if($in->{interactive} ne 'gtk') { + my $mb_size = to_Mb($part->{size}); + $in->ask_from(N("Partitionning"), N("Which size do you want to keep for Microsoft Windows® on partition %s?", partition_table::description($part)), [ + { label => N("Size"), val => \$mb_size, min => to_Mb($min_win), max => to_Mb($part->{size} - $min_linux - $min_swap), type => 'range' }, + ]) or return; + $part->{size} = from_Mb($mb_size, $min_win, $part->{size}); + } else { + $part->{size} = $part->{req_size}; + } + + $hd->adjustEnd($part); + + eval { + my $_w = $in->wait_message(N("Resizing"), N("Resizing Microsoft Windows® partition")); + $resize_fat->resize($part->{size}); + }; + if (my $err = $@) { + $part->{size} = $oldsize; + die N("FAT resizing failed: %s", formatError($err)); + } + + $in->ask_warn('', N("To ensure data integrity after resizing the partition(s), filesystem checks will be run on your next boot into Microsoft Windows®")) if $part->{fs_type} ne 'vfat'; - - set_isFormatted($part, 1); - partition_table::will_tell_kernel($hd, resize => $part); #- down-sizing, write_partitions is not needed - partition_table::adjust_local_extended($hd, $part); - partition_table::adjust_main_extended($hd); - - fsedit::auto_allocate($all_hds, $partitions); - 1; - } ]; + + set_isFormatted($part, 1); + partition_table::will_tell_kernel($hd, resize => $part); #- down-sizing, write_partitions is not needed + partition_table::adjust_local_extended($hd, $part); + partition_table::adjust_main_extended($hd); + + fsedit::auto_allocate($all_hds, $partitions); + 1; + }, \@ok_for_resize_fat ]; + } } else { push @wizlog, N("There is no FAT partition to resize (or not enough space left)"); } @@ -202,11 +216,16 @@ filesystem checks will be run on your next boot into Microsoft Windows®")) if $ $solutions{wipe_drive} = [ 10, fsedit::is_one_big_fat_or_NT($hds) ? N("Remove Microsoft Windows®") : N("Erase and use entire disk"), sub { - my $hd = $in->ask_from_listf_raw({ messages => N("You have more than one hard drive, which one do you install linux on?"), - title => N("Partitioning"), - interactive_help_id => 'takeOverHdChoose', - }, - \&partition_table::description, \@hds_rw) or return; + my $hd; + if($in->{interactive} ne 'gtk') { + $hd = $in->ask_from_listf_raw({ messages => N("You have more than one hard drive, which one do you install linux on?"), + title => N("Partitioning"), + interactive_help_id => 'takeOverHdChoose', + }, + \&partition_table::description, \@hds_rw) or return; + } else { + $hd = $target; + } $in->ask_okcancel_({ messages => N("ALL existing partitions and their data will be lost on drive %s", partition_table::description($hd)), title => N("Partitioning"), interactive_help_id => 'takeOverHdConfirm' }) or return; @@ -250,34 +269,263 @@ sub warn_reboot_needed { $in->ask_warn(N("Partitioning"), N("You need to reboot for the partition table modifications to take place")); } -sub main { - my ($o, $all_hds, $fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $b_nodiskdrake) = @_; +sub create_display_box { + my ($kind, $resize, $fill_empty) = @_; + my @parts = fs::get::hds_fstab_and_holes($kind->{val}); - my %solutions = partitionWizardSolutions($o, $all_hds, $fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab); + my $totalsectors = $kind->{val}->{totalsectors}; - delete $solutions{diskdrake} if $b_nodiskdrake; + my $width = 540; + $width -= 24 if($resize || $fill_empty); + my $minwidth = 40; - my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions; + my $display_box = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), $width, 30); - my @sol = grep { $_->[0] >= 0 } @solutions; + my $ratio = $totalsectors ? ($width - @parts * ($minwidth+1)) / $totalsectors : 1; + while (1) { + my $totalwidth = sum(map { $_->{size} * $ratio + $minwidth } @parts); + $totalwidth <= $width and last; + $ratio /= $totalwidth / $width * 1.1; + } + + my $vbox = Gtk2::VBox->new(); + + my $ev; + my $desc; + + foreach my $entry (@parts) { + my $info = $entry->{device_LABEL}; + my $w = Gtk2::Label->new($info); + my @colorized_fs_types = qw(ext3 ext4 xfs swap vfat ntfs ntfs-3g); + $ev = Gtk2::EventBox->new(); + $ev->add($w); + my $part; + if($resize) { + ($part) = grep {$_->{device} eq "$entry->{device}"} @$resize; + } + if($resize && $part && !$desc) { + $ev->set_name("PART_vfat"); + $w->set_size_request($ratio * $part->{min_win}, 0); + my $ev2 = Gtk2::EventBox->new(); + my $b2 = Gtk2::Label->new(""); + $ev2->add($b2); + $b2->set_size_request($ratio * MB(600), 0); + $ev2->set_name("PART_ext4"); + + my $hpane = Gtk2::HPaned->new(); + $hpane->add1($ev); + $hpane->child1_shrink(0); + $hpane->add2($ev2); + $hpane->child2_shrink(0); + $hpane->set_position($ratio * $part->{min_win}); + ugtk2::gtkset_size_request($hpane, $ratio * $part->{size}, 30); + ugtk2::gtkpack__($display_box, $hpane); + + my $size = int($hpane->get_position / $ratio); + + $desc = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), $width, 20); + $ev = Gtk2::EventBox->new(); + $ev->add(Gtk2::Label->new(" " x 4)); + $ev->set_name("PART_vfat"); + ugtk2::gtkpack__($desc, $ev); + ugtk2::gtkpack__($desc, Gtk2::Label->new(" Windows ")); + my $win_size_label = Gtk2::Label->new(sprintf("%10s", formatXiB($size, 512))); + $desc->add($win_size_label); + $ev = Gtk2::EventBox->new(); + $ev->add(Gtk2::Label->new(" " x 4)); + $ev->set_name("PART_ext4"); + ugtk2::gtkpack__($desc, $ev); + ugtk2::gtkpack__($desc, Gtk2::Label->new(" Mandriva ")); + my $mdv_size_label = Gtk2::Label->new(sprintf("%10s", formatXiB($part->{size}-$size, 512))); + $desc->add($mdv_size_label); + $hpane->signal_connect('size-allocate' => sub { + my (undef, $alloc) = @_; + $part->{width} = $alloc->width; + }); + $hpane->signal_connect('motion-notify-event' => sub { + $part->{req_size} = int($hpane->get_position * $part->{size} / $part->{width}); + $win_size_label->set_label(sprintf("%10s", formatXiB( $part->{req_size}, 512))); + $mdv_size_label->set_label(sprintf("%10s", formatXiB($part->{size}- $part->{req_size}, 512))); + }); + } else { + if($fill_empty && isEmpty($entry)) { + $w->set_text("Mandriva"); + $ev->set_name("PART_ext4"); + } else { + $ev->set_name("PART_" . (isEmpty($entry) ? 'empty' : + $entry->{fs_type} && member($entry->{fs_type}, @colorized_fs_types) ? $entry->{fs_type} : + 'other')); + } + $w->set_size_request($entry->{size} * $ratio + $minwidth, 0); + ugtk2::gtkpack__($display_box, $ev); + } - log::l('' . "solutions found: " . join('', map { $_->[1] } @sol) . - " (all solutions found: " . join('', map { $_->[1] } @solutions) . ")"); + my $sep = Gtk2::Label->new("."); + $ev = Gtk2::EventBox->new(); + $ev->add($sep); + $sep->set_size_request(1, 0); + ugtk2::gtkpack__($display_box, $ev); + } + $display_box->remove($ev); + + $vbox->add($display_box); + $vbox->add($desc) if $desc; + + $vbox; +} + +sub display_choices { + my ($o, $contentbox, $mainw, %solutions) = @_; + my @solutions = sort { $solutions{$b}->[0] <=> $solutions{$a}->[0] } keys %solutions; + my @sol = grep { $solutions{$_}->[0] >= 0 } @solutions; + + log::l('' . "solutions found: " . join('', map { $solutions{$_}->[1] } @sol) . + " (all solutions found: " . join('', map { $solutions{$_}->[1] } @solutions) . ")"); + @solutions = @sol if @sol > 1; log::l("solutions: ", int @solutions); @solutions or $o->ask_warn(N("Partitioning"), N("I can not find any room for installing")), die 'already displayed'; + + log::l('HERE: ', join(',', map { $solutions{$_}->[1] } @solutions)); + + $contentbox->foreach(sub { $contentbox->remove($_[0]) }); + + $mainw->{kind}->{display_box} = create_display_box($mainw->{kind}) unless $mainw->{kind}->{display_box}; + ugtk2::gtkpack2__($contentbox, $mainw->{kind}->{display_box}); + ugtk2::gtkpack__($contentbox, ugtk2::gtknew('Label', + text => N("The DrakX Partitioning wizard found the following solutions:"), + alignment=> [0, 0])); + + my $choicesbox = ugtk2::gtknew('VBox'); + my $button; + foreach my $s (@solutions) { + my $item; + if($s eq 'free_space') { + $item = create_display_box($mainw->{kind}, undef, 1); + } elsif($s eq 'resize_fat') { + $item = create_display_box($mainw->{kind}, $solutions{$s}->[3]); + } elsif($s eq 'existing_part') { + } elsif($s eq 'wipe_drive') { + $item = Gtk2::EventBox->new(); + my $b2 = Gtk2::Label->new("Mandriva"); + $item->add($b2); + $b2->set_size_request(516,30); + $item->set_name("PART_ext4"); + } elsif($s eq 'diskdrake') { + } else { + log::l("$s"); + next; + } + $button = ugtk2::gtknew('RadioButton', + child => ugtk2::gtknew('VBox', + children_tight => [ + ugtk2::gtknew('Label', + text => $solutions{$s}->[1], + alignment=> [0, 0]), + if_(defined($item), $item) + ], + ), + $button?(group=>$button->get_group):()); + $button->signal_connect('pressed', sub {$mainw->{sol} = $solutions{$s}; }); + ugtk2::gtkpack2__($choicesbox, $button); + } + ugtk2::gtkadd($contentbox, $choicesbox); + $mainw->{sol} = $solutions{@solutions[0]} +} + +sub main { + my ($o, $all_hds, $fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $b_nodiskdrake) = @_; - log::l('HERE: ', join(',', map { $_->[1] } @solutions)); my $sol; - $o->ask_from_({ - title => N("Partitioning"), - interactive_help_id => 'doPartitionDisks', - }, - [ - { label => N("The DrakX Partitioning wizard found the following solutions:"), title => $::isInstall }, - { val => \$sol, list => \@solutions, format => sub { $_[0][1] }, type => 'list' }, - ]); + + if ($o->{interactive} eq 'gtk') { + use ugtk2; + + my $mainw = ugtk2->new(N("Partitioning"), %$o, if__($::main_window, transient => $::main_window)); + $mainw->{box_allow_grow} = 1; + + mygtk2::set_main_window_size($mainw->{rwindow}); + + use diskdrake::hd_gtk; + diskdrake::hd_gtk::load_theme(); + + my $mainbox = Gtk2::VBox->new(); + + my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } @{$all_hds->{hds}}; + + my $hdchoice = Gtk2::HBox->new(); + + my $hdchoicelabel = Gtk2::Label->new(N("Here is the content of you disk drive ")); + + my $combobox = Gtk2::ComboBox->new_text; + foreach (@kinds) { + my $info = $_->{val}->{info}; + $info .= " (".formatXiB($_->{val}->{totalsectors}, 512).")" if $_->{val}->{totalsectors}; + $combobox->append_text($info); + } + $combobox->set_active(0); + + ugtk2::gtkpack2__($hdchoice, $hdchoicelabel); + $hdchoice->add($combobox); + + ugtk2::gtkpack2__($mainbox, $hdchoice); + + my $contentbox = Gtk2::VBox->new(); + $mainbox->add($contentbox); + + my $kind = @kinds[$combobox->get_active]; + my %solutions = partitionWizardSolutions($o, $all_hds, $fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, diskdrake::hd_gtk::kind2hd($kind)); + delete $solutions{diskdrake} if $b_nodiskdrake; + $mainw->{kind} = $kind; + display_choices($o, $contentbox, $mainw, %solutions); + + $combobox->signal_connect("changed", sub { + $mainw->{kind} = @kinds[$combobox->get_active]; + my %solutions = partitionWizardSolutions($o, $all_hds, $fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, diskdrake::hd_gtk::kind2hd($mainw->{kind})); + delete $solutions{diskdrake} if $b_nodiskdrake; + display_choices($o, $contentbox, $mainw, %solutions); + $mainw->{window}->show_all; + }); + + my @more_buttons = ( + [ ugtk2::gtknew('Install_Button', + text => N("Help"), + clicked => sub { display_help($o, {interactive_help_id => 'doPartitionDisks'}, $mainw) }), + undef, 1 ], + ); + $::Wizard_no_previous = 1; + my $buttons_pack = $mainw->create_okcancel(N("Next"), undef, '', @more_buttons); + $mainbox->pack_end($buttons_pack, 0, 0, 0); + ugtk2::gtkadd($mainw->{window}, $mainbox); + $mainw->{window}->show_all; + + $mainw->main(); + + $sol=$mainw->{sol}; + } else { + my %solutions = partitionWizardSolutions($o, $all_hds, $fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab); + + delete $solutions{diskdrake} if $b_nodiskdrake; + + my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions; + + my @sol = grep { $_->[0] >= 0 } @solutions; + log::l('' . "solutions found: " . join('', map { $_->[1] } @sol) . + " (all solutions found: " . join('', map { $_->[1] } @solutions) . ")"); + @solutions = @sol if @sol > 1; + log::l("solutions: ", int @solutions); + @solutions or $o->ask_warn(N("Partitioning"), N("I can not find any room for installing")), die 'already displayed'; + log::l('HERE: ', join(',', map { $_->[1] } @solutions)); + $o->ask_from_({ + title => N("Partitioning"), + interactive_help_id => 'doPartitionDisks', + }, + [ + { label => N("The DrakX Partitioning wizard found the following solutions:"), title => $::isInstall }, + { val => \$sol, list => \@solutions, format => sub { $_[0][1] }, type => 'list' }, + ]); + } log::l("partitionWizard calling solution $sol->[1]"); my $ok = eval { $sol->[2]->() }; if (my $err = $@) { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 37a4ebe98..932b041db 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - better describe what usernames we allow (#44783) +- rewrite partitionning wizard to look better in gtk (not perfect yet) Version 12.54 - 23 September 2009 |