diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-02-04 16:29:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-02-04 16:29:18 +0000 |
| commit | 28d0c058d97ca8753a02b368551261ed08ec6c42 (patch) | |
| tree | 46af2aeaeff29b776fc41873091718441b1ab2bb /perl-install | |
| parent | 85bde5bc3e1d435c87a9f092b058836cc8bea360 (diff) | |
| download | drakx-28d0c058d97ca8753a02b368551261ed08ec6c42.tar drakx-28d0c058d97ca8753a02b368551261ed08ec6c42.tar.gz drakx-28d0c058d97ca8753a02b368551261ed08ec6c42.tar.bz2 drakx-28d0c058d97ca8753a02b368551261ed08ec6c42.tar.xz drakx-28d0c058d97ca8753a02b368551261ed08ec6c42.zip | |
(monitorConfiguration): better handling of auto_install
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 9168f5f9c..fc66557ab 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -15,7 +15,7 @@ use my_gtk qw(:wrappers); my $tmpconfig = "/tmp/Xconfig"; -my ($prefix, %monitors); +my ($prefix, %monitors, %standard_monitors_); 1; @@ -124,8 +124,8 @@ sub readMonitorsDB { $monitors{"$l{vendor}|$l{type}"} = \%l; } while (my ($k, $v) = each %standard_monitors) { - $monitors{'Generic|' . translate($k)} = - { hsyncrange => $v->[1], vsyncrange => $v->[2] }; + $monitors{'Generic|' . translate($k)} = $standard_monitors_{$k} = + { hsyncrange => $v->[1], vsyncrange => $v->[2] }; } } @@ -356,9 +356,8 @@ sub monitorConfiguration(;$$) { readMonitorsDB("$ENV{SHARE_PATH}/ldetect-lst/MonitorsDB"); my $good_default = 'Generic|' . translate($good_default_monitor); - my $low_default = 'Generic|' . translate($low_default_monitor); $monitor->{type} ||= - ($::auto_install ? $low_default : + ($::auto_install ? $low_default_monitor : $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Custom', keys %monitors], $good_default)); if ($monitor->{type} eq 'Custom') { $in->ask_from_entries_refH('', @@ -372,7 +371,7 @@ that is beyond the capabilities of your monitor: you may damage your monitor. [ { val => \$monitor->{hsyncrange}, list => \@hsyncranges, label => _("Horizontal refresh rate") }, { val => \$monitor->{vsyncrange}, list => \@vsyncranges, label => _("Vertical refresh rate") }]); } else { - add2hash($monitor, $monitors{$monitor->{type}}); + add2hash($monitor, $monitors{$monitor->{type}} || $standard_monitors_{$monitor->{type}}); } add2hash($monitor, { type => "Unknown", vendor => "Unknown", model => "Unknown", manual => 1 }); } |