summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/main.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-07-27 14:59:31 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-07-27 14:59:31 +0000
commit5decb267cfe432ed03ca176168e26717c7f79627 (patch)
treedb23d123245ec114343587b9dd284db38d61916b /perl-install/printer/main.pm
parent97c8aa84aa55784e12c28ea68a54c3b57a97f3f7 (diff)
downloaddrakx-5decb267cfe432ed03ca176168e26717c7f79627.tar
drakx-5decb267cfe432ed03ca176168e26717c7f79627.tar.gz
drakx-5decb267cfe432ed03ca176168e26717c7f79627.tar.bz2
drakx-5decb267cfe432ed03ca176168e26717c7f79627.tar.xz
drakx-5decb267cfe432ed03ca176168e26717c7f79627.zip
- Added dialog to configure automatic queue creating and automatic queue re-enabling
Diffstat (limited to 'perl-install/printer/main.pm')
-rw-r--r--perl-install/printer/main.pm50
1 files changed, 48 insertions, 2 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 73537f25e..78085b39e 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -689,8 +689,6 @@ sub read_ppd_options ($) {
return $COMBODATA->{args};
}
-my %sysconfig = getVarsFromSh("$::prefix/etc/sysconfig/printing");
-
sub set_cups_special_options {
my ($queue) = @_;
# Set some special CUPS options
@@ -714,6 +712,8 @@ sub set_cups_special_options {
return 1;
}
+my %sysconfig = getVarsFromSh("$::prefix/etc/sysconfig/printing");
+
sub set_cups_autoconf {
my ($autoconf) = @_;
$sysconfig{CUPS_CONFIG} = $autoconf ? "automatic" : "manual";
@@ -734,6 +734,52 @@ sub set_usermode {
sub get_usermode() { $sysconfig{USER_MODE} eq 'expert' ? 1 : 0 }
+sub set_auto_admin {
+ my ($printer) = @_;
+ $sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED} =
+ $printer->{enablequeuesonnewprinter} ? "yes" : "no";
+ $sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED} =
+ $printer->{autoqueuesetuponnewprinter} ? "yes" : "no";
+ $sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} =
+ $printer->{enablequeuesonspoolerstart} ? "yes" : "no";
+ $sysconfig{AUTO_SETUP_QUEUES_ON_SPOOLER_START} =
+ $printer->{autoqueuesetuponspoolerstart} ? "yes" : "no";
+ $sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} =
+ $printer->{autoqueuesetuponstart} ? "yes" : "no";
+ $sysconfig{AUTO_SETUP_QUEUES_MODE} =
+ $printer->{autoqueuesetupgui} ? "waitforgui" : "nogui";
+ setVarsInSh("$::prefix/etc/sysconfig/printing", \%sysconfig);
+ return 1;
+}
+
+sub get_auto_admin {
+ my ($printer) = @_;
+ $printer->{enablequeuesonnewprinter} =
+ (!defined($sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED}) ||
+ ($sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED} =~ /yes/i) ?
+ 1 : 0);
+ $printer->{autoqueuesetuponnewprinter} =
+ (!defined($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED}) ||
+ ($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED} =~ /yes/i) ?
+ 1 : 0);
+ $printer->{enablequeuesonspoolerstart} =
+ (!defined($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START}) ||
+ ($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} =~ /yes/i) ?
+ 1 : 0);
+ $printer->{autoqueuesetuponspoolerstart} =
+ (!defined($sysconfig{AUTO_SETUP_QUEUES_ON_SPOOLER_START}) ||
+ ($sysconfig{AUTO_SETUP_QUEUES_ON_SPOOLER_START} =~ /yes/i) ?
+ 1 : 0);
+ $printer->{autoqueuesetuponstart} =
+ (!defined($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START}) ||
+ ($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} =~ /yes/i) ?
+ 1 : 0);
+ $printer->{autoqueuesetupgui} =
+ (!defined($sysconfig{AUTO_SETUP_QUEUES_MODE}) ||
+ ($sysconfig{AUTO_SETUP_QUEUES_MODE} =~ /waitforgui/i) ?
+ 1 : 0);
+}
+
sub set_jap_textmode {
my $textmode = ($_[0] ? 'cjk' : '');
# Do not write mime.convs if the file does not exist, as then