diff options
| author | Florent Villard <warly@mandriva.com> | 2004-12-01 06:30:55 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-12-01 06:30:55 +0000 |
| commit | 6fabcdc910cdb6bea8ed7d44ae836c3b3700373f (patch) | |
| tree | d338efeacb3af8463b897b96282778ba9886d883 | |
| parent | d769d6b8e68d40d19cbb108a1f84b73f922eeea0 (diff) | |
| download | drakx-6fabcdc910cdb6bea8ed7d44ae836c3b3700373f.tar drakx-6fabcdc910cdb6bea8ed7d44ae836c3b3700373f.tar.gz drakx-6fabcdc910cdb6bea8ed7d44ae836c3b3700373f.tar.bz2 drakx-6fabcdc910cdb6bea8ed7d44ae836c3b3700373f.tar.xz drakx-6fabcdc910cdb6bea8ed7d44ae836c3b3700373f.zip | |
update the group selection layout to handle the supplementary CD
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 63 |
1 files changed, 24 insertions, 39 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 3fd333232..c9bb3c413 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -232,45 +232,30 @@ sub reallyChooseGroups { gtkpack_($w->create_box_with_title(N("Package Group Selection")), 1, gtkpack_(Gtk2::VBox->new(0, 0), 1, gtkpack_(Gtk2::HBox->new(0, 0), - $o->{meta_class} eq 'server' ? $::corporate ? ( - 1, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Server'), - ), - 1, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Development'), - '', - $entries_in_path->('Utilities'), - ), - ) : ( 1, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Workstation'), - '', - ), - 1, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Server'), - ), - 1, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Development'), - '', - $entries_in_path->('Utilities'), - ), - ) : $o->{meta_class} eq 'desktop' ? ( - 1, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Workstation'), - ), - ) : ( - 1, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Workstation'), - '', - $entry->('Development|Development'), - $entry->('Development|Documentation'), - $entry->('Development|LSB'), - ), - 0, gtkpack(Gtk2::VBox->new(0, 0), - $entries_in_path->('Server'), - '', - $entries_in_path->('Graphical Environment'), - ), - ), + $o->{meta_class} eq 'server' ? + $::corporate ? + (any { /development/i } @{$o->{compssUsersSorted}}) ? + ( 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Server'),), + 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Development'), '', $entries_in_path->('Utilities'),), + ) : + ( 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Server'), ), + 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Utilities'), ), + ) + : + ( 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Workstation'), '', ), + 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Server'), ), + 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Development'), '', $entries_in_path->('Utilities'), ), + ) : + $o->{meta_class} eq 'desktop' ? + (any { /development/i } @{$o->{compssUsersSorted}}) ? ( + 1, gtkpack__(Gtk2::VBox->new(0, 0), map { Gtk2::Label->new(' '), $_ } $entries_in_path->('Workstation'), ), + 1, gtkpack__(Gtk2::VBox->new(0, 0), map { Gtk2::Label->new(' '), $_ } $entries_in_path->('Development'), ), + ) : ( + 1, gtkpack__(Gtk2::VBox->new(0, 0), map { Gtk2::Label->new(' '), $_ } $entries_in_path->('Workstation'), ), + ) : ( + 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Workstation'), '', $entry->('Development|Development'), $entry->('Development|Documentation'), $entry->('Development|LSB'), ), + 0, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Server'), '', $entries_in_path->('Graphical Environment'), ), + ), )), 1, '', 0, gtkadd(Gtk2::HBox->new(0, 0), |