summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-27 00:39:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-27 00:39:45 +0000
commite1d7fa386efb725ecd526ea24bebcf56cf4b1296 (patch)
tree0064ad4c601350766f8e5856c6344285e3f3779a /perl-install
parent9bf316fa134a1c39ef18d0f007bf7aac21d4a487 (diff)
downloaddrakx-e1d7fa386efb725ecd526ea24bebcf56cf4b1296.tar
drakx-e1d7fa386efb725ecd526ea24bebcf56cf4b1296.tar.gz
drakx-e1d7fa386efb725ecd526ea24bebcf56cf4b1296.tar.bz2
drakx-e1d7fa386efb725ecd526ea24bebcf56cf4b1296.tar.xz
drakx-e1d7fa386efb725ecd526ea24bebcf56cf4b1296.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog21
-rw-r--r--perl-install/Xconfigurator.pm6
-rw-r--r--perl-install/install2.pm8
-rw-r--r--perl-install/install_steps.pm1
-rw-r--r--perl-install/install_steps_interactive.pm75
-rw-r--r--perl-install/my_gtk.pm25
-rw-r--r--perl-install/pkgs.pm9
7 files changed, 49 insertions, 96 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index d5f23a29c..1bd39ef3e 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,24 @@
+2000-09-27 Pixel <pixel@mandrakesoft.com>
+
+ * install_steps_interactive.pm (configureX): if `clicked' don't go
+ to auto mode
+
+ * Xconfigurator.pm (monitorConfiguration): fix the translated
+ 'Generic' which is not so (and must not be so) anymore
+
+2000-09-26 Pixel <pixel@mandrakesoft.com>
+
+ * pkgs.pm: remove all Unskip code
+
+ * my_gtk.pm (_create_window): add shortcut alt-e to switch to
+ expert
+
+ * Xconfigurator.pm (resolutionsConfiguration): fix for setting
+ legal resolution
+
+ * install_steps_interactive.pm (selectLanguage): use formatAlaTeX
+ on the license
+
2000-09-26 Fran�ois Pons <fpons@mandrakesoft.com>
* fs.pm: added mounting of swap partition when mounting them
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index e24b8ebba..d5eedcca1 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -120,7 +120,7 @@ sub readMonitorsDB {
$monitors{"$l{vendor}|$l{type}"} = \%l;
}
while (my ($k, $v) = each %standard_monitors) {
- $monitors{"Generic|" . translate($k)} =
+ $monitors{'Generic|' . translate($k)} =
{ hsyncrange => $v->[1], vsyncrange => $v->[2] };
}
}
@@ -349,7 +349,7 @@ sub monitorConfiguration(;$$) {
readMonitorsDB("/usr/X11R6/lib/X11/MonitorsDB");
- add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], _("Generic") . '|' . translate($default_monitor)) }) unless $monitor->{type};
+ add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], 'Generic|' . translate($default_monitor)) }) unless $monitor->{type};
if ($monitor->{type} eq 'Unlisted') {
$in->ask_from_entries_ref('',
_("The two critical parameters are the vertical refresh rate, which is the rate
@@ -654,7 +654,7 @@ sub resolutionsConfiguration {
my $wres = first(split 'x', $res);
#- take the first available resolution <= the wanted resolution
- $wres ||= max map { first(grep { $_->[0] <= $wres } @$_)->[0] } values %{$card->{depth}};
+ $wres = max map { first(grep { $_->[0] <= $wres } @$_)->[0] } values %{$card->{depth}};
my $depth = eval { $o->{default_depth} || autoDefaultDepth($card, $wres) };
$auto or ($depth, $wres) = chooseResolutions($card, $depth, $wres) or return;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 93d5347e7..cd2c92d4c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -220,7 +220,7 @@ sub selectMouse {
#------------------------------------------------------------------------------
sub setupSCSI {
- my ($clicked) = $_[0];
+ my ($clicked) = @_;
$o->{autoSCSI} ||= $::beginner;
$o->setupSCSI($o->{autoSCSI} && !$clicked, $clicked);
@@ -228,7 +228,7 @@ sub setupSCSI {
#------------------------------------------------------------------------------
sub selectKeyboard {
- my ($clicked) = $_[0];
+ my ($clicked) = @_;
return if !$o->{isUpgrade} && $::beginner && !$clicked;
@@ -424,13 +424,13 @@ sub setupBootloader {
}
#------------------------------------------------------------------------------
sub configureX {
- my ($clicked) = $_[0];
+ my ($clicked) = @_;
#- done here and also at the end of install2.pm, just in case...
fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
modules::write_conf($o->{prefix});
- $o->configureX if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked;
+ $o->configureX($clicked) if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked;
}
#------------------------------------------------------------------------------
sub generateAutoInstFloppy { $o->generateAutoInstFloppy }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 48501982d..743eaa151 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -258,7 +258,6 @@ sub choosePackages {
foreach (values %{$packages->[0]}) {
pkgs::packageSetFlagSkip($_, 0);
- pkgs::packageSetFlagUnskip($_, 0);
}
#- avoid destroying user selection of packages. TOCHECK
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 13dda61b7..d8c73efb6 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -67,73 +67,9 @@ translated etc. that varies from language to language).") if $o->{lang} !~ /^en/
unless ($o->{useless_thing_accepted}) {
$o->set_help('license');
- $o->{useless_thing_accepted} = $o->ask_from_list_('', formatAlaTeX(
-"Introduction
-
-\"Linux-Mandrake\" designates the operating system and the different
-components of the Linux-Mandrake distribution. The operating system and the
-different components available in the Linux-Mandrake distribution are
-called the \"Software Product\" hereafter. The Software Product includes, but
-is not restricted to, the set of programs, methods, rules, documentation,
-related to the operating system and the different components of the
-Linux-Mandrake distribution.
-
-
-1.License Agreement
-
-
-Please read carefully this document. This document is a license agreement
-between you and MandrakeSoft S.A., 43, rue d'Aboukir 75002 Paris - France,
-which applies to the Software Product.
-
-You must agree with the terms and conditions of the present License before
-you install, copy or use the Software Product. If you disagree with any
-portion of the License, you are not allowed to install, duplicate or use
-the Software. By installing, duplicating or using the Software Product in
-any manner, you explicitly accept and fully agree to conform to the terms
-and conditions of the present License. The License agreement is personal,
-non exclusive and non transferable.
-
-Any attempt to install, duplicate or use the Software Product in a manner
-which does not comply with the terms and conditions of the present License
-is void and will terminate your rights under the present License. Upon
-termination of the License, you must immediately destroy all copies of the
-Software Product.
-
-
-2. The GPL license and related licenses
-
-
-The Software product consists of components created by different persons
-or entities.
-
-Most of these components are governed under the terms and conditions of the
-GNU General Public License, hereafter called \"GPL\", or of similar
-licenses. Most of these licenses allow you to use, duplicate and adapt the
-components which they cover. Please read carefully the terms and conditions
-of the license agreement for each component before using the component. Any
-question on a component license should be addressed to the component author
-and not to MandrakeSoft.
-
-The programs and components developed by MandrakeSoft are usually governed
-by the GPL License. Please refer to the documentation of these components
-for further details.
-
-Some versions of the Software Product may contain components which are not
-governed by the GPL License or similar agreements. Each such component is
-then governed by the terms and conditions of its specific license. Please
-read carefully and comply with such specific licenses before you install,
-duplicate or use the said components. Such licenses will in general prevent
-the transfer, the duplication (except for backup purpose), the reverse
-engineering, de-assembly, de-compilation or modification of the
-component. Any breach of agreement will immediately terminate your rights
-under the specific license. Unless the specific license terms grant you
-such rights, you usually cannot install the programs on more than one
-system, or use it on a network. In doubt, please contact directly the
-distributor or editor of the component. Transfer to third parties or
-copying of such components including the documentation is strictly
-forbidden.
-"), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or $o->exit;
+ $o->{useless_thing_accepted} = $o->ask_from_list_('',
+ "License - no warranty",
+ [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or $o->exit;
}
}
#------------------------------------------------------------------------------
@@ -506,7 +442,6 @@ sub chooseGroups {
foreach (@{$o->{compssUsersSorted}}) {
$o->{compssUsersChoice}{$_} or next;
foreach (@{$compssUsers->{$_}}) {
- pkgs::packageSetFlagUnskip($_, 1);
pkgs::packageSetFlagSkip($_, 0);
}
}
@@ -960,7 +895,7 @@ give digits instead of normal letters (eg: pressing `p' gives `6')")) || return;
#------------------------------------------------------------------------------
sub configureX {
- my ($o) = @_;
+ my ($o, $clicked) = @_;
$o->configureXBefore;
require Xconfig;
@@ -979,7 +914,7 @@ sub configureX {
$xfs_started = 1;
{ local $::testing = 0; #- unset testing
- local $::auto = $::beginner;
+ local $::auto = $::beginner && !$clicked;
Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, bool($o->{pcmcia}), sub {
my ($server, @l) = @_;
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 9040f002d..59aee488f 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -366,23 +366,26 @@ sub _create_window($$) {
$w->signal_connect(key_press_event => sub {
my $d = ${{ 65470 => 'help',
65481 => 'next',
- 65480 => 'previous' }}{$_[1]->{keyval}} or return;
+ 65480 => 'previous' }}{$_[1]{keyval}};
- #- previous field is created here :(
- my $s; foreach (reverse @{$::o->{orderedSteps}}) {
- $s->{previous} = $_ if $s;
- $s = $::o->{steps}{$_};
- }
-
- if ($d eq "help" && !$::isStandalone) {
+ if ($d eq "help") {
require install_gtk;
install_gtk::create_big_help($::o);
- } else {
- my $s = $::o->{step};
+ } elsif ($_[1]{keyval} eq ord('e') && $_[1]{state} & 8) {
+ log::l("Switching to expert");
+ $::expert = 1;
+ $::beginner = 0;
+ } elsif ($d) {
+ #- previous field is created here :(
+ my $s; foreach (reverse @{$::o->{orderedSteps}}) {
+ $s->{previous} = $_ if $s;
+ $s = $::o->{steps}{$_};
+ }
+ $s = $::o->{step};
do { $s = $::o->{steps}{$s}{$d} } until !$s || $::o->{steps}{$s}{reachable};
$::setstep && $s and die "setstep $s\n";
}
- }) unless $::isStandalone;
+ });# if $::isInstall;
$w->signal_connect(size_allocate => sub {
my ($wi, $he) = @{$_[1]}[2,3];
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 3695c6233..a5b063dfd 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -2,7 +2,7 @@ package pkgs; # $Id$
use diagnostics;
use strict;
-use vars qw(*LOG %compssListDesc @skip_list %by_lang @preferred $limitMinTrans $PKGS_SELECTED $PKGS_FORCE $PKGS_INSTALLED $PKGS_BASE $PKGS_SKIP $PKGS_UNSKIP $PKGS_UPGRADE);
+use vars qw(*LOG %compssListDesc @skip_list %by_lang @preferred $limitMinTrans $PKGS_SELECTED $PKGS_FORCE $PKGS_INSTALLED $PKGS_BASE $PKGS_SKIP $PKGS_UPGRADE);
use common qw(:common :file :functional);
use install_any;
@@ -36,8 +36,6 @@ use c;
-30 => __("i18n (nice)"),
);
#- HACK: rating += 50 for some packages (like kapm, cf install_any::setPackages)
-#- HACK: rating += 10 if the group is selected and it is not a kde package (aka name !~ /^k/)
-#- HACK: rating += 1 if the group is selected and it is a kde package (aka name !~ /^k/)
%by_lang = (
'ar' => [ 'acon' ],
@@ -100,7 +98,6 @@ $PKGS_FORCE = 0x01000000;
$PKGS_INSTALLED = 0x02000000;
$PKGS_BASE = 0x04000000;
$PKGS_SKIP = 0x08000000;
-$PKGS_UNSKIP = 0x10000000;
$PKGS_UPGRADE = 0x20000000;
#- package to ignore, typically in Application CD.
@@ -134,7 +131,6 @@ sub packageFlagForce { my ($pkg) = @_; $pkg->{flags} & $PKGS_FORCE }
sub packageFlagInstalled { my ($pkg) = @_; $pkg->{flags} & $PKGS_INSTALLED }
sub packageFlagBase { my ($pkg) = @_; $pkg->{flags} & $PKGS_BASE }
sub packageFlagSkip { my ($pkg) = @_; $pkg->{flags} & $PKGS_SKIP }
-sub packageFlagUnskip { my ($pkg) = @_; $pkg->{flags} & $PKGS_UNSKIP }
sub packageFlagUpgrade { my ($pkg) = @_; $pkg->{flags} & $PKGS_UPGRADE }
sub packageSetFlagSelected { my ($pkg, $v) = @_; $pkg->{flags} &= ~$PKGS_SELECTED; $pkg->{flags} |= $v & $PKGS_SELECTED; }
@@ -143,7 +139,6 @@ sub packageSetFlagForce { my ($pkg, $v) = @_; $v ? ($pkg->{flags} |= $PKGS_F
sub packageSetFlagInstalled { my ($pkg, $v) = @_; $v ? ($pkg->{flags} |= $PKGS_INSTALLED) : ($pkg->{flags} &= ~$PKGS_INSTALLED); }
sub packageSetFlagBase { my ($pkg, $v) = @_; $v ? ($pkg->{flags} |= $PKGS_BASE) : ($pkg->{flags} &= ~$PKGS_BASE); }
sub packageSetFlagSkip { my ($pkg, $v) = @_; $v ? ($pkg->{flags} |= $PKGS_SKIP) : ($pkg->{flags} &= ~$PKGS_SKIP); }
-sub packageSetFlagUnskip { my ($pkg, $v) = @_; $v ? ($pkg->{flags} |= $PKGS_UNSKIP) : ($pkg->{flags} &= ~$PKGS_UNSKIP); }
sub packageSetFlagUpgrade { my ($pkg, $v) = @_; $v ? ($pkg->{flags} |= $PKGS_UPGRADE) : ($pkg->{flags} &= ~$PKGS_UPGRADE); }
sub packageProvides { my ($pkg) = @_; @{$pkg->{provides} || []} }
@@ -707,7 +702,7 @@ sub setSelectedFromCompssList {
my @packages = allPackages($packages);
my @places = do {
#- special case for /^k/ aka kde stuff
- my @values = map { $_->{values}[$ind] + (packageFlagUnskip($_) && packageName($_) !~ /^k/ ? 10 : 1) } @packages;
+ my @values = map { $_->{values}[$ind] } @packages;
sort { $values[$b] <=> $values[$a] } 0 .. $#packages;
};
foreach (@places) {