summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Duret <yduret@mandriva.com>2002-02-18 17:32:42 +0000
committerYves Duret <yduret@mandriva.com>2002-02-18 17:32:42 +0000
commit60358ba1ae8dd7a46c4ffbdd64f59bdf8f081c74 (patch)
tree890c5facb18ee7201d9e69b69e28ea87f73980c6
parent9fe15376756fb7db21ebc6481f4681ccb61208ad (diff)
downloaddrakx-60358ba1ae8dd7a46c4ffbdd64f59bdf8f081c74.tar
drakx-60358ba1ae8dd7a46c4ffbdd64f59bdf8f081c74.tar.gz
drakx-60358ba1ae8dd7a46c4ffbdd64f59bdf8f081c74.tar.bz2
drakx-60358ba1ae8dd7a46c4ffbdd64f59bdf8f081c74.tar.xz
drakx-60358ba1ae8dd7a46c4ffbdd64f59bdf8f081c74.zip
HP OfficeJet support
-rwxr-xr-xperl-install/standalone/scannerdrake12
1 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 36aa86910..63464cd96 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -37,7 +37,7 @@ for (@ARGV) {
}
$in = 'interactive'->vnew('su', 'default');
-$in->do_pkgs->install('sane-backends', 'xsane', if_($in->do_pkgs->is_installed('gimp'),'xsane-gimp'));
+#$in->do_pkgs->install('sane-backends', 'xsane', if_($in->do_pkgs->is_installed('gimp'),'xsane-gimp'));
if ($::Manual) {manual(); quit();}
my $wait = $in->wait_message(_("Test ports"), _("Detecting devices ..."));
@f = scanner::findScannerUsbport();
@@ -57,9 +57,10 @@ sub auto {
}
sub manual {
- my $s = $in->ask_from_treelist('scannerdrake', _("Select a scanner"), '|', [keys %$scanner::scannerDB]) or return;
+ my $s = $in->ask_from_treelist('scannerdrake', _("Select a scanner"), '|', [' None', keys %$scanner::scannerDB], '' ) or return;
# DRIVER usb or scsi
#print "$s\n";
+ return if $s eq ' None';
tryConfScanner($s);
}
@@ -89,6 +90,10 @@ sub tryConfScanner {
#$in->ask_warn('scannerdrake', _("This %s scanner uses parallel port, which is unsupported for the moment", $model));
#return;
}
+ if ($scanner::scannerDB->{$model}{server} =~ /printerdrake/) {
+ $in->ask_warn('scannerdrake', _("This %s scanner must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", $model));
+ return;
+ }
scanner::confScanner($model,$port);
}
@@ -98,6 +103,9 @@ sub quit {
#-----------------------------------------------
# $Log$
+# Revision 1.7 2002/02/18 17:32:42 yduret
+# HP OfficeJet support
+#
# Revision 1.6 2002/02/18 16:12:07 yduret
# scsi/parport preliminary support
#