summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-09-07 09:31:30 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-09-07 09:31:30 +0000
commit5373fe17e8dad30b597e7258909fce40fdde103c (patch)
tree33b1254e217d639cd1a56d36e658551781832519
parent1ccfb2f88c31cdf57b89e69073eca2a8565d88e0 (diff)
downloaddrakx-5373fe17e8dad30b597e7258909fce40fdde103c.tar
drakx-5373fe17e8dad30b597e7258909fce40fdde103c.tar.gz
drakx-5373fe17e8dad30b597e7258909fce40fdde103c.tar.bz2
drakx-5373fe17e8dad30b597e7258909fce40fdde103c.tar.xz
drakx-5373fe17e8dad30b597e7258909fce40fdde103c.zip
- Give also access to the CUPS auto administration dialog during
installation.
-rw-r--r--perl-install/printer/printerdrake.pm14
1 files changed, 14 insertions, 0 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index a3fbb7310..bba6d878d 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -5128,6 +5128,15 @@ sub mainwindow_interactive {
1;
},
val => N("CUPS configuration") } : ()),
+ (($printer->{SPOOLER} eq "cups") ?
+ { clicked_may_quit =>
+ sub {
+ # Save the cursor position
+ $cursorpos = $menuchoice;
+ $menuchoice = '@autoadminconfig';
+ 1;
+ },
+ val => N("Configure Auto Administration") } : ()),
($printer->{expert} &&
(files_exist(qw(/usr/bin/pdq)) ||
files_exist("/usr/$lib/filters/lpf",
@@ -5186,6 +5195,11 @@ sub mainwindow_interactive {
config_cups($printer, $security, $in, $upNetwork);
next;
}
+ # Configure auto administration
+ if ($menuchoice eq '@autoadminconfig') {
+ config_auto_admin($printer, $in);
+ next;
+ }
# Call function to switch to another spooler
if ($menuchoice eq '@spooler') {
$printer->{SPOOLER} = setup_default_spooler($printer, $security, $in, $upNetwork) || $printer->{SPOOLER};