summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-31 21:10:50 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-31 21:10:50 +0000
commit9fbed9ab76940bea1d9285057c33bcb4a585b0ee (patch)
treea53dc51c1b2a5906385ba3e138c4e1131b399ded /perl-install
parentafabd983d6218b249ad134713206f851a76bc704 (diff)
downloaddrakx-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar
drakx-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar.gz
drakx-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar.bz2
drakx-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar.xz
drakx-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.zip
in non expert mode, only display the list of *installed* display managers.
(interface team request) if no dm is installed, then switch back to expert mode behaviour and display all dm and install them if needed.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/standalone/drakedm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index 7e6a824ea..9106dd051 100644
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -41,6 +41,9 @@ foreach (cat_($cfg_file)) {
$dm = uc($1) if /^DISPLAYMANAGER=(.*)$/;
}
+my @raw_list = sort keys %dm;
+my @list = $::expert ? @raw_list : (grep { -e $dm{$_}->[1] } @raw_list) or @raw_list;
+
start:
if ($in->ask_from(N("Choosing a display manager"),
formatAlaTeX(N("X11 Display Manager allows you to graphically log
@@ -48,7 +51,8 @@ into your system with the X Window System running and supports running
several different X sessions on your local machine at the same time.")),
[
{
- list => [ sort keys %dm ],
+ allow_empty_list => 1,
+ list => \@list,
val => \$dm,
type => 'list',
format => sub { $dm{$_[0]}[0] },
td>Ahmad Samir2011-04-0571-214/+214 | | | | | | be changed this way as this changes the meaning of the string and translators need to adapt the .po files themselves * - 's!Just select your tv card parameters!Just select your TV card parameters!'Ahmad Samir2011-04-0471-72/+72 | * - s/api/API/Ahmad Samir2011-04-0471-171/+171 | * - perl -pi -e 's!trouble shoot!troubleshoot!'Ahmad Samir2011-04-0471-143/+143 | * - perl -pi -e 's!you can pick one in the above list!you can pick one from ↵Ahmad Samir2011-04-0471-71/+71 | | | | the above list!' * - perl -pi -e 's!For this, create a partition!To accomplish this, create a ↵Ahmad Samir2011-04-0471-71/+71 | | | | partition!' * - perl -pi -e 's!"Search new servers"!"Search for new servers"!'Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!Something bad is happening on your drive!Something bad is ↵Ahmad Samir2011-04-0471-71/+71 | | | | happening on your hard disk drive!' * - perl -pi -e 's!"Activate ethernet cards promiscuity check."!"Activate ↵Ahmad Samir2011-04-0471-71/+71 | | | | Ethernet cards promiscuity check."!' * - perl -pi -e 's!Posix!POSIX!'Ahmad Samir2011-04-0471-87/+87 | * - perl -pi -e 's!Hard drive!Hard disk drive!' (except install/steps_list.pm)Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!need to reboot before the modification can take ↵Ahmad Samir2011-04-0471-142/+142 | | | | | | | place"!"need to reboot before the modification can take effect"!' - perl -pi -e 's!"You need to reboot for the partition table modifications to take place"!"You need to reboot for the partition table modifications to take effect"!' * - perl -pi -e 's!"All data on this partition should be backed-up"!"All data ↵Ahmad Samir2011-04-0471-71/+71 | | | | on this partition should be backed up"!' * - perl -pi -e 's!"Check bad blocks\?"!"Check for bad blocks\?"!'Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!"Do you want to save /etc/fstab modifications"!"Do you want ↵Ahmad Samir2011-04-0471-71/+71 | | | | to save the /etc/fstab modifications?"!' * - perl -pi -e 's!mountpoint!mount point!'Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!hard drive!hard disk drive!'Ahmad Samir2011-04-0471-302/+302 | * String changes: perl -pi -e 's!file system!filesystem!'Ahmad Samir2011-04-0471-717/+717 | * String changes: perl -pi -e 's!"Password should resist to basic ↵Ahmad Samir2011-04-0471-71/+71 | | | | attacks"!"Password should be resistant to basic attacks"!' * - string changes: perl -pi -e 's!Can not!Cannot!'Ahmad Samir2011-04-0471-285/+285 | * - string changes: perl -pi -e 's!/boot partition!separate /boot partition!'Ahmad Samir2011-04-0471-214/+214 | * - update the .po filesAhmad Samir2011-04-0270-53090/+48564 | * - modify a string in partitioning_wizard.pm to be more grammatically correctAhmad Samir2011-04-021-672/+608 | | | | | (spotted by Sigrid Carrera, on mageia-i18n ML) * Fix pot fileDexter Morgan2011-03-30