summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-02 14:37:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-02 14:37:57 +0000
commit747b9d59e9277be53b8f915177afa909204c7554 (patch)
tree36d28bde9597f4672973b6d9232482b80bf87187
parentd3c77792d4458c82943d4819e6080344151653a1 (diff)
downloaddrakx-747b9d59e9277be53b8f915177afa909204c7554.tar
drakx-747b9d59e9277be53b8f915177afa909204c7554.tar.gz
drakx-747b9d59e9277be53b8f915177afa909204c7554.tar.bz2
drakx-747b9d59e9277be53b8f915177afa909204c7554.tar.xz
drakx-747b9d59e9277be53b8f915177afa909204c7554.zip
(monitorConfiguration): better default for DDC probe fails and
auto_install and not provided any info about the monitor
-rw-r--r--perl-install/Xconfigurator.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 694efc78d..9168f5f9c 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -2,7 +2,7 @@ package Xconfigurator; # $Id$
use diagnostics;
use strict;
-use vars qw($in $install $isLaptop @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $XF86firstchunk_text2 $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $pointersection_text_v4 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $default_monitor $layoutsection_v4);
+use vars qw($in $install $isLaptop @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $XF86firstchunk_text2 $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $pointersection_text_v4 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4);
use common qw(:common :file :functional :system);
use log;
@@ -355,7 +355,11 @@ sub monitorConfiguration(;$$) {
readMonitorsDB("$ENV{SHARE_PATH}/ldetect-lst/MonitorsDB");
- add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Custom', keys %monitors], 'Generic|' . translate($default_monitor)) }) unless $monitor->{type};
+ my $good_default = 'Generic|' . translate($good_default_monitor);
+ my $low_default = 'Generic|' . translate($low_default_monitor);
+ $monitor->{type} ||=
+ ($::auto_install ? $low_default :
+ $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Custom', keys %monitors], $good_default));
if ($monitor->{type} eq 'Custom') {
$in->ask_from_entries_refH('',
_("The two critical parameters are the vertical refresh rate, which is the rate