diff options
| -rw-r--r-- | perl-install/printer/cups.pm | 2 | ||||
| -rw-r--r-- | perl-install/printer/main.pm | 9 | ||||
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 14 |
3 files changed, 9 insertions, 16 deletions
diff --git a/perl-install/printer/cups.pm b/perl-install/printer/cups.pm index 127c342bb..521e196a3 100644 --- a/perl-install/printer/cups.pm +++ b/perl-install/printer/cups.pm @@ -37,7 +37,7 @@ sub get_formatted_remote_queues { # CUPS daemon knows due to broadcasting of remote servers or # "BrowsePoll" entries in the local /etc/cups/cupsd.conf/ map { - join('!', if_($::expert, N("CUPS")), N("Remote Printers"), $_); + join('!', if_($::expert, N("CUPS")), N("Configured on other machines"), $_); } map { my $comment = N("On CUPS server \"%s\"", $_->{ipp}) . ($_->{queuename} eq $printer->{DEFAULT} ? N(" (Default)") : ""); "$_->{queuename}: $comment"; diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index 9add764d4..e6567c8cb 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -320,14 +320,7 @@ sub make_menuentry { my ($printer, $queue) = @_; my $spooler = $spoolers{$printer->{SPOOLER}}{short_name}; my $connect = $printer->{configured}{$queue}{queuedata}{connect}; - my $localremote; - if ($connect =~ m!^(file|parallel|usb|serial):! || - $connect =~ m!^ptal://?mlc:! || - $connect =~ m!^mtink:!) { - $localremote = N("Local Printers"); - } else { - $localremote = N("Remote Printers"); - } + my $localremote = N("Configured on this machine"); my $make = $printer->{configured}{$queue}{queuedata}{make}; my $model = $printer->{configured}{$queue}{queuedata}{model}; my $connection; diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 1db21ae67..fb81a8c2c 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -1662,7 +1662,7 @@ complete => sub { ); # Non-local printer, check network and abort if no network available - if ($printer->{currentqueue}{connect} !~ m!^(file|ptal):/! && + if ($printer->{currentqueue}{connect} !~ m!^(file|parallel|usb|serial|mtink|ptal://?mlc):/! && !check_network($printer, $in, $upNetwork, 0)) { return 0; } @@ -3665,14 +3665,14 @@ sub mainwindow_interactive { } # Generate the list of available printers my @printerlist = - sort((map { $printer->{configured}{$_}{queuedata}{menuentry} + (sort(map { $printer->{configured}{$_}{queuedata}{menuentry} . ($_ eq $printer->{DEFAULT} ? N(" (Default)") : "") } keys(%{$printer->{configured} || {}})), - ($printer->{SPOOLER} eq "cups" ? - printer::cups::get_formatted_remote_queues($printer) : - ())); + ($printer->{SPOOLER} eq "cups" ? + sort(printer::cups::get_formatted_remote_queues($printer)) : + ())); my $noprinters = $#printerlist < 0; # Position the cursor where it was before (in case # a button was pressed). @@ -3686,8 +3686,8 @@ sub mainwindow_interactive { # List the queues [ if_(!$noprinters, { val => \$menuchoice, format => \&translate, - sort => 0, separator => "!",tree_expanded => 1, - quit_if_double_click => 1,allow_empty_list =>1, + sort => 0, separator => "!", tree_expanded => 1, + quit_if_double_click => 1, allow_empty_list => 1, list => \@printerlist }), { clicked_may_quit => sub { |