Author: jsmeix
Date: Fri Oct 7 15:17:19 2011
New Revision: 66341
URL: http://svn.opensuse.org/viewcvs/yast?rev=66341&view=rev
Log:
- Added new driver "epson-inkjet-printer-escpr"
to the "Add Driver" dialog (bnc#722625).
- Fixed typos in help texts (bnc#703201).
- 2.21.0
Modified:
trunk/printer/VERSION
trunk/printer/package/yast2-printer.changes
trunk/printer/src/Printer.ycp
trunk/printer/src/Printerlib.ycp
trunk/printer/src/autoconfig.ycp
trunk/printer/src/connectionwizard.ycp
trunk/printer/src/driveradd.ycp
trunk/printer/src/helps.ycp
trunk/printer/src/printer_auto.ycp
trunk/printer/src/printer_proposal.ycp
trunk/printer/tools/autodetect_print_queues
trunk/printer/tools/autodetect_printers
trunk/printer/tools/create_printer_ppd_database
trunk/printer/tools/cups_client_only
trunk/printer/tools/determine_printer_driver_options
trunk/printer/tools/modify_cupsd_conf
trunk/printer/tools/test_device
trunk/printer/tools/test_remote_ipp
trunk/printer/tools/test_remote_lpd
trunk/printer/tools/test_remote_novell
trunk/printer/tools/test_remote_smb
trunk/printer/tools/test_remote_socket
Modified: trunk/printer/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/VERSION (original)
+++ trunk/printer/VERSION Fri Oct 7 15:17:19 2011
@@ -1 +1 @@
-2.20.8
+2.21.0
Modified: trunk/printer/package/yast2-printer.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/package/yast2-printer.changes (original)
+++ trunk/printer/package/yast2-printer.changes Fri Oct 7 15:17:19 2011
@@ -1,7 +1,15 @@
-------------------------------------------------------------------
+Fri Oct 7 15:11:58 CEST 2011 - jsmeix@suse.de
+
+- Added new driver "epson-inkjet-printer-escpr"
+ to the "Add Driver" dialog (bnc#722625).
+- Fixed typos in help texts (bnc#703201).
+- 2.21.0
+
+-------------------------------------------------------------------
Fri Aug 5 12:34:37 CEST 2011 - tgoettlicher@suse.de
-- fixed .desktop file (bnc #681249)
+- Removed "X-KDE-RootOnly=true" from printer.desktop (bnc#681249).
-------------------------------------------------------------------
Thu Feb 10 16:06:03 CET 2011 - jsmeix@suse.de
@@ -458,7 +466,7 @@
-------------------------------------------------------------------
Thu Apr 23 13:24:07 CEST 2009 - jsmeix@suse.de
-- When printing a testpage in the Overview dialog, explicitely
+- When printing a testpage in the Overview dialog, explicitly
show the pending print jobs so that the user can now better
decide whether or not the pending jobs could be deleted.
- Fixed serial printer setup in the Connection Wizard
Modified: trunk/printer/src/Printer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/Printer.ycp (original)
+++ trunk/printer/src/Printer.ycp Fri Oct 7 15:17:19 2011
@@ -133,7 +133,7 @@
* not the last character in the alphabet, e.g. the Estonian alphabet ends
* with ... s ... z ... t u v w ... x y (non-ASCII characters omitted here)
* so that [a-z] would exclude t u v w x y in an Estonian locale.
- * Therefore uppercase and lowercase characters are both explicitely listed
+ * Therefore uppercase and lowercase characters are both explicitly listed
* to avoid any unexpected result e.g. of "tolower(uppercase_characters)".
*/
global string number_chars = "0123456789";
@@ -750,7 +750,7 @@
{ // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
return false;
}
@@ -763,7 +763,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
// Progress last stage (progress finished):
if( Abort() ) return false;
Modified: trunk/printer/src/Printerlib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/Printerlib.ycp (original)
+++ trunk/printer/src/Printerlib.ycp Fri Oct 7 15:17:19 2011
@@ -142,7 +142,7 @@
{ y2milestone( "TestAndInstallPackage: Failed to install required package %1.", package_name );
Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name.
// Only a simple message because:
- // Either the user has explicitely rejected to install the package,
+ // Either the user has explicitly rejected to install the package,
// or this error does not happen on a normal system
// (i.e. a system which is not totally broken or totally messed up).
sformat( _("Failed to install required package %1."),
@@ -464,7 +464,7 @@
// which is even the fallback if there is no "Browsing" entry at all
// or when the "Browsing" entry is deactivated by a leading '#' character.
// Therefore browsing_on is only false if "Browsing Off" or "Browsing No"
-// is explicitely set in /etc/cups/cupsd.conf.
+// is explicitly set in /etc/cups/cupsd.conf.
global boolean cupsd_conf_browsing_on = true;
global boolean DetermineBrowsing()
Modified: trunk/printer/src/autoconfig.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/autoconfig.ycp (original)
+++ trunk/printer/src/autoconfig.ycp Fri Oct 7 15:17:19 2011
@@ -159,7 +159,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
}
if( ! Printerlib::TestAndInstallPackage( package_name, "installed" ) )
Modified: trunk/printer/src/connectionwizard.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/connectionwizard.ycp (original)
+++ trunk/printer/src/connectionwizard.ycp Fri Oct 7 15:17:19 2011
@@ -973,7 +973,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
}
// The user can also decide during the actual installation not to install it
@@ -1251,7 +1251,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
}
// The user can also decide during the actual installation not to install it
@@ -1603,7 +1603,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
}
// The user can also decide during the actual installation not to install it
@@ -1770,7 +1770,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
}
// The user can also decide during the actual installation not to install it
@@ -2889,7 +2889,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
}
}
Modified: trunk/printer/src/driveradd.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/driveradd.ycp (original)
+++ trunk/printer/src/driveradd.ycp Fri Oct 7 15:17:19 2011
@@ -55,7 +55,8 @@
boolean splix_installed = Printerlib::TestAndInstallPackage( "splix", "installed" )
|| Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" );
boolean m2300w_installed = Printerlib::TestAndInstallPackage( "m2300w", "installed" );
- y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, splix_installed, m2300w_installed );
+ boolean epson_inkjet_printer_escpr_installed = Printerlib::TestAndInstallPackage( "epson-inkjet-printer-escpr", "installed" );
+ y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' splix_installed:'%7' m2300w_installed:'%8' epson_inkjet_printer_escpr_installed:'%9'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, splix_installed, m2300w_installed , epson_inkjet_printer_escpr_installed );
term contents = `VBox
( `VStretch(),
`Left
@@ -144,12 +145,22 @@
`Left
( `CheckBox
( `id("m2300w"),
- // CheckBox to select or un-select the printer driver package manufacturer-PPDs.
+ // CheckBox to select or un-select the printer driver package m2300w.
// There is no need to have the package name "m2300w" in this text
// because it is shown in a separated column to the left of this text.
"m2300&w : " + _("Driver for Konica Minolta 2300W and 2400W (unmaintained)"),
m2300w_installed
)
+ ),
+ `Left
+ ( `CheckBox
+ ( `id("epson-inkjet-printer-escpr"),
+ // CheckBox to select or un-select the printer driver package epson-inkjet-printer-escpr.
+ // There is no need to have the package name "epson-inkjet-printer-escpr" in this text
+ // because it is shown in a separated column to the left of this text.
+ "&epson-inkjet-printer-escpr : " + _("Epson ESC/P-R Inkjet Printer Driver"),
+ epson_inkjet_printer_escpr_installed
+ )
)
)
),
@@ -232,6 +243,7 @@
boolean manufacturer_PPDs_install = (boolean)UI::QueryWidget( `id("manufacturer-PPDs"), `Value );
boolean splix_install = (boolean)UI::QueryWidget( `id("splix"), `Value );
boolean m2300w_install = (boolean)UI::QueryWidget( `id("m2300w"), `Value );
+ boolean epson_inkjet_printer_escpr_install = (boolean)UI::QueryWidget( `id("epson-inkjet-printer-escpr"), `Value );
string ppd_path_input_value = (string)UI::QueryWidget( `id("ppd_path_input"), `Value );
// Ignore an effectively empty ppd_path_input_value:
if( OpenPrintingPPDs_ghostscript_install == OpenPrintingPPDs_ghostscript_installed
@@ -242,6 +254,7 @@
&& manufacturer_PPDs_install == manufacturer_PPDs_installed
&& splix_install == splix_installed
&& m2300w_install == m2300w_installed
+ && epson_inkjet_printer_escpr_install == epson_inkjet_printer_escpr_installed
&& "" == filterchars( ppd_path_input_value, Printer::alnum_chars )
)
{ y2milestone( "Nothing changed in AddDriverDialog." );
@@ -469,6 +482,18 @@
}
}
}
+ if( epson_inkjet_printer_escpr_install != epson_inkjet_printer_escpr_installed )
+ { if( epson_inkjet_printer_escpr_install )
+ { if( Printerlib::TestAndInstallPackage( "epson-inkjet-printer-escpr", "install" ) )
+ { package_changed = true;
+ }
+ }
+ else
+ { if( Printerlib::TestAndInstallPackage( "epson-inkjet-printer-escpr", "remove" ) )
+ { package_changed = true;
+ }
+ }
+ }
// If driver packages were actually changed (the user may have rejected it),
// enforce that the BasicAddDialog and/or the BasicModifyDialog
// (only form those dialogs this AddDriverDialog can be called)
@@ -494,7 +519,7 @@
// There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp).
// Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage
// it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort"
- // so that this leftover "abort" button must be explicitely hidden here:
+ // so that this leftover "abort" button must be explicitly hidden here:
Wizard::HideAbortButton();
}
// Ignore an effectively empty ppd_path_input_value:
Modified: trunk/printer/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/helps.ycp (original)
+++ trunk/printer/src/helps.ycp Fri Oct 7 15:17:19 2011
@@ -190,7 +190,7 @@
Some driver option settings must match to your particular printer.
In particular the default paper size setting of the driver
must match to the paper which is actually loaded in your printer.
-You can either explicitely select A4 or Letter as default paper size
+You can either explicitly select A4 or Letter as default paper size
or select nothing to use the built-in default paper size of the driver
which is also the fallback if the driver neither supports A4 nor Letter
(for example a driver for a small-format photo printer).
@@ -467,7 +467,7 @@
For example if a password is actually 'Foo%20Bar' (non-percent-encoded),
it must be entered literally in the password input field in the dialog.
The automated percent-encoding results 'Foo%2520Bar' which is how
-the vaule of the password component is actually stored in the URI.<br>
+the value of the password component is actually stored in the URI.<br>
In contrast when an input field in the dialog is intended to enter
more that a single value for a single component of the URI
(e.g. a single input field for all optional parameters
@@ -707,12 +707,12 @@
to make printers available via network.<br>
In this case remote CUPS servers must publish their printers via network
and accordingly on your host the CUPS daemon process (cupsd) must run
-which is listening for incomming information about published printers.<br>
-CUPS Browsing information is recieved via UDP port 631.<br>
+which is listening for incoming information about published printers.<br>
+CUPS Browsing information is received via UDP port 631.<br>
Regarding firewall:<br>
Check if a firewall is active for a network zone
in which printers are published via network.
-By default the SuSEfirewall allows any incomming information
+By default the SuSEfirewall allows any incoming information
via a network interface which belongs to the 'internal zone'
because this zone is trusted by default.<br>
It does not make sense to do printing in a trusted internal network
@@ -738,7 +738,7 @@
_("<p>
If you can access remote CUPS servers for printing
but those servers do not publish their printer information via network
-or when you cannot accept incomming information about published printers
+or when you cannot accept incoming information about published printers
(e.g. because you must have firewall protection for the network zone
in which printers are published), you can request printer information
from CUPS servers (provided the CUPS servers allow your access).<br>
@@ -779,8 +779,8 @@
its so called 'Browsing' mode to make printers available via network.<br>
In this case CUPS servers publish their local print queues via network
and accordingly on CUPS client systems the CUPS daemon process (cupsd) must run
-which is listening for incomming information about published printers.<br>
-CUPS Browsing information is recieved via UDP port 631.
+which is listening for incoming information about published printers.<br>
+CUPS Browsing information is received via UDP port 631.
</p>") +
// SharingDialog help 2/4:
_("<p>
Modified: trunk/printer/src/printer_auto.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_auto.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/printer_auto.ycp (original)
+++ trunk/printer/src/printer_auto.ycp Fri Oct 7 15:17:19 2011
@@ -271,7 +271,7 @@
// which is only the "Printing via Network" and the "Overview" dialogs
// but without running before ReadDialog (which calls only Printer::Read)
// and running afterwards WriteDialog (which calls only Printer::Write)
- // which is the reason that Printer::Read is called explicitely above.
+ // which is the reason that Printer::Read is called explicitly above.
ret = PrinterAutoSequence();
}
/*
Modified: trunk/printer/src/printer_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/src/printer_proposal.ycp (original)
+++ trunk/printer/src/printer_proposal.ycp Fri Oct 7 15:17:19 2011
@@ -330,7 +330,7 @@
// which are all the usual dialogs (starting with the "Overview")
// but without running before ReadDialog (which calls only Printer::Read)
// and running afterwards WriteDialog (which calls only Printer::Write)
- // which is the reason that Printer::Read is called explicitely above.
+ // which is the reason that Printer::Read is called explicitly above.
symbol seq = (symbol) WFM::CallFunction("printer", [.propose]);
y2debug("seq=%1",seq);
ret = $[ "workflow_sequence" : seq ];
Modified: trunk/printer/tools/autodetect_print_queues
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_print_queues?rev=66341&r1=66340&r2=66341&view=diff
==============================================================================
--- trunk/printer/tools/autodetect_print_queues (original)
+++ trunk/printer/tools/autodetect_print_queues Fri Oct 7 15:17:19 2011
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# Johannes Meixner