diff options
| author | Didier Raboud <odyx@debian.org> | 2016-01-04 16:36:37 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2016-01-04 16:36:37 +0100 |
| commit | 25882187fdfa002088b2ac60e045dd32d37bdbb4 (patch) | |
| tree | d45b0d8abc3b50c01053f84c0e8042488dbdcaf4 | |
| parent | 301adafb300abf017b28e96038661000839c85c9 (diff) | |
Imported Upstream version 0.9.2
100 files changed, 1303 insertions, 1420 deletions
@@ -1,7 +1,45 @@ -2005-04-1 dsuffield +2005-04-15 jpitter + * models.xml: cloned HP LaserJet 4050 Series to the same thing with a trailing underscore to solve a forum issue. + +2005-04-15 dsuffield + * Release 0.9.2 + +2005-04-14 dwelch + * Fixed defect 540 ("Invalid color calibration type" error occurs when executing command "colorcal" in terminal.) + * Fixed issue reported in forum (AlignType3() number of arguments error in hp-align) + +2005-04-13 dwelch + * UI architectural change (removed hpguid.py, removed popup feature, etc) + +2005-04-13 dsuffield + * Release 0.9.1.2 + +2005-04-13 dsuffield + * Fixed a scanning issue with Laserjet flatbed scanners (PML scanners). Scan would fail at end of scan. + * Added hpijs 5 limit syslog message when output device write() fails. + * Removed specified gcc options in hpijs configure.in. + * Removed images.tgz after install. + +2005-04-12 dsuffield + * Release 0.9.1.1 + +2005-04-12 dwelch + * Fixed defect 533 (All function buttons are grayed out when toolbox is launched at the first time.) + * Fixed defect that caused DJ450 battery check to fail + +2005-04-01 jpitter + * added new entries for PSC 750xi, CP1700, and OfficeJet 5110 in models.xml fixing issues 572 and 555. + * added new entries for new products HP LaserJet 4240, HP LaserJet 9040, HP Color LaserJet 4610, HP Business Inkjet 1000, and HP LaserJet 1022 in models.xml. + * added HP-LaserJet_4240.xml, HP-LaserJet_9040.xml, HP-Color_LaserJet_4610.xml, HP-Business_Inkjet_1000.xml, and HP-LaserJet_1022.xml to the stable branch of foomatic-db. + * added HP-LaserJet_4240, HP-LaserJet_9040, and HP-Color_LaserJet_4610 to Postscript.xml on foomatic-db stable. + +2005-04-01 dwelch + * Fixed defect 507 (Toolbox does not launch with PyQt 3.14-1mdk). All .py files produced by compiling .ui files with pyuic have been updated to fix the QSizePolicy() problem. + +2005-04-01 dsuffield * Release 0.9.1 -2005-04-1 dsuffield +2005-04-01 dsuffield * Added toobox *.ui files to package. 2005-04-01 dwelch @@ -15,7 +53,7 @@ 2005-03-31 dsuffield * Fixed gcc warnings specified by Henrique de Moraes Holeschuh (debian). - + 2005-03-31 jpitter * PS PPDs HP_LaserJet_4240.ppd, HP_LaserJet_9040.ppd, and hp_color_LaserJet_4610.ppd scp'd to linuxprinting.org download. * updated foomatic-db/driver/Postscript.xml to include HP-LaserJet_4240, HP-LaserJet_9040, and HP-Color_LaserJet_4610 in tip. diff --git a/Makefile.am b/Makefile.am index 79c65de13..04aaa88b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ docdir = $(datadir)/doc/$(distdir) doc_DATA = hplip_readme.html hplip_overview.png COPYING dist_hplip_DATA = $(doc_DATA) hplip.conf -dist_hplip_SCRIPTS = hpguid.py hpssd.py __init__.py hplip.sh +dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh cmddir = $(hplipdir) dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py photo.py unload.py probe.py rpu.py testpage.py makeuri.py check.py @@ -100,7 +100,7 @@ libsane_hpaio_la_LIBADD = libhpip.la # ui uidir = $(hplipdir)/ui dist_ui_SCRIPTS = ui/alignform.py \ - ui/colorcalform_base.py ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py ui/devmgr4_base.py ui/devmgr4.py ui/form1.py \ + ui/colorcalform_base.py ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py ui/devmgr4_base.py ui/devmgr4.py \ ui/__init__.py ui/loadpaperform_base.py ui/loadpaperform.py \ ui/paperedgealignform_base.py ui/paperedgealignform.py \ ui/settingsdialog_base.py ui/settingsdialog.py ui/aligntype6form1.py ui/aligntype6form1_base.py ui/aligntype6form2_base.py \ @@ -110,7 +110,7 @@ dist_ui_SCRIPTS = ui/alignform.py \ ui/cleaningform2_base.py ui/cleaningform2.py ui/colorcalform2_base.py ui/colorcalform2.py dist_noinst_DATA = ui/unloadform_base.ui ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \ - ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/form1.ui ui/aligntype6form2_base.ui \ + ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \ ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \ ui/cleaningform2_base.ui ui/waitform_base.ui ui/coloradjform_base.ui @@ -138,7 +138,7 @@ install-exec-hook: fi install-data-hook: - cd $(DESTDIR)$(imagesdir); tar xzvf images.tgz + cd $(DESTDIR)$(imagesdir); tar xzvf images.tgz; rm -f images.tgz if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \ echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \ echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \ diff --git a/Makefile.in b/Makefile.in index d3c1ba3b4..89ec536f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -282,7 +282,7 @@ hplipdir = $(datadir)/hplip docdir = $(datadir)/doc/$(distdir) doc_DATA = hplip_readme.html hplip_overview.png COPYING dist_hplip_DATA = $(doc_DATA) hplip.conf -dist_hplip_SCRIPTS = hpguid.py hpssd.py __init__.py hplip.sh +dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh cmddir = $(hplipdir) dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py photo.py unload.py probe.py rpu.py testpage.py makeuri.py check.py @@ -369,7 +369,7 @@ libsane_hpaio_la_LIBADD = libhpip.la # ui uidir = $(hplipdir)/ui dist_ui_SCRIPTS = ui/alignform.py \ - ui/colorcalform_base.py ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py ui/devmgr4_base.py ui/devmgr4.py ui/form1.py \ + ui/colorcalform_base.py ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py ui/devmgr4_base.py ui/devmgr4.py \ ui/__init__.py ui/loadpaperform_base.py ui/loadpaperform.py \ ui/paperedgealignform_base.py ui/paperedgealignform.py \ ui/settingsdialog_base.py ui/settingsdialog.py ui/aligntype6form1.py ui/aligntype6form1_base.py ui/aligntype6form2_base.py \ @@ -379,7 +379,7 @@ dist_ui_SCRIPTS = ui/alignform.py \ ui/cleaningform2_base.py ui/cleaningform2.py ui/colorcalform2_base.py ui/colorcalform2.py dist_noinst_DATA = ui/unloadform_base.ui ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \ - ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/form1.ui ui/aligntype6form2_base.ui \ + ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \ ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \ ui/cleaningform2_base.ui ui/waitform_base.ui ui/coloradjform_base.ui @@ -1693,7 +1693,7 @@ install-exec-hook: fi install-data-hook: - cd $(DESTDIR)$(imagesdir); tar xzvf images.tgz + cd $(DESTDIR)$(imagesdir); tar xzvf images.tgz; rm -f images.tgz if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \ echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \ echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \ @@ -1,7 +1,7 @@ #!/usr/bin/env python # -# $Revision: 1.20 $ -# $Date: 2005/03/21 17:38:49 $ +# $Revision: 1.21 $ +# $Date: 2005/04/14 17:01:49 $ # $Author: dwelch $ # # (c) Copyright 2003-2005 Hewlett-Packard Development Company, L.P. @@ -263,7 +263,7 @@ try: maint.AlignType2( d, loadPlainPaper, enterAlignmentNumber, bothPensRequired, update_spinner ) elif align_type == 3: # 9xx (Thriftway/Subway) - maint.AlignType3( d, loadPlainPaper, enterAlignmentNumber, enterPaperEdge, update_spinner ) + maint.AlignType3( d, loadPlainPaper, enterAlignmentNumber, enterPaperEdge, update_spinner, align_type ) elif align_type == 6: # LIDIL Auto (Homer) maint.AlignType6( d, aioUI1, aioUI2, loadPlainPaper ) diff --git a/base/service.py b/base/service.py index 2e3b6ea28..4a507dd4c 100644 --- a/base/service.py +++ b/base/service.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -# $Revision: 1.25 $ -# $Date: 2005/03/18 22:44:31 $ +# $Revision: 1.26 $ +# $Date: 2005/04/13 21:16:21 $ # $Author: dwelch $ # @@ -250,14 +250,13 @@ class Service: return result - def setAlerts( self, popup_alerts, email_alerts, email_address, smtp_server ): + def setAlerts( self, email_alerts, email_address, smtp_server ): fields, data = msg.xmitMessage( self.hpssd_sock, "SetAlerts", None, { 'username' : prop.username, - 'popup-alerts' : popup_alerts, 'email-alerts' : email_alerts, 'email-address' : email_address, 'smtp-server' : smtp_server, diff --git a/base/status.py b/base/status.py index 2d2d40273..d24b7f294 100644 --- a/base/status.py +++ b/base/status.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -# $Revision: 1.28 $ -# $Date: 2005/03/30 18:11:34 $ +# $Revision: 1.30 $ +# $Date: 2005/04/12 18:30:19 $ # $Author: dwelch $ # # (c) Copyright 2003-2004 Hewlett-Packard Development Company, L.P. @@ -615,7 +615,8 @@ def BatteryCheck( dev, status_block, io_control ): for x in BATTERY_PML_TRIGGER_MAP: if x[0] >= battery_level > x[1]: - battery_trigger_level = BATTERY_TRIGGER_MAP[ x ] + battery_trigger_level = BATTERY_PML_TRIGGER_MAP[ x ] + break if power_mode & pml.POWER_MODE_CHARGING: agent_health = AGENT_HEALTH_CHARGING diff --git a/colorcal.py b/colorcal.py index 9fde6d140..106be1d16 100755 --- a/colorcal.py +++ b/colorcal.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -# $Revision: 1.12 $ -# $Date: 2005/03/22 19:49:44 $ +# $Revision: 1.13 $ +# $Date: 2005/04/14 17:45:32 $ # $Author: dwelch $ # # (c) Copyright 2003-2004 Hewlett-Packard Development Company, L.P. @@ -63,7 +63,7 @@ def usage(): """ 2. If -p* is specified, the default CUPS printer will be used.\n""" ) -def enterNumber( letter, text, minimum, maximum ): +def enterNumber( text, minimum, maximum ): while True: x = raw_input( utils.bold( text ) ) try: @@ -1804,7 +1804,7 @@ fi # Define the identity of the package. PACKAGE=hplip - VERSION=0.9.1 + VERSION=0.9.2 cat >>confdefs.h <<_ACEOF diff --git a/configure.in b/configure.in index 06c94db2b..501217a13 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ # AC_INIT(io/hpiod/hpiod.cpp) -AM_INIT_AUTOMAKE(hplip, 0.9.1) +AM_INIT_AUTOMAKE(hplip, 0.9.2) AC_DISABLE_STATIC AC_PROG_LIBTOOL #AC_PROG_MAKE_SET diff --git a/data/images/images.tgz b/data/images/images.tgz Binary files differindex 0c41c0619..be3f87104 100644 --- a/data/images/images.tgz +++ b/data/images/images.tgz diff --git a/data/xml/models.xml b/data/xml/models.xml index 4920dc934..c63dc8f15 100644 --- a/data/xml/models.xml +++ b/data/xml/models.xml @@ -24,7 +24,7 @@ NOTICE: This file automatically generated by model_editor.py. Please do not hand edit this file. -Last written on Fri, 01 Apr 2005 11:47:04 by root +Last written on Fri, 15 Apr 2005 09:50:38 by pitter using model_editor version 3.1. --> @@ -1827,6 +1827,26 @@ using model_editor version 3.1. </r0> </model> +<model name="HP_LaserJet_4050_Series_"> + <id>MANUFACTURER:Hewlett-Packard;COMMAND SET:PJL,MLC,PCL,PCLXL,POSTSCRIPT;MODEL:HP LaserJet 4050 Series;CLASS:PRINTER;DESCRIPTION:Hewlett-Packard LaserJet 4050 Series</id> + <io mode="mlc"/> + <io control="gusher"/> + <align type="0"/> + <clean type="0"/> + <color-cal type="0"/> + <status type="3"/> + <scan type="0"/> + <fax type="0"/> + <pcard type="0"/> + <copy type="0"/> + <tech type="3"/> + <embedded-server type="0"/> + <panel-check type="1"/> + <r0> + <agent1 kind="4" type="1" sku="C4127A/C4127X"/> + </r0> +</model> + <model name="HP_LaserJet_4100_MFP"> <id>MFG:Hewlett-Packard;CMD:PJL,MLC,POSTSCRIPT,PCLXL,PJL,PCL;1284.4DL:4d,4e,1;MDL:HP LaserJet 4100 MFP ;CLS:PRINTER;DES:Hewlett-Packard LaserJet 4100 MFP</id> <io mode="mlc"/> @@ -2376,6 +2396,27 @@ using model_editor version 3.1. </r0> </model> +<model name="OfficeJet_K60xi"> + <id></id> + <io mode="mlc"/> + <io control="gusher"/> + <align type="1"/> + <clean type="1"/> + <color-cal type="0"/> + <status type="2"/> + <scan type="1"/> + <fax type="1"/> + <pcard type="0"/> + <copy type="0"/> + <tech type="2"/> + <embedded-server type="0"/> + <panel-check type="1"/> + <r0> + <agent1 kind="3" type="1" sku="45 (51645A)"/> + <agent2 kind="3" type="2" sku="78 (C6578AN/C6578DN)"/> + </r0> +</model> + <model name="OfficeJet__K60"> <id></id> <io mode="mlc"/> @@ -2721,8 +2762,8 @@ using model_editor version 3.1. </r0> </model> -<model name="PHOTOSMART_1000"> - <id></id> +<model name="PHOTOSMART_1115"> + <id>MFG:HP;MDL:PHOTOSMART 1115;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;CLS:PRINTER;DES:hp photosmart 1115;SN:MY17K140JS0V;S:00800880800010002C1100064C2080064;P:0800,FL,B0;J: ;</id> <io mode="raw"/> <io control="gusher"/> <align type="1"/> @@ -2742,8 +2783,8 @@ using model_editor version 3.1. </r0> </model> -<model name="PHOTOSMART_1115"> - <id>MFG:HP;MDL:PHOTOSMART 1115;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;CLS:PRINTER;DES:hp photosmart 1115;SN:MY17K140JS0V;S:00800880800010002C1100064C2080064;P:0800,FL,B0;J: ;</id> +<model name="PHOTOSMART_1215"> + <id>MFG:HP;MDL:PHOTOSMART 1215;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;CLS:PRINTER;DES:hp photosmart 1215;SN:MY06L1200QOS;S:00800880800010002C1100063C208004A;P:0800,FL,B0;J: ;</id> <io mode="raw"/> <io control="gusher"/> <align type="1"/> @@ -2763,8 +2804,8 @@ using model_editor version 3.1. </r0> </model> -<model name="PHOTOSMART_1215"> - <id>MFG:HP;MDL:PHOTOSMART 1215;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;CLS:PRINTER;DES:hp photosmart 1215;SN:MY06L1200QOS;S:00800880800010002C1100063C208004A;P:0800,FL,B0;J: ;</id> +<model name="PHOTOSMART_1218"> + <id>MFG:HP;MDL:PHOTOSMART 1218;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;CLS:PRINTER;DES:hp photosmart 1218;SN:MY096121C3OU;S:00800880800010002C1100062C2080063;P:0800,FL,B0;J: ;</id> <io mode="raw"/> <io control="gusher"/> <align type="1"/> @@ -2784,8 +2825,8 @@ using model_editor version 3.1. </r0> </model> -<model name="PHOTOSMART_1218"> - <id>MFG:HP;MDL:PHOTOSMART 1218;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;CLS:PRINTER;DES:hp photosmart 1218;SN:MY096121C3OU;S:00800880800010002C1100062C2080063;P:0800,FL,B0;J: ;</id> +<model name="PHOTOSMART_130"> + <id>MFG:HP;MDL:PHOTOSMART 130;CMD:MLC,PCL,PML,DW-PCL;CLS:PRINTER;DES:hp photosmart 130;SN:TH31A430472G;S:0300008000001000001C2500060;J: ;</id> <io mode="raw"/> <io control="gusher"/> <align type="1"/> @@ -2800,13 +2841,12 @@ using model_editor version 3.1. <embedded-server type="0"/> <panel-check type="0"/> <r0> - <agent1 kind="3" type="1" sku="45 (51645A)"/> - <agent2 kind="3" type="2" sku="78 (C6578DN/C6578AN)"/> + <agent1 kind="3" type="2" sku="57 (C6657AN)"/> </r0> </model> -<model name="PHOTOSMART_130"> - <id>MFG:HP;MDL:PHOTOSMART 130;CMD:MLC,PCL,PML,DW-PCL;CLS:PRINTER;DES:hp photosmart 130;SN:TH31A430472G;S:0300008000001000001C2500060;J: ;</id> +<model name="PHOTOSMART_1315"> + <id></id> <io mode="raw"/> <io control="gusher"/> <align type="1"/> @@ -2821,12 +2861,13 @@ using model_editor version 3.1. <embedded-server type="0"/> <panel-check type="0"/> <r0> - <agent1 kind="3" type="1" sku="57 (C6657AN)"/> + <agent1 kind="3" type="1" sku="45 (51645A)"/> + <agent2 kind="3" type="2" sku="78 (C6578DN/C6578AN)"/> </r0> </model> -<model name="PHOTOSMART_1315"> - <id></id> +<model name="PHOTOSMART_230"> + <id>MFG:HP;MDL:PHOTOSMART 230;CMD:MLC,PCL,PML,DW-PCL;CLS:PRINTER;DES:hp photosmart 230;SN:TH26H1304G5D;S:0300008080001010001c2500060;J: ;</id> <io mode="raw"/> <io control="gusher"/> <align type="1"/> @@ -2841,13 +2882,12 @@ using model_editor version 3.1. <embedded-server type="0"/> <panel-check type="0"/> <r0> - <agent1 kind="3" type="1" sku="45 (51645A)"/> - <agent2 kind="3" type="2" sku="78 (C6578DN/C6578AN)"/> + <agent1 kind="3" type="2" sku="57 (C6657AN)"/> </r0> </model> -<model name="PHOTOSMART_230"> - <id>MFG:HP;MDL:PHOTOSMART 230;CMD:MLC,PCL,PML,DW-PCL;CLS:PRINTER;DES:hp photosmart 230;SN:TH26H1304G5D;S:0300008080001010001c2500060;J: ;</id> +<model name="PHOTOSMART_P1000"> + <id>MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;CMD:MLC,PCL,PML;CLASS:PRINTER;DESCRIPTION:Hewlett-Packard PhotoSmart P1000;SERN:ES07V170VBHP;VSTATUS:$HB0$NC0,ff,DN,IDLE,CUT,K0,C0,SM,NR,KP069,CP098;VP:0800,FL,B0;VJ: ;</id> <io mode="raw"/> <io control="gusher"/> <align type="1"/> @@ -2862,7 +2902,8 @@ using model_editor version 3.1. <embedded-server type="0"/> <panel-check type="0"/> <r0> - <agent1 kind="3" type="1" sku="57 (C6657AN)"/> + <agent1 kind="3" type="1" sku="45 (51645A)"/> + <agent2 kind="3" type="2" sku="78 (C6578DN/C6578AN)"/> </r0> </model> @@ -3322,35 +3363,35 @@ using model_editor version 3.1. <embedded-server type="0"/> <panel-check type="0"/> <r0> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r0> <r1> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r1> <r2> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r2> <r3> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r3> <r4> - <agent1 kind="3" type="2" sku="343"/> + <agent1 kind="3" type="2" sku="344/343"/> <agent2 kind="3" type="10" sku="100"/> </r4> <r5> - <agent1 kind="3" type="2" sku="135"/> + <agent1 kind="3" type="2" sku="134/135"/> <agent2 kind="3" type="10" sku="100"/> </r5> <r6> - <agent1 kind="3" type="2" sku="135"/> + <agent1 kind="3" type="2" sku="134/135"/> <agent2 kind="3" type="10" sku="100"/> </r6> <r7> - <agent1 kind="3" type="2" sku="855"/> + <agent1 kind="3" type="2" sku="857/855"/> <agent2 kind="3" type="10" sku="100"/> </r7> <r type="1"/> @@ -3372,35 +3413,35 @@ using model_editor version 3.1. <embedded-server type="0"/> <panel-check type="0"/> <r0> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r0> <r1> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r1> <r2> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r2> <r3> - <agent1 kind="3" type="2" sku="95"/> + <agent1 kind="3" type="2" sku="95/97"/> <agent2 kind="3" type="10" sku="100"/> </r3> <r4> - <agent1 kind="3" type="2" sku="343"/> + <agent1 kind="3" type="2" sku="344/343"/> <agent2 kind="3" type="10" sku="100"/> </r4> <r5> - <agent1 kind="3" type="2" sku="135"/> + <agent1 kind="3" type="2" sku="134/135"/> <agent2 kind="3" type="10" sku="100"/> </r5> <r6> - <agent1 kind="3" type="2" sku="135"/> + <agent1 kind="3" type="2" sku="134/135"/> <agent2 kind="3" type="10" sku="100"/> </r6> <r7> - <agent1 kind="3" type="2" sku="855"/> + <agent1 kind="3" type="2" sku="857/855"/> <agent2 kind="3" type="10" sku="100"/> </r7> <r type="1"/> diff --git a/hpguid.py b/hpguid.py deleted file mode 100755 index 6d4af5304..000000000 --- a/hpguid.py +++ /dev/null @@ -1,512 +0,0 @@ -#!/usr/bin/env python -# -# $Revision: 1.25 $ -# $Date: 2005/03/14 22:51:33 $ -# $Author: dwelch $ -# -# (c) Copyright 2003-2004 Hewlett-Packard Development Company, L.P. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Don Welch -# -# Thanks to Henrique M. Holschuh <hmh@debian.org> for various security patches -# - -_VERSION = '3.0' - -# Std Lib -import sys -import socket -import os, os.path -import getopt -import signal -import atexit -import ConfigParser - -# Local -from base.g import * -import base.async_qt as async -import base.utils as utils -from base.msg import * -import base.service as service - -app = None -services = None -server = None -main_widget = None -toolbox = None - - -# PyQt -try: - from qt import * -except ImportError: - log.error( "PyQt not installed. GUI not available. Exiting." ) - sys.exit(0) - -# check version of Qt -qtMajor = int( qVersion().split('.')[0] ) - -if qtMajor < MINIMUM_QT_MAJOR_VER: - - log.error( "Incorrect version of Qt installed. Ver. 3.0.0 or greater required.") - sys.exit(0) - -#check version of PyQt -try: - pyqtVersion = PYQT_VERSION_STR -except: - pyqtVersion = PYQT_VERSION - -while pyqtVersion.count('.') < 2: - pyqtVersion += '.0' - -(maj_ver, min_ver, pat_ver) = pyqtVersion.split('.') - -if pyqtVersion.find( 'snapshot' ) >= 0: - log.warning( "A non-stable snapshot version of PyQt is installed.") -else: - try: - maj_ver = int(maj_ver) - min_ver = int(min_ver) - pat_ver = int(pat_ver) - except ValueError: - maj_ver, min_ver, pat_ver = 0, 0, 0 - - if maj_ver < MINIMUM_PYQT_MAJOR_VER or \ - (maj_ver == MINIMUM_PYQT_MAJOR_VER and min_ver < MINIMUM_PYQT_MINOR_VER): - log.error( "This program may not function properly with the version of PyQt that is installed (%d.%d.%d)." % (maj_ver, min_ver, pat_ver) ) - log.error( "Incorrect version of pyQt installed. Ver. %d.%d or greater required." % ( MINIMUM_PYQT_MAJOR_VER, MINIMUM_PYQT_MINOR_VER ) ) - - - - -# UI Forms -from ui.form1 import Form1 -from ui.devmgr4 import devmgr4 - -def _showToolbox( show=True, raiseup=True, initial_device_uri=None ): - global toolbox - if show: - if not prop.toolbox_ui_active: - log.debug( "Creating toolbox UI" ) - toolbox = devmgr4( initial_device_uri ) - prop.toolbox_ui_active = True - - if raiseup: - log.debug( "Showing toolbox" ) - toolbox.show() - toolbox.setActiveWindow() - toolbox.raiseW() - else: - if prop.toolbox_ui_active: - log.debug( "Hiding toolbox" ) - toolbox.hide() - -def usage(): - formatter = utils.TextFormatter( - ( - {'width': 38, 'margin' : 2}, - {'width': 38, 'margin' : 2}, - ) - ) - - log.info( utils.TextFormatter.bold( """\nUsage: hpguid.py [OPTIONS]\n\n""" ) ) - - log.info( formatter.compose( ( utils.TextFormatter.bold("[OPTIONS]"), "" ) ) ) - - log.info( formatter.compose( ( "Set the logging level:", "-l<level> or --logging=<level>" ) ) ) - log.info( formatter.compose( ( "", "<level>: none, info*, error, warn, debug (*default)" ) ) ) - log.info( formatter.compose( ( "Do not daemonize:", "-x" ) ) ) - log.info( formatter.compose( ( "This help information:", "-h or --help" ), True ) ) - - - - -class hpguid_server( async.dispatcher ): - - def __init__( self, ip ): - self.ip = ip - self.port = socket.htons(0) - async.dispatcher.__init__( self ) - self.create_socket( socket.AF_INET, socket.SOCK_STREAM ) - self.set_reuse_addr() - try: - self.bind( ( ip, self.port ) ) - except socket.error,e: - log.fatal( "Unable to address to socket: %s" % e[1] ) - raise Error - self.port = self.socket.getsockname()[1] - prop.hpguid_port = self.port - self.listen( 5 ) - - - def writable( self ): - return False - - def readable( self ): - return self.accepting - - def handle_accept( self ): - try: - conn, addr = self.accept() - except socket.error: - log.error( "Socket error on accept()" ) - return - except TypeError: - log.error( "EWOULDBLOCK exception on accept()" ) - return - handler = hpguid_handler( conn, addr, self ) - - def __str__( self ): - return "<hpssd_server listening on %s:%d (fd=%d)>" % \ - ( self.ip, self.port, self._fileno ) - - def handle_close( self ): - async.dispatcher.handle_close( self ) - - - - -# This handler takes care of all conversations with -# clients when hpguid is acting as a server. -# This dispatcher receives requests messages and -# and replies with result messages. It does not -# initiate sending requests. -class hpguid_handler( async.dispatcher ): - - def __init__( self, conn, addr, the_server ): - async.dispatcher.__init__( self, sock=conn ) - self.addr = addr - self.in_buffer = "" - self.out_buffer = "" - self.server = the_server - self.fields = {} - self.data = '' - self.error_dialog = None - self.toolbox_active = False - self.signal_exit = False - - # handlers for all the messages we expect to receive - self.handlers = { - 'eventgui' : self.handle_eventgui, - ##'showguievent' : self.handleguievent, - 'unknown' : self.handle_unknown, - 'exitguievent' : self.handle_exitguievent, - } - - def __str__( self ): - return "<hpssd_handler connected to %s (fd=%d)>" % \ - ( self.addr, self._fileno ) - - def handle_read( self ): - log.debug( "Reading data on channel (%d)" % self._fileno ) - self.in_buffer = self.recv( prop.max_message_len ) - - if self.in_buffer == '': - return False - - try: - self.fields, self.data = parseMessage( self.in_buffer ) - except Error, e: - log.debug( repr(self.in_buffer) ) - log.warn( "Message parsing error: %s (%d)" % ( e.opt, e.msg ) ) - self.out_buffer = self.handle_unknown() - log.debug( self.out_buffer ) - return True - - msg_type = self.fields.get( 'msg', 'unknown' ) - log.debug( "%s %s %s" % ("*"*40, msg_type, "*"*40 ) ) - log.debug( repr( self.in_buffer ) ) - - try: - self.out_buffer = self.handlers.get( msg_type, self.handle_unknown )() - except Error: - log.error( "Unhandled exception during processing" ) - - if len( self.out_buffer ): # data is ready for send - self.sock_write_notifier.setEnabled( True ) - - return True - - def handle_write( self ): - if not len(self.out_buffer): - return - - log.debug( "Sending data on channel (%d)" % self._fileno ) - log.debug( repr( self.out_buffer ) ) - try: - sent = self.send( self.out_buffer ) - except: - log.error( "send() failed." ) - - self.out_buffer = self.out_buffer[ sent: ] - - - def writable( self ): - return not ( ( len( self.out_buffer ) == 0 ) - and self.connected ) - - - def handle_exitguievent( self ): - self.signal_exit = True - if self.signal_exit: - if toolbox is not None: - toolbox.close() - main_widget.close() - qApp.quit() - - - return '' - - - # EVENT - def handle_eventgui( self ): - global toolbox - #try: - #if 1: - try: - job_id = self.fields[ 'job-id' ] - event_code = self.fields[ 'event-code' ] - event_type = self.fields[ 'event-type' ] - retry_timeout = self.fields[ 'retry-timeout' ] - popup = self.fields[ 'popup' ] - lines = self.data.splitlines() - error_string_short, error_string_long = lines[0], lines[1] - device_uri = self.fields[ 'device-uri' ] - - log.debug( "Event: %d '%s'" % ( event_code, event_type ) ) - toolbox_was_active = prop.toolbox_ui_active - - if event_type == 'event': - if event_code == EVENT_UI_SHOW_TOOLBOX: - _showToolbox( True, True ) - toolbox.EventUI( EVENT_UI_SHOW_TOOLBOX, 'event', '', '', 0, 0, '' ) - - elif event_code == EVENT_UI_HIDE_TOOLBOX: - _showToolbox( False, False ) - - else: - _showToolbox( True, False, device_uri ) - if toolbox_was_active: - toolbox.EventUI( event_code, event_type, error_string_short, - error_string_long, retry_timeout, job_id, - device_uri ) - - else: - _showToolbox( True, popup, device_uri ) # error, warning, fatal - if toolbox_was_active: - toolbox.EventUI( event_code, event_type, error_string_short, - error_string_long, retry_timeout, job_id, - device_uri ) - except: - utils.log_exception() - #finally: - #if 1: - return '' - - def handle_unknown( self ): - return buildResultMessage( 'MessageError', None, ERROR_INVALID_MSG_TYPE ) - - def handle_messageerror( self ): - return '' - - def handle_close( self ): - log.debug( "closing channel (%d)" % self._fileno ) - self.connected = False - async.dispatcher.close( self ) - - -def registerGUI(): - try: - services.registerGUI( prop.username, prop.hpguid_host, prop.hpguid_port, os.getpid() ) - except Error, e: - log.error( "Register GUI failed (code=%d). Exiting. " % e.opt ) - sys.exit(0) - -def unregisterGUI(): - try: - services.unregisterGUI( prop.username, os.getpid() ) - except Error, e: - log.error( "UnRegister GUI failed (code=%d). " % e.opt ) - - -def handleEXIT(): - try: - toolbox.Cleanup() - except: - pass - - if services is not None: - try: - unregisterGUI() - services.close() - except: - pass - - - if server is not None: - try: - server.close() - except: - pass - - try: - app.quit() - except: - pass - - sys.exit(0) - - - -def main( args ): - prop.prog = sys.argv[0] - prop.daemonize = True - log.set_module( 'hpguid' ) - - utils.log_title( 'GUI Daemon', _VERSION ) - - try: - opts, args = getopt.getopt( sys.argv[1:], 'l:hx', [ 'level=', 'help' ] ) - - except getopt.GetoptError: - usage() - sys.exit(1) - - for o, a in opts: - - if o in ( '-l', '--logging' ): - log_level = a.lower().strip() - log.set_level( log_level ) - - elif o in ( '-h', '--help' ): - usage() - sys.exit(1) - - elif o in ( '-x', ): - prop.daemonize = False - - - if prop.daemonize: - utils.daemonize() - - # Security: Do *not* create files that other users can muck - # around with - os.umask ( 0077 ) - - # hpguid server dispatcher object - global server - try: - server = hpguid_server( prop.hpguid_host ) - ##log.debug( str( server ) ) - except Error: - log.error( "Unable to create server object." ) - sys.exit( 0 ) - - log.info( "Listening on %s port %d" % ( prop.hpguid_host, prop.hpguid_port ) ) - - # create the main application object - global app - app = QApplication( sys.argv ) - - global main_widget - main_widget = Form1() - app.setMainWidget( main_widget ) - - prop.toolbox_ui_active = False - - global services - try: - services = service.Service() - except Error: - log.error( "Unable to contact services daemon. Exiting." ) - sys.exit(0) - - registerGUI() - - pid = os.getpid() - log.debug( 'pid=%d' % pid ) - - if log.get_level() == log.LOG_LEVEL_DEBUG: - main_widget.show() - QObject.connect( app, SIGNAL( "lastWindowClosed()" ), app, SLOT( "quit()" ) ) - # Restore Ctrl-C so app can be exited from terminal - signal.signal(signal.SIGINT, signal.SIG_DFL) - - atexit.register( handleEXIT ) - signal.signal( signal.SIGPIPE, signal.SIG_IGN ) - - user_config = os.path.expanduser( '~/.hplip.conf' ) - loc = None - - if os.path.exists( user_config ): - # user_config contains executables we will run, so we - # must make sure it is a safe file, and refuse to run - # otherwise. - if not utils.path_exists_safely( user_config ): - log.warning( "File %s has insecure permissions! File ignored." % user_config ) - else: - config = ConfigParser.ConfigParser() - config.read( user_config ) - - if config.has_section( "ui" ): - loc = config.get( "ui", "loc" ) - - if not loc: - loc = None - - if loc is not None: - - if loc.lower() == 'system': - loc = str(QTextCodec.locale()) - - if loc.lower() != 'c': - - log.debug( "Trying to load .qm file for %s locale." % loc ) - - dirs = [ prop.home_dir, prop.data_dir, prop.i18n_dir ] - - trans = QTranslator(None) - - for dir in dirs: - qm_file = 'hplip_%s' % loc - loaded = trans.load( qm_file, dir) - - if loaded: - app.installTranslator( trans ) - break - else: - loc = None - - if loc is None: - log.debug( "Using default 'C' locale" ) - else: - log.debug( "Using locale: %s" % loc ) - - try: - log.debug( "Starting GUI loop..." ) - app.exec_loop() - except KeyboardInterrupt: - pass - except: - utils.log_exception() - - handleEXIT() - -if __name__ == "__main__": - sys.exit( main( sys.argv[1:] ) ) - diff --git a/hplip_readme.html b/hplip_readme.html index c679a2134..b56704a74 100644 --- a/hplip_readme.html +++ b/hplip_readme.html @@ -2631,7 +2631,7 @@ chkconfig or install_initd for HPLIP startup/shutdown script. <td height=17 style='height:12.75pt'>BIJ 1000</td> <td>YES</td> <td>YES</td> - <td>DJGenericxxVIP</td> + <td>DJGenericVIP</td> <td>NO</td> <td>NO</td> <td>NO</td> @@ -3750,6 +3750,24 @@ chkconfig or install_initd for HPLIP startup/shutdown script. <H2><a name="Updates"></a>5 Updates</H2> <ul> <li> +<b>HPLIP 0.9.2</b> - This release has the following changes. +<pre> + 1. Fixed "Invalid color calibration type" error occurs when executing command "colorcal" in terminal. + 2. Fixed issue reported in forum (AlignType3() number of arguments error in hp-align). + 3. Made UI architectural change (removed hpguid.py, removed popup feature, etc). + 4. Fixed a scanning issue with Laserjet flatbed scanners (PML scanners). Scan would fail at end of scan. + 5. Removed images.tgz after install. + 6. Fixed a problem when all function buttons are grayed out when toolbox is launched at the first time. + 7. Fixed DJ450 battery check issue. + 8. Fixed issue when Toolbox does not launch with PyQt 3.14-1mdk. All .py files produced by compiling .ui files with pyuic have been updated to fix the QSizePolicy() problem. + 9. Added new print mode "FastDraft Grayscale" to DJGenericVIP. + 10. Rebuilt PPD files with new "FastDraft Grayscale" support. + 11. Put limit (max=5) on syslog messages when output device write() fails (Debian request). + 12. Removed specified gcc options in hpijs configure.in (Debian request). + 13. Fixed a 64-bit compile issue in ljjetready.cpp. +</pre> +<p> +<li> <b>HPLIP 0.9.1</b> - This release has the following changes. <pre> 1. Changed configure to check for libnetsnmp instead of libsnmp. @@ -3993,7 +4011,7 @@ See your distribution about spooler questions. For latest information and detail <font size=2> <a href="mailto:david_suffield@hp.com">David Suffield</a><br> © 2004-2005 Hewlett-Packard Company<br> -HPLIP 0.9.1, last updated April 1, 2005 +HPLIP 0.9.2, last updated April 15, 2005 </font> </BODY> </HTML> @@ -1,8 +1,8 @@ #!/usr/bin/env python # -# $Revision: 1.75 $ -# $Date: 2005/03/29 21:06:48 $ +# $Revision: 1.76 $ +# $Date: 2005/04/13 21:16:07 $ # $Author: dwelch $ # @@ -27,10 +27,10 @@ # Thanks to Henrique M. Holschuh <hmh@debian.org> for various security patches # -# Remove in 2.3 +# Remove in 2.3? from __future__ import generators -_VERSION = '4.1' +_VERSION = '4.2' # Std Lib import sys @@ -136,7 +136,6 @@ class hpssd_handler( async.dispatcher ): 'setalerts' : self.handle_setalerts, 'testemail' : self.handle_test_email, - #'getalerts' : self.handle_getalerts, 'getgui' : self.handle_getgui, 'devicequery' : self.handle_device_query, @@ -346,12 +345,11 @@ class hpssd_handler( async.dispatcher ): email_alerts = self.fields.get( 'email-alerts', False ) email_address = self.fields.get( 'email-address', '' ) smtp_server = self.fields.get( 'smtp-server', '' ) - popup_alerts = self.fields.get( 'popup-alerts', True ) database.alerts[ username ] = { 'email-alerts' : email_alerts, 'email-address' : email_address, 'smtp-server' : smtp_server, - 'popup-alerts' : popup_alerts } + } return buildResultMessage( 'SetAlertsResult', None, result_code ) @@ -436,7 +434,6 @@ class hpssd_handler( async.dispatcher ): username = self.fields[ 'username' ] server_pass = self.fields[ 'server-pass' ] from_address = '@localhost.com' - #log.debug( "######## HOST: %s" % from_address ) try: if username and server_pass: @@ -494,7 +491,6 @@ class hpssd_handler( async.dispatcher ): try: payload = database.queryStrings( string_id ) except Error: - #utils.log_exception() log.error( "String query failed for id %s" % string_id ) payload = None result_code = ERROR_STRING_QUERY_FAILED @@ -516,115 +512,107 @@ class hpssd_handler( async.dispatcher ): # EVENT def handle_event( self ): - #try: - if 1: - gui_port, gui_host = None, None + gui_port, gui_host = None, None - event_code = self.fields[ 'event-code' ] - event_type = self.fields[ 'event-type' ] + event_code = self.fields[ 'event-code' ] + event_type = self.fields[ 'event-type' ] - log.debug( "code (type): %d (%s)" % ( event_code, event_type ) ) + log.debug( "code (type): %d (%s)" % ( event_code, event_type ) ) - try: - error_string_short = database.queryStrings( str( event_code ), 0 ) - except Error: - error_string_short = '' + try: + error_string_short = database.queryStrings( str( event_code ), 0 ) + except Error: + error_string_short = '' - try: - error_string_long = database.queryStrings( str( event_code ), 1 ) - except Error: - error_string_long = '' + try: + error_string_long = database.queryStrings( str( event_code ), 1 ) + except Error: + error_string_long = '' - log.debug( "short: %s" % error_string_short ) - log.debug( "long: %s" % error_string_long ) + log.debug( "short: %s" % error_string_short ) + log.debug( "long: %s" % error_string_long ) - job_id = self.fields.get( 'job-id', 0 ) + job_id = self.fields.get( 'job-id', 0 ) - try: - username = self.fields[ 'username' ] - except KeyError: - if job_id == 0: - username = prop.username - else: - jobs = cups.getAllJobs() + try: + username = self.fields[ 'username' ] + except KeyError: + if job_id == 0: + username = prop.username + else: + jobs = cups.getAllJobs() - for j in jobs: - if j.id == job_id: - username = j.user - break - else: - username = prop.username + for j in jobs: + if j.id == job_id: + username = j.user + break + else: + username = prop.username - no_fwd = self.fields.get( 'no-fwd', False ) + no_fwd = self.fields.get( 'no-fwd', False ) - log.debug( "username (jobid): %s (%d)" % ( username, job_id ) ) + log.debug( "username (jobid): %s (%d)" % ( username, job_id ) ) - retry_timeout = self.fields.get( 'retry-timeout', 0 ) - device_uri = self.fields.get( 'device-uri', '' ) + retry_timeout = self.fields.get( 'retry-timeout', 0 ) + device_uri = self.fields.get( 'device-uri', '' ) - database.createHistory( device_uri, event_code, job_id, username ) + database.createHistory( device_uri, event_code, job_id, username ) - try: - gui_host, gui_port = self.get_guid( username ) - except Error, e: - log.warn( "No GUI available. (%d)" % e.opt ) - raise Error( e.opt ) + try: + gui_host, gui_port = self.get_guid( username ) + except Error, e: + log.warn( "No GUI available. (%d)" % e.opt ) + raise Error( e.opt ) - log.debug( "%s:%d" % ( gui_host, gui_port ) ) + log.debug( "%s:%d" % ( gui_host, gui_port ) ) - user_alerts = database.alerts.get( username, {} ) + user_alerts = database.alerts.get( username, {} ) - if not no_fwd: - if gui_host is not None and gui_port is not None: + if not no_fwd: + if gui_host is not None and gui_port is not None: - log.debug( "Sending to GUI..." ) + log.debug( "Sending to GUI..." ) + try: + s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) + s.connect( ( gui_host, gui_port) ) + except socket.error: + log.error( "Unable to communicate with GUI on port %d" % gui_port ) + else: try: - s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) - s.connect( ( gui_host, gui_port) ) - except socket.error: - log.error( "Unable to communicate with GUI on port %d" % gui_port ) - else: - try: - sendEvent( s, 'EventGUI', - '%s\n%s\n' % ( error_string_short, error_string_long ), - { 'job-id' : job_id, - 'event-code' : event_code, - 'event-type' : event_type, - 'retry-timeout' : retry_timeout, - 'device-uri' : device_uri, - 'popup' : user_alerts.get( 'popup-alerts', False ), - } - ) - except Error,e: - log.error( "Error sending event to GUI. (%d)" % e.opt ) - - s.close() - - # TODO: also send msg to all admin guid's??? - - else: # gui not registered or user no longer logged on - log.warn( "Unable to find GUI to display error" ) - else: - log.debug( "Not sending to GUI, no_fwd=True" ) - + sendEvent( s, 'EventGUI', + '%s\n%s\n' % ( error_string_short, error_string_long ), + { 'job-id' : job_id, + 'event-code' : event_code, + 'event-type' : event_type, + 'retry-timeout' : retry_timeout, + 'device-uri' : device_uri, + } + ) + except Error,e: + log.error( "Error sending event to GUI. (%d)" % e.opt ) + + s.close() + + else: # gui not registered or user no longer logged on + log.warn( "Unable to find GUI to display error" ) + else: + log.debug( "Not sending to GUI, no_fwd=True" ) - if user_alerts.get( 'email-alerts', False ) and event_type == 'error': - fromaddr = prop.username + '@localhost' - toaddrs = user_alerts.get( 'email-address', 'root@localhost' ).split() - smtp_server = user_alerts.get( 'smtp-server', 'localhost' ) - msg = "From: %s\r\nTo: %s\r\n\r\n" % ( fromaddr, ', '.join(toaddrs) ) - msg = msg + 'Printer: %s\r\nCode: %d\r\nError: %s\r\n' % ( device_uri, event_code, error_string_short ) + if user_alerts.get( 'email-alerts', False ) and event_type == 'error': - mt = MailThread( msg, - smtp_server, - fromaddr, - toaddrs ) - mt.start() + fromaddr = prop.username + '@localhost' + toaddrs = user_alerts.get( 'email-address', 'root@localhost' ).split() + smtp_server = user_alerts.get( 'smtp-server', 'localhost' ) + msg = "From: %s\r\nTo: %s\r\n\r\n" % ( fromaddr, ', '.join(toaddrs) ) + msg = msg + 'Printer: %s\r\nCode: %d\r\nError: %s\r\n' % ( device_uri, event_code, error_string_short ) - #finally: - # utils.log_exception() + mt = MailThread( msg, + smtp_server, + fromaddr, + toaddrs ) + mt.start() return '' @@ -653,39 +641,6 @@ class hpssd_handler( async.dispatcher ): return '' - # EVENT - def handle_showuievent( self ): - try: - ui_id = self.fields[ 'ui-id' ] - username = self.fields[ 'username' ] - - log.debug( "ShowUI: %s %s" % ( ui_id, username ) ) - try: - gui_host, gui_port = self.get_guid( username ) - except Error, e: - log.warning( "No GUI available. (%d)" % e.opt ) - raise Error( e.opt ) - - log.debug( "Sending to GUI..." ) - s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) - s.connect( ( gui_host, gui_port ) ) - - try: - sendEvent( s, 'ShowGUIEvent', None, - { 'ui-id' : ui_id, - 'username' : username } ) - except Error, e: - log.warning( "Error sending event to GUI. (%d)" % e.opt ) - raise Error( e.opt ) - - s.close() - - finally: - utils.log_exception() - - return '' - - def handle_probedevicesfiltered( self ): payload, result_code = '', ERROR_SUCCESS num_devices, ret_devices = 0, {} @@ -929,7 +884,6 @@ class MailThread( threading.Thread ): def reInit(): database.initModels() database.initStrings() - #device_r_cache.update( database.initHistories( hpiod_sock ) ) def handleSIGHUP( signo, frame ): log.info( "SIGHUP" ) diff --git a/prnt/hpijs/Makefile.am b/prnt/hpijs/Makefile.am index 0cbf7ea0b..d0cff2e91 100644 --- a/prnt/hpijs/Makefile.am +++ b/prnt/hpijs/Makefile.am @@ -2,7 +2,7 @@ docdir = $(datadir)/doc/$(distdir) ppddir = $(datadir)/ppd/HP #APDKLABEL=JetReady_PreMerge_11-08-04 -APDKLABEL=HPLIP-0_9_1 +APDKLABEL=HPLIP-0_9_2 APDKCOMMON=slimhost/source/common APDKOPEN=slimhost/source/open APDKDEBUG=slimhost/source/debug diff --git a/prnt/hpijs/Makefile.in b/prnt/hpijs/Makefile.in index fa3a6e4ad..d55082a3e 100644 --- a/prnt/hpijs/Makefile.in +++ b/prnt/hpijs/Makefile.in @@ -219,7 +219,7 @@ docdir = $(datadir)/doc/$(distdir) ppddir = $(datadir)/ppd/HP #APDKLABEL=JetReady_PreMerge_11-08-04 -APDKLABEL = HPLIP-0_9_1 +APDKLABEL = HPLIP-0_9_2 APDKCOMMON = slimhost/source/common APDKOPEN = slimhost/source/open APDKDEBUG = slimhost/source/debug diff --git a/prnt/hpijs/configure b/prnt/hpijs/configure index 065c60940..ce9ffa05c 100755 --- a/prnt/hpijs/configure +++ b/prnt/hpijs/configure @@ -859,7 +859,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-debug enable debug mode default=no --enable-cups-install enable cups install default=yes --enable-foomatic-install enable foomatic install default=yes @@ -1619,7 +1618,7 @@ fi # Define the identity of the package. PACKAGE=hpijs - VERSION=2.1.1 + VERSION=2.1.2 cat >>confdefs.h <<_ACEOF @@ -4545,32 +4544,6 @@ MYFLAGS="$MYFLAGS -DAPDK_DJ660 -DAPDK_DJ6xx -DAPDK_DJ6xxPhoto \ -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \ -DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX" -echo "$as_me:$LINENO: checking \"which type of build\"" >&5 -echo $ECHO_N "checking \"which type of build\"... $ECHO_C" >&6 -if test "$GCC" = yes; then - # Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - enable_debug=$enableval -else - enable_debug=no -fi; - if test $enable_debug = yes; then - CFLAGS="-g -Wall" - CXXFLAGS="-g -Wall" - echo "$as_me:$LINENO: result: debug" >&5 -echo "${ECHO_T}debug" >&6 - else - CFLAGS="-O2 -Wall" - CXXFLAGS="-O2 -Wall" - echo "$as_me:$LINENO: result: release" >&5 -echo "${ECHO_T}release" >&6 - fi -else - echo "$as_me:$LINENO: result: \"$CXXFLAGS\"" >&5 -echo "${ECHO_T}\"$CXXFLAGS\"" >&6 -fi - echo "$as_me:$LINENO: checking \"for unint32_t\"" >&5 echo $ECHO_N "checking \"for unint32_t\"... $ECHO_C" >&6 FOUND_TYPE="" diff --git a/prnt/hpijs/configure.in b/prnt/hpijs/configure.in index 4e227efc1..5f28ef1ea 100644 --- a/prnt/hpijs/configure.in +++ b/prnt/hpijs/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(hpijs.cpp) -AM_INIT_AUTOMAKE(hpijs, 2.1.1) +AM_INIT_AUTOMAKE(hpijs, 2.1.2) #AC_PREFIX_DEFAULT(/usr) dnl Checks for programs. @@ -36,24 +36,6 @@ MYFLAGS="$MYFLAGS -DAPDK_DJ660 -DAPDK_DJ6xx -DAPDK_DJ6xxPhoto \ -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \ -DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX" -AC_MSG_CHECKING("which type of build") -if test "$GCC" = yes; then - AC_ARG_ENABLE(debug, - [ --enable-debug enable debug mode [default=no]], - enable_debug=$enableval, enable_debug=no) - if test $enable_debug = yes; then - CFLAGS="-g -Wall" - CXXFLAGS="-g -Wall" - AC_MSG_RESULT(debug) - else - CFLAGS="-O2 -Wall" - CXXFLAGS="-O2 -Wall" - AC_MSG_RESULT(release) - fi -else - AC_MSG_RESULT("$CXXFLAGS") -fi - AC_MSG_CHECKING("for unint32_t") FOUND_TYPE="" for i in stdint.h machine/types.h inttypes.h; do diff --git a/prnt/hpijs/djgenericvip.cpp b/prnt/hpijs/djgenericvip.cpp index de6fa9c60..9065b6f7f 100644 --- a/prnt/hpijs/djgenericvip.cpp +++ b/prnt/hpijs/djgenericvip.cpp @@ -113,7 +113,7 @@ VIPGrayFastDraftMode::VIPGrayFastDraftMode () : GrayMode (ulMapDJ600_CCM_K) #endif dyeCount = 1; - medium = mediaAuto; + medium = mediaPlain; theQuality = qualityFastDraft; pmQuality = QUALITY_FASTDRAFT; pmMediaType = MEDIA_PLAIN; diff --git a/prnt/hpijs/hpijs_readme.html b/prnt/hpijs/hpijs_readme.html index 6edf083f7..612ee263c 100644 --- a/prnt/hpijs/hpijs_readme.html +++ b/prnt/hpijs/hpijs_readme.html @@ -650,6 +650,8 @@ The following options can be selected with Ghostscript commands. hp business inkjet 1100 HP Business Inkjet 1200 + <b>FastDraft Grayscale</b> + Quality=4 ColorMode=0 MediaType=0 PenSet=2 <b>Draft Grayscale</b> Quality=1 ColorMode=0 MediaType=0 PenSet=2 <b>FastDraft Color</b> @@ -3266,6 +3268,16 @@ Left edge, Top edge, Width and Height values are in inches. "n/a" means option i <H2><a name="Updates"></a>5 Updates</H2> <ul> <li> +<b>HPIJS 2.1.2</b> - This release has the following changes. +<pre> + 1. Added new print mode "FastDraft Grayscale" to DJGenericVIP. + 2. Rebuilt PPD files with new "FastDraft Grayscale" support. + 3. Put limit (max=5) on syslog messages when output device write() fails (Debian request). + 4. Removed specified gcc options in hpijs configure.in (Debian request). + 5. Fixed a 64-bit compile issue in ljjetready.cpp. +</pre> +<p> +<li> <b>HPIJS 2.1.1</b> - This release has the following changes. <pre> 1. Fixed bi-di support issue for Business Inkjet 1100/1200. @@ -4025,7 +4037,7 @@ $ gs -sDEVICE=ijs -sIjsServer=hpijs -dIjsUseOutputFD -sDeviceManufacturer="HEWLE <font size=2> <a href="mailto:david_suffield@hp.com">David Suffield</a><br> © 2001-2005 Hewlett-Packard Company<br> -HPIJS 2.1.1, last updated April 1, 2005 +HPIJS 2.1.2, last updated April 15, 2005 </font> </BODY> </HTML> diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp index b2e4ca780..c11bb9e92 100644 --- a/prnt/hpijs/ljfastraster.cpp +++ b/prnt/hpijs/ljfastraster.cpp @@ -591,7 +591,7 @@ DISPLAY_STATUS LJFastRaster::ParseError(BYTE status_reg) while (*tmpStr < '0' || *tmpStr > '9') tmpStr++; sscanf (tmpStr, "%d", &iErrorCode); - if (iErrorCode != (int) (this)) + if (iErrorCode != (long) (this)) return DISPLAY_PRINTING; } diff --git a/prnt/hpijs/ljjetready.cpp b/prnt/hpijs/ljjetready.cpp index 9ecf25fa6..e35bc9e4f 100644 --- a/prnt/hpijs/ljjetready.cpp +++ b/prnt/hpijs/ljjetready.cpp @@ -705,7 +705,7 @@ DISPLAY_STATUS LJJetReady::ParseError(BYTE status_reg) while (*tmpStr < '0' || *tmpStr > '9') tmpStr++; sscanf (tmpStr, "%d", &iErrorCode); - if (iErrorCode != (int) (this)) + if (iErrorCode != (long) (this)) return DISPLAY_PRINTING; } diff --git a/prnt/hpijs/ppd/HP-Business_Inkjet_1000-hpijs.ppd b/prnt/hpijs/ppd/HP-Business_Inkjet_1000-hpijs.ppd index 6f8861307..b084531ef 100644 --- a/prnt/hpijs/ppd/HP-Business_Inkjet_1000-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-Business_Inkjet_1000-hpijs.ppd @@ -97,8 +97,8 @@ ufacturer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -359,6 +359,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-Business_Inkjet_1100-hpijs.ppd b/prnt/hpijs/ppd/HP-Business_Inkjet_1100-hpijs.ppd index 6fa935a78..bdf76a5d5 100644 --- a/prnt/hpijs/ppd/HP-Business_Inkjet_1100-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-Business_Inkjet_1100-hpijs.ppd @@ -97,8 +97,8 @@ ufacturer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -359,6 +359,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-Business_Inkjet_1200-hpijs.ppd b/prnt/hpijs/ppd/HP-Business_Inkjet_1200-hpijs.ppd index 271848679..3da78537d 100644 --- a/prnt/hpijs/ppd/HP-Business_Inkjet_1200-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-Business_Inkjet_1200-hpijs.ppd @@ -97,8 +97,8 @@ ufacturer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -359,6 +359,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5150-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5150-hpijs.ppd index 08fd53cfd..41f6337f0 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5150-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5150-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5158-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5158-hpijs.ppd index 15f7533b0..a14a32140 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5158-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5158-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5160-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5160-hpijs.ppd index e09ed7168..1e187fd0c 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5160-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5160-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5550-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5550-hpijs.ppd index c95c78e69..5c8e3df1b 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5550-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5550-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5551-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5551-hpijs.ppd index 906a4c019..3be2089d1 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5551-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5551-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5551"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5650-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5650-hpijs.ppd index 91d10656d..cc9b95934 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5650-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5650-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5652-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5652-hpijs.ppd index 807e3ef66..93e6e3de0 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5652-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5652-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5670-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5670-hpijs.ppd index d9fb018fb..771b607c3 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5670-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5670-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5740-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5740-hpijs.ppd index 6a7065afb..659c30ce6 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5740-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5740-hpijs.ppd @@ -103,8 +103,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -372,6 +372,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_5850-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_5850-hpijs.ppd index fbc313547..fe2841183 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_5850-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_5850-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_6520-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_6520-hpijs.ppd index ce4e3bdce..60ac5a842 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_6520-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_6520-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_6540-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_6540-hpijs.ppd index a1a2acb50..b0fd8f7c0 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_6540-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_6540-hpijs.ppd @@ -103,8 +103,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -372,6 +372,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_6600-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_6600-hpijs.ppd index b892838a3..149e3ff88 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_6600-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_6600-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_6800-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_6800-hpijs.ppd index 47491329b..58b9a7d29 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_6800-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_6800-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_6840-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_6840-hpijs.ppd index 83f13b74a..b241126fc 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_6840-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_6840-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_9600-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_9600-hpijs.ppd index 26f45b522..8324d44a1 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_9600-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_9600-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -400,6 +400,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-DeskJet_9800-hpijs.ppd b/prnt/hpijs/ppd/HP-DeskJet_9800-hpijs.ppd index 37098eb48..e66a239da 100644 --- a/prnt/hpijs/ppd/HP-DeskJet_9800-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-DeskJet_9800-hpijs.ppd @@ -96,8 +96,8 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -400,6 +400,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-LaserJet_2420-hpijs.ppd b/prnt/hpijs/ppd/HP-LaserJet_2420-hpijs.ppd index 5b65ffb67..b927b8979 100644 --- a/prnt/hpijs/ppd/HP-LaserJet_2420-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-LaserJet_2420-hpijs.ppd @@ -29,7 +29,7 @@ *LanguageEncoding: ISOLatin1 *PCFileName: "HPIJS.PPD" *Manufacturer: "HP" -*Product: "(LaserJet 2420)" +*Product: "(hp LaserJet 2420)" *cupsVersion: 1.0 *cupsManualCopies: True *cupsModelNumber: 2 diff --git a/prnt/hpijs/ppd/HP-LaserJet_5M-hpijs.ppd b/prnt/hpijs/ppd/HP-LaserJet_5M-hpijs.ppd index 1dc62cd47..6081b8465 100644 --- a/prnt/hpijs/ppd/HP-LaserJet_5M-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-LaserJet_5M-hpijs.ppd @@ -29,7 +29,7 @@ *LanguageEncoding: ISOLatin1 *PCFileName: "HPIJS.PPD" *Manufacturer: "HP" -*Product: "(LaserJet 5M)" +*Product: "(HP LaserJet 5M)" *cupsVersion: 1.0 *cupsManualCopies: True *cupsModelNumber: 2 diff --git a/prnt/hpijs/ppd/HP-OfficeJet_6100-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_6100-hpijs.ppd index e6e095eac..c15f311f9 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_6100-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_6100-hpijs.ppd @@ -103,8 +103,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -372,6 +372,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-OfficeJet_6105-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_6105-hpijs.ppd index 8dde0bc4b..d90de5f6e 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_6105-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_6105-hpijs.ppd @@ -103,8 +103,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -372,6 +372,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-OfficeJet_6110-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_6110-hpijs.ppd index ee92f362c..5a70b83a2 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_6110-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_6110-hpijs.ppd @@ -103,8 +103,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -372,6 +372,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-OfficeJet_6150-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_6150-hpijs.ppd index 4f0986a21..2c9287955 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_6150-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_6150-hpijs.ppd @@ -103,8 +103,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -372,6 +372,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-OfficeJet_6200-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_6200-hpijs.ppd index 1859417ed..ee9cdba72 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_6200-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_6200-hpijs.ppd @@ -97,8 +97,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-OfficeJet_7200-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_7200-hpijs.ppd index da3a7bd4d..6b9905ed0 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_7200-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_7200-hpijs.ppd @@ -97,8 +97,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-OfficeJet_7300-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_7300-hpijs.ppd index 29b08f47a..5776cd311 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_7300-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_7300-hpijs.ppd @@ -97,8 +97,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-OfficeJet_7400-hpijs.ppd b/prnt/hpijs/ppd/HP-OfficeJet_7400-hpijs.ppd index 1530aec89..bf70e0e68 100644 --- a/prnt/hpijs/ppd/HP-OfficeJet_7400-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-OfficeJet_7400-hpijs.ppd @@ -97,8 +97,8 @@ rer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_1600-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_1600-hpijs.ppd index ac9de8ea8..593360d24 100644 --- a/prnt/hpijs/ppd/HP-PSC_1600-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_1600-hpijs.ppd @@ -96,8 +96,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2110-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2110-hpijs.ppd index d206b06e0..823f09dec 100644 --- a/prnt/hpijs/ppd/HP-PSC_2110-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2110-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2150-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2150-hpijs.ppd index 432b327e2..956c25e08 100644 --- a/prnt/hpijs/ppd/HP-PSC_2150-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2150-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2170-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2170-hpijs.ppd index de5698de0..e28a255c3 100644 --- a/prnt/hpijs/ppd/HP-PSC_2170-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2170-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2175-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2175-hpijs.ppd index a2669d1dd..0912b2f84 100644 --- a/prnt/hpijs/ppd/HP-PSC_2175-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2175-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2210-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2210-hpijs.ppd index f57470651..acd9753fe 100644 --- a/prnt/hpijs/ppd/HP-PSC_2210-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2210-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2300-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2300-hpijs.ppd index cd3957fb6..42320ecbc 100644 --- a/prnt/hpijs/ppd/HP-PSC_2300-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2300-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2350-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2350-hpijs.ppd index 3fced624c..dae2dd343 100644 --- a/prnt/hpijs/ppd/HP-PSC_2350-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2350-hpijs.ppd @@ -96,8 +96,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -365,6 +365,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2400-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2400-hpijs.ppd index 0d3b506ed..b06850dbc 100644 --- a/prnt/hpijs/ppd/HP-PSC_2400-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2400-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PSC_2500-hpijs.ppd b/prnt/hpijs/ppd/HP-PSC_2500-hpijs.ppd index 3a3de3b44..2062bfba3 100644 --- a/prnt/hpijs/ppd/HP-PSC_2500-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PSC_2500-hpijs.ppd @@ -102,8 +102,8 @@ uot;HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"" orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -371,6 +371,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_2600-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_2600-hpijs.ppd index 42bf60829..a5abf4618 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_2600-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_2600-hpijs.ppd @@ -97,8 +97,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_2700-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_2700-hpijs.ppd index 7a26a458b..853abda57 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_2700-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_2700-hpijs.ppd @@ -97,8 +97,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7150-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7150-hpijs.ppd index 6e3347c39..510dc926a 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7150-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7150-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7260-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7260-hpijs.ppd index 167e19241..1f66aaf7a 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7260-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7260-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7268-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7268-hpijs.ppd index 04f999235..102981098 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7268-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7268-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7345-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7345-hpijs.ppd index 4024eea14..8a0c86f35 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7345-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7345-hpijs.ppd @@ -97,8 +97,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7350-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7350-hpijs.ppd index cb56005d1..41108a310 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7350-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7350-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7400-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7400-hpijs.ppd index 0af81c684..63ff20290 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7400-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7400-hpijs.ppd @@ -97,8 +97,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7550-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7550-hpijs.ppd index 28e8b38f9..902173dbe 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7550-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7550-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7660-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7660-hpijs.ppd index 5ea19d8b5..ebc1fef51 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7660-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7660-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7760-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7760-hpijs.ppd index 8309e2f6c..b9d6864b6 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7760-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7760-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_7960-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_7960-hpijs.ppd index b1152d56e..13768e28e 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_7960-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_7960-hpijs.ppd @@ -105,8 +105,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -374,6 +374,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_8100-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_8100-hpijs.ppd index c714d43d9..b339c2ecf 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_8100-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_8100-hpijs.ppd @@ -97,8 +97,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_8400-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_8400-hpijs.ppd index b871482fb..47e7be041 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_8400-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_8400-hpijs.ppd @@ -97,8 +97,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/ppd/HP-PhotoSmart_8700-hpijs.ppd b/prnt/hpijs/ppd/HP-PhotoSmart_8700-hpijs.ppd index 3c3d3ee21..aa3da2ae2 100644 --- a/prnt/hpijs/ppd/HP-PhotoSmart_8700-hpijs.ppd +++ b/prnt/hpijs/ppd/HP-PhotoSmart_8700-hpijs.ppd @@ -97,8 +97,8 @@ urer="HEWLETT-PACKARD" -sDeviceModel="deskjet 5550"&& orCMYK" *End *PrintoutMode Draft.Gray/Draft Grayscale (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" -*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300DraftGr&& -ayscaleCMYK" +*FoomaticRIPOptionSetting PrintoutMode=Draft.Gray: "Quality=300FastDra&& +ftGrayscaleCMYK" *End *PrintoutMode Normal/Normal (auto-detect paper type): "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" *FoomaticRIPOptionSetting PrintoutMode=Normal: "Quality=300ColorCMYK" @@ -366,6 +366,11 @@ ty:PenSet=2" Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& ty:PenSet=2" *End +*Quality 300FastDraftGrayscaleCMYK/300 dpi, FastDraft, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleCMYK" +*FoomaticRIPOptionSetting Quality=300FastDraftGrayscaleCMYK: " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2" +*End *Quality 300GrayscaleCMYK/300 dpi, Grayscale, Black + Color Cartr.: "%% FoomaticRIPOptionSetting: Quality=300GrayscaleCMYK" *FoomaticRIPOptionSetting Quality=300GrayscaleCMYK: " -r300 -sIjsParam&& s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& diff --git a/prnt/hpijs/services.cpp b/prnt/hpijs/services.cpp index 56feeb61f..4bd751d22 100644 --- a/prnt/hpijs/services.cpp +++ b/prnt/hpijs/services.cpp @@ -229,7 +229,9 @@ DRIVER_ERROR UXServices::ToDevice(const BYTE * pBuffer, DWORD * Count) /* Write must be not-buffered, don't use streams */ if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) { - bug("unable to write to output, fd=%d, count=%d: %m\n", OutputPath, *Count); + static int cnt=0; + if (cnt++ < 5) + bug("unable to write to output, fd=%d, count=%d: %m\n", OutputPath, *Count); return IO_ERROR; } diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c index a5cc8ddac..5c4604625 100644 --- a/scan/sane/hpaio.c +++ b/scan/sane/hpaio.c @@ -2008,12 +2008,9 @@ static void hpaioMfpdtfPardonReadTimeout( hpaioScanner_t hpaio, static int hpaioPmlSelectCallback( hpaioScanner_t hpaio ) { - //hpaioScanner_t hpaio = ( hpaioScanner_t ) cbd; - + int r = SANE_STATUS_GOOD; + DBG( 0, "hpaioPmlSelectCallback()\n" ); - - - int r = OK; if( hpaio->pml.scanDone || PmlRequestGet( hpaio->deviceid, hpaio->cmd_channelid, hpaio->pml.objUploadState ) == ERROR || @@ -2054,11 +2051,12 @@ setIdle: } hpaio->pml.scanDone = 1; + done: - if( hpaio->pml.scanDone && hpaio->endOfData ) - { - r = ERROR; - } + // if( hpaio->pml.scanDone && hpaio->endOfData ) + // { + // r = ERROR; + // } DBG( 0, "hpaio: hpaioPmlSelectCallback returns %d, " "scanDone=%d, endOfData=%d, alreadyRestarted=%d.\n", r, @@ -3544,13 +3542,9 @@ extern SANE_Status sane_hpaio_start( SANE_Handle handle ) rService = MfpdtfReadService( hpaio->mfpdtf ); - // **************************************************************** - if( hpaio->scannerType == SCANNER_TYPE_PML && - hpaioPmlSelectCallback( hpaio ) == ERROR ) - { - goto abort; - } - // **************************************************************** + if( hpaio->scannerType == SCANNER_TYPE_PML ) + if (retcode = hpaioPmlSelectCallback( hpaio ) != SANE_STATUS_GOOD ) + goto abort; retcode = hpaioPmlCheckForScanFailure( hpaio ); @@ -3905,12 +3899,9 @@ needMoreData: rService = MfpdtfReadService( hpaio->mfpdtf ); - if( hpaio->scannerType == SCANNER_TYPE_PML && - hpaioPmlSelectCallback( hpaio ) == ERROR ) - { - retcode = SANE_STATUS_IO_ERROR; - goto abort; - } + if( hpaio->scannerType == SCANNER_TYPE_PML ) + if (retcode = hpaioPmlSelectCallback( hpaio ) != SANE_STATUS_GOOD ) + goto abort; retcode = hpaioPmlCheckForScanFailure( hpaio ); diff --git a/toolbox.py b/toolbox.py index 4e4ceb767..6a7e386a0 100755 --- a/toolbox.py +++ b/toolbox.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -# $Revision: 1.13 $ -# $Date: 2005/03/08 18:59:55 $ +# $Revision: 1.15 $ +# $Date: 2005/04/14 19:36:02 $ # $Author: dwelch $ # # (c) Copyright 2003-2004 Hewlett-Packard Development Company, L.P. @@ -22,60 +22,425 @@ # # Author: Don Welch # +# Thanks to Henrique M. Holschuh <hmh@debian.org> for various security patches +# +_VERSION = '4.0' +# Std Lib +import sys +import socket +import os, os.path +import getopt +import signal +import atexit +import ConfigParser +# Local +from base.g import * +import base.async_qt as async +import base.utils as utils +from base.msg import * +import base.service as service -_VERSION = '2.1' +app = None +services = None +server = None +toolbox = None -import sys, os, pwd, os.path, time -from base.g import * -from base.codes import * -from base import service, utils -utils.log_title( 'Toolbox/Device Manager', _VERSION ) +# PyQt +try: + from qt import * +except ImportError: + log.error( "PyQt not installed. GUI not available. Exiting." ) + sys.exit(0) -s = None +# check version of Qt +qtMajor = int( qVersion().split('.')[0] ) +if qtMajor < MINIMUM_QT_MAJOR_VER: + log.error( "Incorrect version of Qt installed. Ver. 3.0.0 or greater required.") + sys.exit(0) +#check version of PyQt try: - s = service.Service() -except Error, e: - log.error( "hpssd is not running. Unable to start toolbox. Use the startup script to start the HPLIP daemons." ) - sys.exit(1) - -port, host = s.getGUI( prop.username ) - -if port == 0: - log.debug( "Running new hpguid instance..." ) - hpguid_path = os.path.join( prop.home_dir, 'hpguid.py' ) - - if os.path.exists( hpguid_path ): - - os.system( 'python %s' % hpguid_path ) - - tries = 0 - - while 1: - time.sleep(0.5) - port, host = s.getGUI( prop.username ) - tries += 1 - - if port > 0: break - - if tries > 10: - log.error( "Unable to start hpguid. Use the startup script to restart the HPLIP daemons." ) - sys.exit(1) - else: - log.error( "Unable to locate hpguid.py. Please check HPLIP installation for problems." ) - s.close() + pyqtVersion = PYQT_VERSION_STR +except: + pyqtVersion = PYQT_VERSION + +while pyqtVersion.count('.') < 2: + pyqtVersion += '.0' + +(maj_ver, min_ver, pat_ver) = pyqtVersion.split('.') + +if pyqtVersion.find( 'snapshot' ) >= 0: + log.warning( "A non-stable snapshot version of PyQt is installed.") +else: + try: + maj_ver = int(maj_ver) + min_ver = int(min_ver) + pat_ver = int(pat_ver) + except ValueError: + maj_ver, min_ver, pat_ver = 0, 0, 0 + + if maj_ver < MINIMUM_PYQT_MAJOR_VER or \ + (maj_ver == MINIMUM_PYQT_MAJOR_VER and min_ver < MINIMUM_PYQT_MINOR_VER): + log.error( "This program may not function properly with the version of PyQt that is installed (%d.%d.%d)." % (maj_ver, min_ver, pat_ver) ) + log.error( "Incorrect version of pyQt installed. Ver. %d.%d or greater required." % ( MINIMUM_PYQT_MAJOR_VER, MINIMUM_PYQT_MINOR_VER ) ) + + +# UI Forms +from ui.devmgr4 import devmgr4 + + +def usage(): + formatter = utils.TextFormatter( + ( + {'width': 38, 'margin' : 2}, + {'width': 38, 'margin' : 2}, + ) + ) + + log.info( utils.TextFormatter.bold( """\nUsage: hpguid.py [OPTIONS]\n\n""" ) ) + + log.info( formatter.compose( ( utils.TextFormatter.bold("[OPTIONS]"), "" ) ) ) + + log.info( formatter.compose( ( "Set the logging level:", "-l<level> or --logging=<level>" ) ) ) + log.info( formatter.compose( ( "", "<level>: none, info*, error, warn, debug (*default)" ) ) ) + log.info( formatter.compose( ( "This help information:", "-h or --help" ), True ) ) + + +class hpguid_server( async.dispatcher ): + + def __init__( self, ip ): + self.ip = ip + self.port = socket.htons(0) + async.dispatcher.__init__( self ) + self.create_socket( socket.AF_INET, socket.SOCK_STREAM ) + self.set_reuse_addr() + try: + self.bind( ( ip, self.port ) ) + except socket.error,e: + log.fatal( "Unable to address to socket: %s" % e[1] ) + raise Error + self.port = self.socket.getsockname()[1] + prop.hpguid_port = self.port + self.listen( 5 ) + + + def writable( self ): + return False + + def readable( self ): + return self.accepting + + def handle_accept( self ): + try: + conn, addr = self.accept() + except socket.error: + log.error( "Socket error on accept()" ) + return + except TypeError: + log.error( "EWOULDBLOCK exception on accept()" ) + return + handler = hpguid_handler( conn, addr, self ) + + def __str__( self ): + return "<hpssd_server listening on %s:%d (fd=%d)>" % \ + ( self.ip, self.port, self._fileno ) + + def handle_close( self ): + async.dispatcher.handle_close( self ) + + + + +# This handler takes care of all conversations with +# clients when hpguid is acting as a server. +# This dispatcher receives requests messages and +# and replies with result messages. It does not +# initiate sending requests. +class hpguid_handler( async.dispatcher ): + + def __init__( self, conn, addr, the_server ): + async.dispatcher.__init__( self, sock=conn ) + self.addr = addr + self.in_buffer = "" + self.out_buffer = "" + self.server = the_server + self.fields = {} + self.data = '' + self.error_dialog = None + self.toolbox_active = False + self.signal_exit = False + + # handlers for all the messages we expect to receive + self.handlers = { + 'eventgui' : self.handle_eventgui, + 'unknown' : self.handle_unknown, + 'exitguievent' : self.handle_exitguievent, + } + + def __str__( self ): + return "<hpssd_handler connected to %s (fd=%d)>" % \ + ( self.addr, self._fileno ) + + def handle_read( self ): + log.debug( "Reading data on channel (%d)" % self._fileno ) + self.in_buffer = self.recv( prop.max_message_len ) + + if self.in_buffer == '': + return False + + try: + self.fields, self.data = parseMessage( self.in_buffer ) + except Error, e: + log.debug( repr(self.in_buffer) ) + log.warn( "Message parsing error: %s (%d)" % ( e.opt, e.msg ) ) + self.out_buffer = self.handle_unknown() + log.debug( self.out_buffer ) + return True + + msg_type = self.fields.get( 'msg', 'unknown' ) + log.debug( "%s %s %s" % ("*"*40, msg_type, "*"*40 ) ) + log.debug( repr( self.in_buffer ) ) + + try: + self.out_buffer = self.handlers.get( msg_type, self.handle_unknown )() + except Error: + log.error( "Unhandled exception during processing" ) + + if len( self.out_buffer ): # data is ready for send + self.sock_write_notifier.setEnabled( True ) + + return True + + def handle_write( self ): + if not len(self.out_buffer): + return + + log.debug( "Sending data on channel (%d)" % self._fileno ) + log.debug( repr( self.out_buffer ) ) + try: + sent = self.send( self.out_buffer ) + except: + log.error( "send() failed." ) + + self.out_buffer = self.out_buffer[ sent: ] + + + def writable( self ): + return not ( ( len( self.out_buffer ) == 0 ) + and self.connected ) + + + def handle_exitguievent( self ): + self.signal_exit = True + if self.signal_exit: + if toolbox is not None: + toolbox.close() + qApp.quit() + + return '' + + # EVENT + def handle_eventgui( self ): + global toolbox + try: + job_id = self.fields[ 'job-id' ] + event_code = self.fields[ 'event-code' ] + event_type = self.fields[ 'event-type' ] + retry_timeout = self.fields[ 'retry-timeout' ] + lines = self.data.splitlines() + error_string_short, error_string_long = lines[0], lines[1] + device_uri = self.fields[ 'device-uri' ] + + log.debug( "Event: %d '%s'" % ( event_code, event_type ) ) + + toolbox.EventUI( event_code, event_type, error_string_short, + error_string_long, retry_timeout, job_id, + device_uri ) + + + except: + utils.log_exception() + + return '' + + def handle_unknown( self ): + return buildResultMessage( 'MessageError', None, ERROR_INVALID_MSG_TYPE ) + + def handle_messageerror( self ): + return '' + + def handle_close( self ): + log.debug( "closing channel (%d)" % self._fileno ) + self.connected = False + async.dispatcher.close( self ) + + +def registerGUI(): + try: + services.registerGUI( prop.username, prop.hpguid_host, prop.hpguid_port, os.getpid() ) + except Error, e: + log.error( "Register GUI failed (code=%d). Exiting. " % e.opt ) + sys.exit(0) + +def unregisterGUI(): + try: + services.unregisterGUI( prop.username, os.getpid() ) + except Error, e: + log.error( "UnRegister GUI failed (code=%d). " % e.opt ) + + +def toolboxCleanup(): + unregisterGUI() + +def handleEXIT(): + + if services is not None: + try: + services.close() + except: + pass + + + if server is not None: + try: + server.close() + except: + pass + + try: + app.quit() + except: + pass + + sys.exit(0) + + + +def main( args ): + prop.prog = sys.argv[0] + + log.set_module( 'toolbox' ) + + utils.log_title( 'HP Device Manager', _VERSION ) + + try: + opts, args = getopt.getopt( sys.argv[1:], 'l:h', [ 'level=', 'help' ] ) + + except getopt.GetoptError: + usage() sys.exit(1) -log.info( "Launching toolbox (%s:%d)..." % (host, port ) ) -s.showToolbox( prop.username ) + for o, a in opts: + + if o in ( '-l', '--logging' ): + log_level = a.lower().strip() + log.set_level( log_level ) + + elif o in ( '-h', '--help' ): + usage() + sys.exit(1) + + + # Security: Do *not* create files that other users can muck around with + os.umask ( 0077 ) + + # hpguid server dispatcher object + global server + try: + server = hpguid_server( prop.hpguid_host ) + except Error: + log.error( "Unable to create server object." ) + sys.exit( 0 ) + + log.info( "Listening on %s port %d" % ( prop.hpguid_host, prop.hpguid_port ) ) + + # create the main application object + global app + app = QApplication( sys.argv ) + + global toolbox + toolbox = devmgr4( toolboxCleanup ) + app.setMainWidget( toolbox ) + + global services + try: + services = service.Service() + except Error: + log.error( "Unable to contact services daemon. Exiting." ) + sys.exit(0) + + registerGUI() + + pid = os.getpid() + log.debug( 'pid=%d' % pid ) + + toolbox.show() + + atexit.register( handleEXIT ) + signal.signal( signal.SIGPIPE, signal.SIG_IGN ) + + user_config = os.path.expanduser( '~/.hplip.conf' ) + loc = None + + if os.path.exists( user_config ): + # user_config contains executables we will run, so we + # must make sure it is a safe file, and refuse to run + # otherwise. + if not utils.path_exists_safely( user_config ): + log.warning( "File %s has insecure permissions! File ignored." % user_config ) + else: + config = ConfigParser.ConfigParser() + config.read( user_config ) + + if config.has_section( "ui" ): + loc = config.get( "ui", "loc" ) + + if not loc: + loc = None + + if loc is not None: + + if loc.lower() == 'system': + loc = str(QTextCodec.locale()) + + if loc.lower() != 'c': + + log.debug( "Trying to load .qm file for %s locale." % loc ) + + dirs = [ prop.home_dir, prop.data_dir, prop.i18n_dir ] + + trans = QTranslator(None) + + for dir in dirs: + qm_file = 'hplip_%s' % loc + loaded = trans.load( qm_file, dir) + + if loaded: + app.installTranslator( trans ) + break + else: + loc = None + + if loc is None: + log.debug( "Using default 'C' locale" ) + else: + log.debug( "Using locale: %s" % loc ) -s.close() -sys.exit(0) + try: + log.debug( "Starting GUI loop..." ) + app.exec_loop() + except KeyboardInterrupt: + pass + except: + utils.log_exception() + handleEXIT() +if __name__ == "__main__": + sys.exit( main( sys.argv[1:] ) ) diff --git a/ui/aboutdlg_base.py b/ui/aboutdlg_base.py index 82e1334ab..c94b4cdc8 100644 --- a/ui/aboutdlg_base.py +++ b/ui/aboutdlg_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/aboutdlg_base.ui' # -# Created: Thu Jan 20 09:35:49 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.12 +# Created: Fri Apr 1 14:51:31 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -57,7 +57,7 @@ class AboutDlg_base(QDialog): self.resize(QSize(465,487).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.pushButton15,SIGNAL("clicked()"),self,SLOT("close()")) + self.connect(self.pushButton15,SIGNAL("clicked()"),self.close) def languageChange(self): diff --git a/ui/aligntype6form1_base.py b/ui/aligntype6form1_base.py index bf80c58dc..28a615ce2 100644 --- a/ui/aligntype6form1_base.py +++ b/ui/aligntype6form1_base.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/pparks/linux-imaging-and-printing/src/ui/aligntype6form1_base.ui' +# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/aligntype6form1_base.ui' # -# Created: Thu Jan 6 14:14:11 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:30 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -21,25 +21,21 @@ class AlignType6Form1_base(QDialog): AlignType6Form1_baseLayout = QGridLayout(self,1,1,11,6,"AlignType6Form1_baseLayout") - spacer2 = QSpacerItem(313,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - AlignType6Form1_baseLayout.addItem(spacer2,1,0) - self.printPageButton = QPushButton(self,"printPageButton") + self.textLabel1 = QLabel(self,"textLabel1") + self.textLabel1.setAlignment(QLabel.WordBreak | QLabel.AlignVCenter) - AlignType6Form1_baseLayout.addWidget(self.printPageButton,1,2) + AlignType6Form1_baseLayout.addMultiCellWidget(self.textLabel1,0,0,0,2) self.pushButton2 = QPushButton(self,"pushButton2") - AlignType6Form1_baseLayout.addWidget(self.pushButton2,1,3) - - self.textLabel1 = QLabel(self,"textLabel1") - self.textLabel1.setAlignment(QLabel.WordBreak | QLabel.AlignVCenter) - - AlignType6Form1_baseLayout.addMultiCellWidget(self.textLabel1,0,0,0,3) + AlignType6Form1_baseLayout.addWidget(self.pushButton2,1,2) - self.cancelButton = QPushButton(self,"cancelButton") + self.pushButton3 = QPushButton(self,"pushButton3") - AlignType6Form1_baseLayout.addWidget(self.cancelButton,1,1) + AlignType6Form1_baseLayout.addWidget(self.pushButton3,1,1) + spacer2 = QSpacerItem(351,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + AlignType6Form1_baseLayout.addItem(spacer2,1,0) self.languageChange() @@ -47,24 +43,17 @@ class AlignType6Form1_base(QDialog): self.clearWState(Qt.WState_Polished) self.connect(self.pushButton2,SIGNAL("clicked()"),self.accept) - self.connect(self.cancelButton,SIGNAL("clicked()"),self.reject) - self.connect(self.printPageButton,SIGNAL("clicked()"),self.printPageButton_clicked) + self.connect(self.pushButton3,SIGNAL("clicked()"),self.reject) def languageChange(self): self.setCaption(self.__tr("HP Device Manager - Alignment")) - self.printPageButton.setText(self.__tr("Print Page")) - self.pushButton2.setText(self.__tr("Next >")) self.textLabel1.setText(self.__tr("To perform alignment, you will need the <b>alignment page</b> that is automatically printed after you install a print cartridge.\n" "<p> If you do <b>not</b> have this page, click <i>Print Page</i>.\n" "<p>If you already have this page, click <i>Next ></i>.")) - self.cancelButton.setText(self.__tr("Cancel")) - - - + self.pushButton2.setText(self.__tr("Next >")) + self.pushButton3.setText(self.__tr("Print Page")) - def printPageButton_clicked(self): - print "AlignType6Form1_base.printPageButton_clicked(): Not implemented yet" def __tr(self,s,c = None): return qApp.translate("AlignType6Form1_base",s,c) diff --git a/ui/aligntype6form2_base.py b/ui/aligntype6form2_base.py index 237cd7232..17a5ba7f0 100644 --- a/ui/aligntype6form2_base.py +++ b/ui/aligntype6form2_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/aligntype6form2_base.ui' # -# Created: Thu Jan 20 09:35:46 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.12 +# Created: Fri Apr 1 14:51:27 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -39,7 +39,7 @@ class AlignType6Form2_base(QDialog): self.resize(QSize(626,211).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.pushButton4,SIGNAL("clicked()"),self,SLOT("accept()")) + self.connect(self.pushButton4,SIGNAL("clicked()"),self.accept) def languageChange(self): diff --git a/ui/cleaningform2_base.py b/ui/cleaningform2_base.py index 89850aa18..4b92c78c8 100644 --- a/ui/cleaningform2_base.py +++ b/ui/cleaningform2_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/cleaningform2_base.ui' # -# Created: Tue Jan 25 10:58:05 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:32 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -24,7 +24,7 @@ class CleaningForm2_base(QDialog): CleaningForm2_baseLayout = QGridLayout(self,1,1,6,6,"CleaningForm2_baseLayout") self.Icon = QLabel(self,"Icon") - self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth())) + self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth())) self.Icon.setMinimumSize(QSize(71,65)) self.Icon.setMaximumSize(QSize(71,65)) self.Icon.setScaledContents(1) diff --git a/ui/cleaningform_base.py b/ui/cleaningform_base.py index ba0c18dee..0b0df524c 100644 --- a/ui/cleaningform_base.py +++ b/ui/cleaningform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/cleaningform_base.ui' # -# Created: Tue Jan 25 10:49:06 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:32 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -24,7 +24,7 @@ class CleaningForm_base(QDialog): CleaningForm_baseLayout = QGridLayout(self,1,1,6,6,"CleaningForm_baseLayout") self.Icon = QLabel(self,"Icon") - self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth())) + self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth())) self.Icon.setMinimumSize(QSize(71,65)) self.Icon.setMaximumSize(QSize(71,65)) self.Icon.setScaledContents(1) diff --git a/ui/coloradjform_base.py b/ui/coloradjform_base.py index f81937074..a5a27e24b 100644 --- a/ui/coloradjform_base.py +++ b/ui/coloradjform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/coloradjform_base.ui' # -# Created: Tue Feb 8 11:05:13 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:28 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -44,7 +44,7 @@ class ColorAdjForm_base(QDialog): buttonGroupLayout.setAlignment(Qt.AlignTop) self.Icon = QLabel(self.buttonGroup,"Icon") - self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth())) + self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth())) self.Icon.setScaledContents(1) buttonGroupLayout.addWidget(self.Icon,0,0) diff --git a/ui/colorcalform_base.py b/ui/colorcalform_base.py index 1660d138c..4645a18f3 100644 --- a/ui/colorcalform_base.py +++ b/ui/colorcalform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/colorcalform_base.ui' # -# Created: Thu Jan 20 09:35:45 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.12 +# Created: Fri Apr 1 14:51:27 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -81,8 +81,8 @@ class ColorCalForm_base(QDialog): self.resize(QSize(610,220).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.CancelButton,SIGNAL("clicked()"),self,SLOT("reject()")) - self.connect(self.ContinueButton,SIGNAL("clicked()"),self,SLOT("accept()")) + self.connect(self.CancelButton,SIGNAL("clicked()"),self.reject) + self.connect(self.ContinueButton,SIGNAL("clicked()"),self.accept) self.connect(self.ColorCalGroup,SIGNAL("clicked(int)"),self.ColorCalGroup_clicked) diff --git a/ui/devmgr4.py b/ui/devmgr4.py index f843814a8..a3d66f05e 100644 --- a/ui/devmgr4.py +++ b/ui/devmgr4.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -# $Revision: 1.63 $ -# $Date: 2005/03/29 21:06:23 $ +# $Revision: 1.66 $ +# $Date: 2005/04/14 19:36:44 $ # $Author: dwelch $ # # @@ -29,7 +29,6 @@ import sys import socket import time import os -import cStringIO # Local from base.g import * @@ -54,7 +53,6 @@ from colorcalform2 import ColorCalForm2 # Type 2 color cal # Misc forms from loadpaperform import LoadPaperForm -#from advancedinfoform import AdvancedInfoForm from settingsdialog import SettingsDialog from nodevicesform import NoDevicesForm from aboutdlg import AboutDlg @@ -89,9 +87,7 @@ class DummyDevice: self.ds = {} self.mq = {} self.cups_printers = [] - #self.job_id = 0 self.last_event = None - #self.last_event_code = 0 self.types_cached = False @@ -204,11 +200,13 @@ class IconViewItem( QIconViewItem ): class devmgr4(DevMgr4_base): - def __init__(self, initial_device_uri=None, parent=None, name=None, fl = 0 ): + def __init__(self, cleanup=None, initial_device_uri=None, parent=None, name=None, fl = 0 ): DevMgr4_base.__init__( self, parent, name, fl ) - + + log.debug( "Initializing toolbox UI" ) - + self.cleanup = cleanup + # Make some adjustments to the UI self.StatusHistoryList.setSorting( -1 ) self.AdvInfoList.setSorting( -1 ) @@ -299,7 +297,6 @@ class devmgr4(DevMgr4_base): self.email_alerts = False self.email_address = '' self.smtp_server = '' - self.popup_alerts = True self.auto_refresh = True self.auto_refresh_rate = DEF_AUTO_REFRESH_RATE @@ -322,7 +319,6 @@ class devmgr4(DevMgr4_base): self.email_alerts = config.getboolean( "alerts", 'email-alerts' ) self.email_address = config.get( "alerts", 'email-address' ) self.smtp_server = config.get( "alerts", 'smtp-server' ) - self.popup_alerts = config.getboolean( "alerts", 'popup-alerts' ) if config.has_section( "refresh" ): self.auto_refresh = config.getboolean( "refresh", "enable" ) @@ -354,7 +350,6 @@ class devmgr4(DevMgr4_base): log.debug( "Email alerts: %s" % self.email_alerts ) log.debug( "Email address: %s" % self.email_address ) log.debug( "SMTP server: %s" % self.smtp_server ) - log.debug( "Popup alerts: %s" % self.popup_alerts ) log.debug( "Auto refresh: %s" % self.auto_refresh ) log.debug( "Auto refresh rate: %s" % self.auto_refresh_rate ) @@ -372,14 +367,8 @@ class devmgr4(DevMgr4_base): QTimer.singleShot( 0, self.InitialUpdate ) def InitialUpdate( self ): - #print "initalUpdate()" self.RescanDevices( True ) - #if self.initial_device_uri is not None: - # self.ActivateDevice( self.initial_device_uri ) - # self.UpdateStatusTab() - # self.Tabs.setCurrentPage( 1 ) - self.refresh_timer = QTimer(self, "RefreshTimer") self.connect( self.refresh_timer, SIGNAL('timeout()'), self.TimedRefresh ) @@ -389,6 +378,7 @@ class devmgr4(DevMgr4_base): def TimedRefresh( self ): if self.auto_refresh and self.cur_device.polling: log.debug( "Refresh timer..." ) + self.CleanupChildren() self.UpdateDevice() def autoRefresh_toggled(self,a0): @@ -400,25 +390,28 @@ class devmgr4(DevMgr4_base): event.accept() def RescanDevices( self, make_history ): - #print "RescanDevices()" - #self.ToggleFunctionButtons( False ) self.deviceRefreshAll.setEnabled( False ) - self.DeviceListRefresh( make_history ) - self.deviceRescanAction.setEnabled( True ) self.deviceRefreshAll.setEnabled( True ) - #self.ToggleFunctionButtons( True ) def Cleanup( self ): - pass + self.CleanupChildren() + if self.cleanup is not None: + self.cleanup() + def CleanupChildren( self ): + log.debug( "Cleaning up child processes." ) + try: + os.waitpid(-1, os.WNOHANG ) + except OSError: + pass + def DeviceList_currentChanged(self,a0): self.cur_device_uri = self.DeviceList.currentItem().device_uri self.cur_device = self.devices[ self.cur_device_uri ] self.UpdateDevice() - #self.UpdateTabs() def DeviceList_rightButtonClicked( self, item, pos ): popup = QPopupMenu( self ) @@ -448,18 +441,13 @@ class devmgr4(DevMgr4_base): popup.popup( pos ) def UpdateDevice( self, check_state=True ): - #log.debug( ''.join( [ 'Update device:', '*'*40, self.cur_device_uri, '*'*40 ] ) ) log.debug( utils.bold( "Update: %s %s %s" % ( "*"*20, self.cur_device_uri, "*"*20 ) ) ) - #print "UpdateDevice()" self.update_called = True cd = self.cur_device - #QApplication.setOverrideCursor( QCursor(Qt.WaitCursor) ) self.setCaption( "%s - HP Device Manager" % cd.model_ui ) log.debug( "Device URI=%s" % self.cur_device_uri ) if check_state: # get "live" status of printer - - #ds = self.cur_device.ds try: # Check device status and create appropriate history self.cur_device.ds = self.service.queryDevice( self.cur_device_uri, @@ -471,9 +459,6 @@ class devmgr4(DevMgr4_base): cd.device_state = self.cur_device.ds.get( 'device-state', DEVICE_STATE_NOT_FOUND ) - #if cd.status_code in ( STATUS_PRINTER_IDLE, ): - # cd.polling = True - if not self.cur_device.types_cached: try: self.cur_device.mq = self.service.queryModel( cd.model ) @@ -515,7 +500,6 @@ class devmgr4(DevMgr4_base): 'HOME' : prop.home_dir, } - #QApplication.restoreOverrideCursor() default_pics = { 'deskjet' : 'default_deskjet.png', 'business' : 'default_business_inkjet.png', @@ -600,7 +584,7 @@ class devmgr4(DevMgr4_base): def ContinueDeviceListRefresh( self ): if self.printer_num == self.num_printers: - self.rescanning = False + self.scan_timer.stop() self.disconnect( self.scan_timer, SIGNAL('timeout()'), self.ContinueDeviceListRefresh ) @@ -614,9 +598,14 @@ class devmgr4(DevMgr4_base): self.DeviceList.adjustItems() self.DeviceList.updateGeometry() + self.rescanning = False + self.DeviceList.setCurrentItem( self.DeviceList.firstItem() ) - if self.num_printers == 0: + if self.num_devices == 1: + self.UpdateDevice( False ) + + elif self.num_devices == 0: dlg = NoDevicesForm( self, "", True ) dlg.show() @@ -689,13 +678,11 @@ class devmgr4(DevMgr4_base): self.CancelPrintJobButton.setEnabled( num_jobs > 0 ) def PrintJobList_currentChanged( self, item ): - #print item pass def CancelPrintJobButton_clicked(self): item = self.PrintJobList.currentItem() if item is not None: - #print item.job_id, item.printer self.service.cancelJob( item.job_id, self.cur_device_uri ) def UpdateTabs( self ): @@ -716,9 +703,7 @@ class devmgr4(DevMgr4_base): else: line1 = self.__tr( "Front panel display" ) line2 = self.__tr( "unavailable" ) - - #print line1, line2 - + pm = QPixmap( self.blank_lcd ) p = QPainter() @@ -763,12 +748,10 @@ class devmgr4(DevMgr4_base): except Error: log.error( "History query failed." ) cd.last_event = None - #cd.job_id = 0 cd.error_state = ERROR_STATE_ERROR cd.status_code = STATUS_UNKNOWN else: cd.last_event = cd.hist[-1] - #cd.job_id = cd.last_event[9] cd.status_code = int( cd.last_event[11] ) cd.error_state = STATUS_TO_ERROR_STATE_MAP.get( cd.status_code, ERROR_STATE_CLEAR ) @@ -784,8 +767,6 @@ class devmgr4(DevMgr4_base): self.UpdateHistory() last_event = cd.last_event - #print last_event - for x in cd.hist: job_id = x[9] code = x[11] @@ -812,38 +793,23 @@ class devmgr4(DevMgr4_base): self.StatusText.setText( last_event[12] ) self.StatusText2.setText( last_event[13] ) - #self.StatusCode.setText( str( last_event[11] ) ) - - #self.StatusDateTime.setText( time.strftime( "%a, %d %b %Y, %H:%M:%S", - # last_event[:9] ) ) - - #self.StatusTime.setText( time.strftime( "%H:%M:%S", - # last_event[:9] ) ) - - #job_id = cd.job_id - #self.StatusJobID.setText( str( job_id ) ) - - #self.CancelJobButton.setEnabled( job_id != 0 ) + if cd.error_state == ERROR_STATE_CLEAR: + self.StatusIcon.clear() - if 1: + elif cd.error_state == ERROR_STATE_OK: + self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "ok.png" ) ) ) - if cd.error_state == ERROR_STATE_CLEAR: - self.StatusIcon.clear() + elif cd.error_state == ERROR_STATE_WARNING: + self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) ) - elif cd.error_state == ERROR_STATE_OK: - self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "ok.png" ) ) ) + elif cd.error_state == ERROR_STATE_LOW_SUPPLIES: + self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) ) - elif cd.error_state == ERROR_STATE_WARNING: - self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) ) + elif cd.error_state == ERROR_STATE_ERROR: + self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "error.png" ) ) ) - elif cd.error_state == ERROR_STATE_LOW_SUPPLIES: - self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) ) - - elif cd.error_state == ERROR_STATE_ERROR: - self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "error.png" ) ) ) - - elif cd.error_state == ERROR_STATE_BUSY: - self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "busy.png" ) ) ) + elif cd.error_state == ERROR_STATE_BUSY: + self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "busy.png" ) ) ) def UpdateSuppliesTab( self ): @@ -901,12 +867,10 @@ class devmgr4(DevMgr4_base): self.CleanPensButton.setEnabled( self.cur_device.clean_type ) self.AlignPensButton.setEnabled( self.cur_device.align_type ) self.ColorCalibrationButton.setEnabled( self.cur_device.color_cal_type ) - #self.PrintTestPageButton.setEnabled( True ) else: self.CleanPensButton.setEnabled( False ) self.AlignPensButton.setEnabled( False ) self.ColorCalibrationButton.setEnabled( False ) - #self.PrintTestPageButton.setEnabled( False ) def ToggleInfoButtons( self, toggle ): if toggle: @@ -949,21 +913,16 @@ class devmgr4(DevMgr4_base): log.debug( "Event: code=%d type=%s string=%s timeout=%d id=%d uri=%s" % ( event_code, event_type, error_string_short, retry_timeout, job_id, device_uri ) ) - if event_code == EVENT_UI_SHOW_TOOLBOX: - #self.rescan( True ) - pass - elif self.ActivateDevice( device_uri ): + if self.ActivateDevice( device_uri ): self.cur_device.status_code = event_code self.UpdateDevice( False ) self.Tabs.setCurrentPage( 1 ) - def settingsConfigure_activated(self, tab_to_show=0 ): dlg = SettingsDialog( self ) - dlg.PopupCheckBox.setChecked( self.popup_alerts ) dlg.EmailCheckBox.setChecked( self.email_alerts ) dlg.EmailAddress.setText( self.email_address ) dlg.SMTPServer.setText( self.smtp_server ) @@ -987,7 +946,6 @@ class devmgr4(DevMgr4_base): self.cmd_copy = str( dlg.MakeCopiesCommand.text() ) self.email_alerts = bool( dlg.EmailCheckBox.isChecked() ) - self.popup_alerts = bool( dlg.PopupCheckBox.isChecked() ) self.email_address = str( dlg.EmailAddress.text() ) self.smtp_server = str( dlg.SMTPServer.text() ) @@ -1002,8 +960,7 @@ class devmgr4(DevMgr4_base): def SetAlerts( self ): - self.service.setAlerts( self.popup_alerts, - self.email_alerts, + self.service.setAlerts( self.email_alerts, self.email_address, self.smtp_server, ) @@ -1031,7 +988,6 @@ class devmgr4(DevMgr4_base): config.set( "alerts", 'email-alerts', self.email_alerts ) config.set( "alerts", 'email-address', self.email_address ) config.set( "alerts", 'smtp-server', self.smtp_server ) - config.set( "alerts", 'popup-alerts', self.popup_alerts ) if not config.has_section( 'maint' ): config.add_section( 'maint' ) @@ -1274,9 +1230,6 @@ class devmgr4(DevMgr4_base): self.RescanDevices( True ) def DeviceList_clicked(self,a0): - #if not self.update_called: - # self.UpdateDevice() - #self.update_called = False pass def OpenEmbeddedBrowserButton_clicked(self): @@ -1323,9 +1276,11 @@ class devmgr4(DevMgr4_base): log.debug( path ) log.debug( args ) - + + self.CleanupChildren() os.spawnvp( os.P_NOWAIT, path, args ) - #self.UpdateFunctionsTab() + + self.ToggleFunctionButtons( True ) diff --git a/ui/devmgr4_base.py b/ui/devmgr4_base.py index e18731891..eeba6d0de 100644 --- a/ui/devmgr4_base.py +++ b/ui/devmgr4_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/devmgr4_base.ui' # -# Created: Wed Mar 23 13:02:51 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:30 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -28,7 +28,7 @@ class DevMgr4_base(QMainWindow): self.splitter2.setOrientation(QSplitter.Horizontal) self.DeviceList = QIconView(self.splitter2,"DeviceList") - self.DeviceList.setSizePolicy(QSizePolicy(5,5,0,0,self.DeviceList.sizePolicy().hasHeightForWidth())) + self.DeviceList.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred,0,0,self.DeviceList.sizePolicy().hasHeightForWidth())) self.DeviceList.setMaximumSize(QSize(32767,32767)) self.DeviceList.setResizePolicy(QIconView.Manual) self.DeviceList.setArrangement(QIconView.TopToBottom) @@ -73,7 +73,7 @@ class DevMgr4_base(QMainWindow): self.PrintButton.setEnabled(0) TabPageLayout.addMultiCellWidget(self.PrintButton,1,1,0,1) - self.Tabs.insertTab(self.TabPage,QString("")) + self.Tabs.insertTab(self.TabPage,QString.fromLatin1("")) self.StatusTab = QWidget(self.Tabs,"StatusTab") StatusTabLayout = QGridLayout(self.StatusTab,1,1,11,6,"StatusTabLayout") @@ -94,7 +94,7 @@ class DevMgr4_base(QMainWindow): StatusGroupBoxLayout.addWidget(self.StatusText,0,0) self.StatusIcon = QLabel(self.StatusGroupBox,"StatusIcon") - self.StatusIcon.setSizePolicy(QSizePolicy(0,0,0,0,self.StatusIcon.sizePolicy().hasHeightForWidth())) + self.StatusIcon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.StatusIcon.sizePolicy().hasHeightForWidth())) self.StatusIcon.setMinimumSize(QSize(32,32)) self.StatusIcon.setMaximumSize(QSize(32,32)) self.StatusIcon.setScaledContents(1) @@ -134,7 +134,7 @@ class DevMgr4_base(QMainWindow): groupBox3Layout.addWidget(self.StatusHistoryList,0,0) StatusTabLayout.addWidget(self.groupBox3,1,0) - self.Tabs.insertTab(self.StatusTab,QString("")) + self.Tabs.insertTab(self.StatusTab,QString.fromLatin1("")) self.TabPage_2 = QWidget(self.Tabs,"TabPage_2") TabPageLayout_2 = QGridLayout(self.TabPage_2,1,1,11,6,"TabPageLayout_2") @@ -155,7 +155,7 @@ class DevMgr4_base(QMainWindow): TabPageLayout_2.addWidget(self.CancelPrintJobButton,1,1) spacer12_3 = QSpacerItem(471,20,QSizePolicy.Expanding,QSizePolicy.Minimum) TabPageLayout_2.addItem(spacer12_3,1,0) - self.Tabs.insertTab(self.TabPage_2,QString("")) + self.Tabs.insertTab(self.TabPage_2,QString.fromLatin1("")) self.SuppliesTab = QWidget(self.Tabs,"SuppliesTab") SuppliesTabLayout = QGridLayout(self.SuppliesTab,1,1,11,6,"SuppliesTabLayout") @@ -171,7 +171,7 @@ class DevMgr4_base(QMainWindow): self.textLabel1_2 = QLabel(self.SuppliesTab,"textLabel1_2") SuppliesTabLayout.addWidget(self.textLabel1_2,0,0) - self.Tabs.insertTab(self.SuppliesTab,QString("")) + self.Tabs.insertTab(self.SuppliesTab,QString.fromLatin1("")) self.MaintTab = QWidget(self.Tabs,"MaintTab") MaintTabLayout = QGridLayout(self.MaintTab,1,1,11,6,"MaintTabLayout") @@ -241,7 +241,7 @@ class DevMgr4_base(QMainWindow): MaintTabLayout.addWidget(self.groupBox4,0,0) spacer13_2 = QSpacerItem(20,170,QSizePolicy.Minimum,QSizePolicy.Expanding) MaintTabLayout.addItem(spacer13_2,3,0) - self.Tabs.insertTab(self.MaintTab,QString("")) + self.Tabs.insertTab(self.MaintTab,QString.fromLatin1("")) self.TabPage_3 = QWidget(self.Tabs,"TabPage_3") TabPageLayout_3 = QGridLayout(self.TabPage_3,1,1,11,6,"TabPageLayout_3") @@ -254,7 +254,7 @@ class DevMgr4_base(QMainWindow): groupBox9_2Layout.setAlignment(Qt.AlignTop) self.Panel = QLabel(self.groupBox9_2,"Panel") - self.Panel.setSizePolicy(QSizePolicy(0,0,0,0,self.Panel.sizePolicy().hasHeightForWidth())) + self.Panel.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Panel.sizePolicy().hasHeightForWidth())) self.Panel.setMinimumSize(QSize(254,40)) self.Panel.setMaximumSize(QSize(254,40)) self.Panel.setFrameShape(QLabel.NoFrame) @@ -271,13 +271,13 @@ class DevMgr4_base(QMainWindow): groupBox9_2Layout.addItem(spacer14_2,1,0) TabPageLayout_3.addWidget(self.groupBox9_2,0,0) - self.Tabs.insertTab(self.TabPage_3,QString("")) + self.Tabs.insertTab(self.TabPage_3,QString.fromLatin1("")) self.InfoTab = QWidget(self.Tabs,"InfoTab") InfoTabLayout = QGridLayout(self.InfoTab,1,1,11,6,"InfoTabLayout") self.groupBox11 = QGroupBox(self.InfoTab,"groupBox11") - self.groupBox11.setSizePolicy(QSizePolicy(5,5,0,0,self.groupBox11.sizePolicy().hasHeightForWidth())) + self.groupBox11.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred,0,0,self.groupBox11.sizePolicy().hasHeightForWidth())) self.groupBox11.setColumnLayout(0,Qt.Vertical) self.groupBox11.layout().setSpacing(6) self.groupBox11.layout().setMargin(11) @@ -287,7 +287,7 @@ class DevMgr4_base(QMainWindow): self.AdvInfoList = QListView(self.groupBox11,"AdvInfoList") self.AdvInfoList.addColumn(self.__tr("Key")) self.AdvInfoList.addColumn(self.__tr("Value")) - self.AdvInfoList.setSizePolicy(QSizePolicy(7,7,0,0,self.AdvInfoList.sizePolicy().hasHeightForWidth())) + self.AdvInfoList.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding,0,0,self.AdvInfoList.sizePolicy().hasHeightForWidth())) self.AdvInfoList.setAllColumnsShowFocus(1) groupBox11Layout.addWidget(self.AdvInfoList,0,0) @@ -334,7 +334,7 @@ class DevMgr4_base(QMainWindow): groupBox9Layout.addWidget(self.OpenEmbeddedBrowserButton,1,1) InfoTabLayout.addWidget(self.groupBox9,2,0) - self.Tabs.insertTab(self.InfoTab,QString("")) + self.Tabs.insertTab(self.InfoTab,QString.fromLatin1("")) DevMgr4_baseLayout.addWidget(self.splitter2,0,0) diff --git a/ui/form1.py b/ui/form1.py deleted file mode 100644 index 3ec2fa2c3..000000000 --- a/ui/form1.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/form1.ui' -# -# Created: Thu Jan 20 09:35:46 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.12 -# -# WARNING! All changes made in this file will be lost! - - -import sys -from qt import * - - -class Form1(QDialog): - def __init__(self,parent = None,name = None,modal = 0,fl = 0): - QDialog.__init__(self,parent,name,modal,fl) - - if not name: - self.setName("Form1") - - - Form1Layout = QGridLayout(self,1,1,11,6,"Form1Layout") - - self.pushButton1 = QPushButton(self,"pushButton1") - - Form1Layout.addWidget(self.pushButton1,0,0) - - self.languageChange() - - self.resize(QSize(124,53).expandedTo(self.minimumSizeHint())) - self.clearWState(Qt.WState_Polished) - - self.connect(self.pushButton1,SIGNAL("clicked()"),self,SLOT("close()")) - - - def languageChange(self): - self.setCaption(self.__tr("hpguid")) - self.pushButton1.setText(self.__tr("Close")) - - - def __tr(self,s,c = None): - return qApp.translate("Form1",s,c) - -if __name__ == "__main__": - a = QApplication(sys.argv) - QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()")) - w = Form1() - a.setMainWidget(w) - w.show() - a.exec_loop() diff --git a/ui/form1.ui b/ui/form1.ui deleted file mode 100644 index d10c38aa0..000000000 --- a/ui/form1.ui +++ /dev/null @@ -1,41 +0,0 @@ -<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> -<class>Form1</class> -<widget class="QDialog"> - <property name="name"> - <cstring>Form1</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>124</width> - <height>53</height> - </rect> - </property> - <property name="caption"> - <string>hpguid</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QPushButton" row="0" column="0"> - <property name="name"> - <cstring>pushButton1</cstring> - </property> - <property name="text"> - <string>Close</string> - </property> - </widget> - </grid> -</widget> -<connections> - <connection> - <sender>pushButton1</sender> - <signal>clicked()</signal> - <receiver>Form1</receiver> - <slot>close()</slot> - </connection> -</connections> -<layoutdefaults spacing="6" margin="11"/> -</UI> diff --git a/ui/imagepropertiesdlg_base.py b/ui/imagepropertiesdlg_base.py index 8f5eab914..785a6d3bb 100644 --- a/ui/imagepropertiesdlg_base.py +++ b/ui/imagepropertiesdlg_base.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/pparks/linux-imaging-and-printing/src/ui/imagepropertiesdlg_base.ui' +# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/imagepropertiesdlg_base.ui' # -# Created: Thu Mar 10 14:15:39 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:29 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -38,7 +38,7 @@ class ImagePropertiesDlg_base(QDialog): self.EXifDataListView.addColumn(self.__tr("EXIF Labels")) self.EXifDataListView.header().setResizeEnabled(0,self.EXifDataListView.header().count() - 1) self.EXifDataListView.addColumn(self.__tr("Contents ")) - self.EXifDataListView.setSizePolicy(QSizePolicy(7,7,0,0,self.EXifDataListView.sizePolicy().hasHeightForWidth())) + self.EXifDataListView.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding,0,0,self.EXifDataListView.sizePolicy().hasHeightForWidth())) self.EXifDataListView.setMinimumSize(QSize(400,100)) self.EXifDataListView.setFrameShadow(QListView.Sunken) self.EXifDataListView.setResizeMode(QListView.AllColumns) diff --git a/ui/loadpaperform_base.py b/ui/loadpaperform_base.py index 7b60604b2..265fd92a1 100644 --- a/ui/loadpaperform_base.py +++ b/ui/loadpaperform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/loadpaperform_base.ui' # -# Created: Thu Jan 20 09:35:47 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.12 +# Created: Fri Apr 1 14:51:29 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -38,7 +38,7 @@ class LoadPaperForm_base(QDialog): LoadPaperForm_baseLayout.addMultiCellWidget(self.textLabel7,0,0,1,3) self.Icon = QLabel(self,"Icon") - self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth())) + self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth())) self.Icon.setScaledContents(1) LoadPaperForm_baseLayout.addWidget(self.Icon,0,0) @@ -48,8 +48,8 @@ class LoadPaperForm_base(QDialog): self.resize(QSize(621,178).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.CancelButton,SIGNAL("clicked()"),self,SLOT("reject()")) - self.connect(self.ContinueButton,SIGNAL("clicked()"),self,SLOT("accept()")) + self.connect(self.CancelButton,SIGNAL("clicked()"),self.reject) + self.connect(self.ContinueButton,SIGNAL("clicked()"),self.accept) def languageChange(self): diff --git a/ui/nodevicesform_base.py b/ui/nodevicesform_base.py index 77499ba1b..93cf349f8 100644 --- a/ui/nodevicesform_base.py +++ b/ui/nodevicesform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/nodevicesform_base.ui' # -# Created: Thu Jan 20 09:35:48 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.12 +# Created: Fri Apr 1 14:51:29 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -23,7 +23,7 @@ class NoDevicesForm_base(QDialog): NoDevicesForm_baseLayout = QGridLayout(self,1,1,11,6,"NoDevicesForm_baseLayout") self.Icon = QLabel(self,"Icon") - self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth())) + self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth())) self.Icon.setFrameShape(QLabel.NoFrame) self.Icon.setScaledContents(1) diff --git a/ui/paperedgealignform_base.py b/ui/paperedgealignform_base.py index 01110fb20..dd5a4e3a2 100644 --- a/ui/paperedgealignform_base.py +++ b/ui/paperedgealignform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/paperedgealignform_base.ui' # -# Created: Thu Jan 20 09:35:46 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.12 +# Created: Fri Apr 1 14:51:28 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -37,7 +37,7 @@ class PaperEdgeAlignForm_base(QDialog): PaperEdgeAlignForm_baseLayout.addWidget(self.CancelButton,1,2) self.buttonGroup = QButtonGroup(self,"buttonGroup") - self.buttonGroup.setSizePolicy(QSizePolicy(1,5,0,0,self.buttonGroup.sizePolicy().hasHeightForWidth())) + self.buttonGroup.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Preferred,0,0,self.buttonGroup.sizePolicy().hasHeightForWidth())) self.buttonGroup.setColumnLayout(0,Qt.Vertical) self.buttonGroup.layout().setSpacing(6) self.buttonGroup.layout().setMargin(11) @@ -89,7 +89,7 @@ class PaperEdgeAlignForm_base(QDialog): buttonGroupLayout.addMultiCellLayout(layout24,1,1,0,1) self.Icon = QLabel(self.buttonGroup,"Icon") - self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth())) + self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth())) self.Icon.setScaledContents(1) buttonGroupLayout.addWidget(self.Icon,0,0) @@ -106,8 +106,8 @@ class PaperEdgeAlignForm_base(QDialog): self.resize(QSize(618,233).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.CancelButton,SIGNAL("clicked()"),self,SLOT("reject()")) - self.connect(self.ContinueButton,SIGNAL("clicked()"),self,SLOT("accept()")) + self.connect(self.CancelButton,SIGNAL("clicked()"),self.reject) + self.connect(self.ContinueButton,SIGNAL("clicked()"),self.accept) self.connect(self.buttonGroup,SIGNAL("clicked(int)"),self.buttonGroup_clicked) diff --git a/ui/settingsdialog.py b/ui/settingsdialog.py index 7616652ff..c4ed4daa8 100644 --- a/ui/settingsdialog.py +++ b/ui/settingsdialog.py @@ -28,34 +28,23 @@ from settingsdialog_base import SettingsDialog_base class SettingsDialog(SettingsDialog_base): def __init__(self, parent = None,name = None,modal = 0,fl = 0): SettingsDialog_base.__init__(self,parent,name,modal,fl) - #self.cleaning_level = cleaning_level - #self.CleaningLevel.setButton( self.cleaning_level ) self.DefaultsButton.setEnabled( False ) - + def PrintCmdChangeButton_clicked(self): - #self.PrintCommand pass - + def ScanCmdChangeButton_clicked(self): - #self.ScanCommand pass - + def AccessPCardCmdChangeButton_clicked(self): - #self.AccessPCardCommand pass - + def SendFaxCmdChangeButton_clicked(self): - #self.SendFaxCommand pass - + def MakeCopiesCmdChangeButton_clicked(self): - #self.MakeCopiesCommand pass - - #def CleaningLevel_clicked(self,a0): - #self.cleaning_level = a0 - # pass - + def DefaultsButton_clicked(self): cmd_print, cmd_scan, cmd_pcard, cmd_copy, cmd_fax = utils.deviceDefaultFunctions() self.PrintCommand.setText( cmd_print ) @@ -66,20 +55,19 @@ class SettingsDialog(SettingsDialog_base): def TabWidget_currentChanged(self,a0): name = str( a0.name() ) - + if name == 'FunctionCommands': self.DefaultsButton.setEnabled( True ) else: self.DefaultsButton.setEnabled( False ) - - + + def EmailTestButton_clicked(self): email_address = str( self.EmailAddress.text() ) smtp_server = str( self.SMTPServer.text() ) s = service.Service() resultCode = s.testEmail(email_address, smtp_server) if resultCode != ERROR_SUCCESS: - log.debug( "Failure-Result_Code: %s" % resultCode ) - # show success/failure dialog + log.debug( "Failure-Result_Code: %s" % resultCode ) log.debug( "Success-Result_Code: %s" % resultCode ) s.close() diff --git a/ui/settingsdialog_base.py b/ui/settingsdialog_base.py index 5a67355f2..e2e09e41f 100644 --- a/ui/settingsdialog_base.py +++ b/ui/settingsdialog_base.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/pparks/linux-imaging-and-printing/src/ui/settingsdialog_base.ui' +# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/settingsdialog_base.ui' # -# Created: Mon Jan 31 15:16:03 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Wed Apr 13 11:15:03 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! @@ -36,26 +36,47 @@ class SettingsDialog_base(QDialog): self.TabWidget = QTabWidget(self,"TabWidget") - self.PopupAlerts = QWidget(self.TabWidget,"PopupAlerts") - PopupAlertsLayout = QGridLayout(self.PopupAlerts,1,1,11,6,"PopupAlertsLayout") + self.CleaningLevels = QWidget(self.TabWidget,"CleaningLevels") + CleaningLevelsLayout = QGridLayout(self.CleaningLevels,1,1,11,6,"CleaningLevelsLayout") + + self.textLabel3_2_2 = QLabel(self.CleaningLevels,"textLabel3_2_2") + + CleaningLevelsLayout.addWidget(self.textLabel3_2_2,0,0) + + self.line1_2_2 = QFrame(self.CleaningLevels,"line1_2_2") + self.line1_2_2.setFrameShape(QFrame.HLine) + self.line1_2_2.setFrameShadow(QFrame.Sunken) + self.line1_2_2.setFrameShape(QFrame.HLine) - self.textLabel3 = QLabel(self.PopupAlerts,"textLabel3") + CleaningLevelsLayout.addWidget(self.line1_2_2,1,0) + spacer8 = QSpacerItem(20,200,QSizePolicy.Minimum,QSizePolicy.Expanding) + CleaningLevelsLayout.addItem(spacer8,3,0) + + self.CleaningLevel = QButtonGroup(self.CleaningLevels,"CleaningLevel") + self.CleaningLevel.setColumnLayout(0,Qt.Vertical) + self.CleaningLevel.layout().setSpacing(6) + self.CleaningLevel.layout().setMargin(11) + CleaningLevelLayout = QGridLayout(self.CleaningLevel.layout()) + CleaningLevelLayout.setAlignment(Qt.AlignTop) + spacer9_2 = QSpacerItem(181,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + CleaningLevelLayout.addItem(spacer9_2,0,1) - PopupAlertsLayout.addWidget(self.textLabel3,0,0) + layout7 = QHBoxLayout(None,0,6,"layout7") - self.line1 = QFrame(self.PopupAlerts,"line1") - self.line1.setFrameShape(QFrame.HLine) - self.line1.setFrameShadow(QFrame.Sunken) - self.line1.setFrameShape(QFrame.HLine) + self.AutoRefreshRate = QSpinBox(self.CleaningLevel,"AutoRefreshRate") + self.AutoRefreshRate.setWrapping(1) + self.AutoRefreshRate.setButtonSymbols(QSpinBox.PlusMinus) + self.AutoRefreshRate.setMaxValue(360) + self.AutoRefreshRate.setMinValue(5) + layout7.addWidget(self.AutoRefreshRate) - PopupAlertsLayout.addWidget(self.line1,1,0) + self.textLabel1_3 = QLabel(self.CleaningLevel,"textLabel1_3") + layout7.addWidget(self.textLabel1_3) - self.PopupCheckBox = QCheckBox(self.PopupAlerts,"PopupCheckBox") + CleaningLevelLayout.addLayout(layout7,0,0) - PopupAlertsLayout.addWidget(self.PopupCheckBox,2,0) - spacer7 = QSpacerItem(21,171,QSizePolicy.Minimum,QSizePolicy.Expanding) - PopupAlertsLayout.addItem(spacer7,3,0) - self.TabWidget.insertTab(self.PopupAlerts,QString("")) + CleaningLevelsLayout.addWidget(self.CleaningLevel,2,0) + self.TabWidget.insertTab(self.CleaningLevels,QString.fromLatin1("")) self.EmailAlerts = QWidget(self.TabWidget,"EmailAlerts") EmailAlertsLayout = QGridLayout(self.EmailAlerts,1,1,11,6,"EmailAlertsLayout") @@ -130,49 +151,7 @@ class SettingsDialog_base(QDialog): EmailAlertsLayout.addWidget(self.EmailTestButton,7,0) spacer12 = QSpacerItem(20,20,QSizePolicy.Minimum,QSizePolicy.Expanding) EmailAlertsLayout.addItem(spacer12,8,0) - self.TabWidget.insertTab(self.EmailAlerts,QString("")) - - self.CleaningLevels = QWidget(self.TabWidget,"CleaningLevels") - CleaningLevelsLayout = QGridLayout(self.CleaningLevels,1,1,11,6,"CleaningLevelsLayout") - - self.textLabel3_2_2 = QLabel(self.CleaningLevels,"textLabel3_2_2") - - CleaningLevelsLayout.addWidget(self.textLabel3_2_2,0,0) - - self.line1_2_2 = QFrame(self.CleaningLevels,"line1_2_2") - self.line1_2_2.setFrameShape(QFrame.HLine) - self.line1_2_2.setFrameShadow(QFrame.Sunken) - self.line1_2_2.setFrameShape(QFrame.HLine) - - CleaningLevelsLayout.addWidget(self.line1_2_2,1,0) - spacer8 = QSpacerItem(20,200,QSizePolicy.Minimum,QSizePolicy.Expanding) - CleaningLevelsLayout.addItem(spacer8,3,0) - - self.CleaningLevel = QButtonGroup(self.CleaningLevels,"CleaningLevel") - self.CleaningLevel.setColumnLayout(0,Qt.Vertical) - self.CleaningLevel.layout().setSpacing(6) - self.CleaningLevel.layout().setMargin(11) - CleaningLevelLayout = QGridLayout(self.CleaningLevel.layout()) - CleaningLevelLayout.setAlignment(Qt.AlignTop) - spacer9_2 = QSpacerItem(181,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - CleaningLevelLayout.addItem(spacer9_2,0,1) - - layout7 = QHBoxLayout(None,0,6,"layout7") - - self.AutoRefreshRate = QSpinBox(self.CleaningLevel,"AutoRefreshRate") - self.AutoRefreshRate.setWrapping(1) - self.AutoRefreshRate.setButtonSymbols(QSpinBox.PlusMinus) - self.AutoRefreshRate.setMaxValue(360) - self.AutoRefreshRate.setMinValue(5) - layout7.addWidget(self.AutoRefreshRate) - - self.textLabel1_3 = QLabel(self.CleaningLevel,"textLabel1_3") - layout7.addWidget(self.textLabel1_3) - - CleaningLevelLayout.addLayout(layout7,0,0) - - CleaningLevelsLayout.addWidget(self.CleaningLevel,2,0) - self.TabWidget.insertTab(self.CleaningLevels,QString("")) + self.TabWidget.insertTab(self.EmailAlerts,QString.fromLatin1("")) self.FunctionCommands = QWidget(self.TabWidget,"FunctionCommands") FunctionCommandsLayout = QGridLayout(self.FunctionCommands,1,1,11,6,"FunctionCommandsLayout") @@ -255,7 +234,7 @@ class SettingsDialog_base(QDialog): FunctionCommandsLayout.addItem(spacer8_2,13,1) spacer9 = QSpacerItem(20,81,QSizePolicy.Minimum,QSizePolicy.Expanding) FunctionCommandsLayout.addItem(spacer9,12,0) - self.TabWidget.insertTab(self.FunctionCommands,QString("")) + self.TabWidget.insertTab(self.FunctionCommands,QString.fromLatin1("")) SettingsDialog_baseLayout.addMultiCellWidget(self.TabWidget,0,0,0,3) spacer40 = QSpacerItem(430,20,QSizePolicy.Expanding,QSizePolicy.Minimum) @@ -280,8 +259,7 @@ class SettingsDialog_base(QDialog): self.setTabOrder(self.TabWidget,self.pushButton30) self.setTabOrder(self.pushButton30,self.pushButton32) self.setTabOrder(self.pushButton32,self.pushButton31) - self.setTabOrder(self.pushButton31,self.PopupCheckBox) - self.setTabOrder(self.PopupCheckBox,self.EmailAddress) + self.setTabOrder(self.pushButton31,self.EmailAddress) self.setTabOrder(self.EmailAddress,self.SMTPServer) self.setTabOrder(self.SMTPServer,self.Username) self.setTabOrder(self.Username,self.Password) @@ -301,9 +279,10 @@ class SettingsDialog_base(QDialog): self.pushButton30.setText(self.__tr("OK")) self.pushButton32.setText(self.__tr("Help")) self.pushButton31.setText(self.__tr("Cancel")) - self.textLabel3.setText(self.__tr("<b>Configure if the HP Device Manager will popup on alerts</b>")) - self.PopupCheckBox.setText(self.__tr("Popup Device Manager when status alerts occur")) - self.TabWidget.changeTab(self.PopupAlerts,self.__tr("Popup Alerts")) + self.textLabel3_2_2.setText(self.__tr("<b>Configure the rate at which devices are automaically refreshed</b>")) + self.CleaningLevel.setTitle(self.__tr("Auto refresh rate")) + self.textLabel1_3.setText(self.__tr("seconds")) + self.TabWidget.changeTab(self.CleaningLevels,self.__tr("Auto Refresh")) self.textLabel3_2.setText(self.__tr("<b>Configure if the HP Device Manager will send email on alerts</b>")) self.textLabel21.setText(self.__tr("SMTP server name:")) self.textLabel20.setText(self.__tr("Email address(es):")) @@ -313,10 +292,6 @@ class SettingsDialog_base(QDialog): self.EmailCheckBox.setText(self.__tr("Send email when status alerts occur:")) self.EmailTestButton.setText(self.__tr("Test")) self.TabWidget.changeTab(self.EmailAlerts,self.__tr("Email Alerts")) - self.textLabel3_2_2.setText(self.__tr("<b>Configure the rate at which devices are automaically refreshed</b>")) - self.CleaningLevel.setTitle(self.__tr("Auto refresh rate")) - self.textLabel1_3.setText(self.__tr("seconds")) - self.TabWidget.changeTab(self.CleaningLevels,self.__tr("Auto Refresh")) self.textLabel3_2_2_2.setText(self.__tr("<b>Configure what commands to run for device functions</b>")) self.textLabel1_2.setText(self.__tr("Print Command")) self.textLabel1_2_2.setText(self.__tr("Scan Command")) diff --git a/ui/settingsdialog_base.ui b/ui/settingsdialog_base.ui index 93d9f14ef..c9f03aee5 100644 --- a/ui/settingsdialog_base.ui +++ b/ui/settingsdialog_base.ui @@ -49,10 +49,10 @@ </property> <widget class="QWidget"> <property name="name"> - <cstring>PopupAlerts</cstring> + <cstring>CleaningLevels</cstring> </property> <attribute name="title"> - <string>Popup Alerts</string> + <string>Auto Refresh</string> </attribute> <grid> <property name="name"> @@ -60,15 +60,15 @@ </property> <widget class="QLabel" row="0" column="0"> <property name="name"> - <cstring>textLabel3</cstring> + <cstring>textLabel3_2_2</cstring> </property> <property name="text"> - <string><b>Configure if the HP Device Manager will popup on alerts</b></string> + <string><b>Configure the rate at which devices are automaically refreshed</b></string> </property> </widget> <widget class="Line" row="1" column="0"> <property name="name"> - <cstring>line1</cstring> + <cstring>line1_2_2</cstring> </property> <property name="frameShape"> <enum>HLine</enum> @@ -80,17 +80,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> - <property name="name"> - <cstring>PopupCheckBox</cstring> - </property> - <property name="text"> - <string>Popup Device Manager when status alerts occur</string> - </property> - </widget> <spacer row="3" column="0"> <property name="name"> - <cstring>spacer7</cstring> + <cstring>spacer8</cstring> </property> <property name="orientation"> <enum>Vertical</enum> @@ -100,11 +92,76 @@ </property> <property name="sizeHint"> <size> - <width>21</width> - <height>171</height> + <width>20</width> + <height>200</height> </size> </property> </spacer> + <widget class="QButtonGroup" row="2" column="0"> + <property name="name"> + <cstring>CleaningLevel</cstring> + </property> + <property name="title"> + <string>Auto refresh rate</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <spacer row="0" column="1"> + <property name="name"> + <cstring>spacer9_2</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>181</width> + <height>20</height> + </size> + </property> + </spacer> + <widget class="QLayoutWidget" row="0" column="0"> + <property name="name"> + <cstring>layout7</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QSpinBox"> + <property name="name"> + <cstring>AutoRefreshRate</cstring> + </property> + <property name="wrapping"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>PlusMinus</enum> + </property> + <property name="maxValue"> + <number>360</number> + </property> + <property name="minValue"> + <number>5</number> + </property> + </widget> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel1_3</cstring> + </property> + <property name="text"> + <string>seconds</string> + </property> + </widget> + </hbox> + </widget> + </grid> + </widget> </grid> </widget> <widget class="QWidget"> @@ -299,123 +356,6 @@ </widget> <widget class="QWidget"> <property name="name"> - <cstring>CleaningLevels</cstring> - </property> - <attribute name="title"> - <string>Auto Refresh</string> - </attribute> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLabel" row="0" column="0"> - <property name="name"> - <cstring>textLabel3_2_2</cstring> - </property> - <property name="text"> - <string><b>Configure the rate at which devices are automaically refreshed</b></string> - </property> - </widget> - <widget class="Line" row="1" column="0"> - <property name="name"> - <cstring>line1_2_2</cstring> - </property> - <property name="frameShape"> - <enum>HLine</enum> - </property> - <property name="frameShadow"> - <enum>Sunken</enum> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - </widget> - <spacer row="3" column="0"> - <property name="name"> - <cstring>spacer8</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>200</height> - </size> - </property> - </spacer> - <widget class="QButtonGroup" row="2" column="0"> - <property name="name"> - <cstring>CleaningLevel</cstring> - </property> - <property name="title"> - <string>Auto refresh rate</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <spacer row="0" column="1"> - <property name="name"> - <cstring>spacer9_2</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>181</width> - <height>20</height> - </size> - </property> - </spacer> - <widget class="QLayoutWidget" row="0" column="0"> - <property name="name"> - <cstring>layout7</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QSpinBox"> - <property name="name"> - <cstring>AutoRefreshRate</cstring> - </property> - <property name="wrapping"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>PlusMinus</enum> - </property> - <property name="maxValue"> - <number>360</number> - </property> - <property name="minValue"> - <number>5</number> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel1_3</cstring> - </property> - <property name="text"> - <string>seconds</string> - </property> - </widget> - </hbox> - </widget> - </grid> - </widget> - </grid> - </widget> - <widget class="QWidget"> - <property name="name"> <cstring>FunctionCommands</cstring> </property> <attribute name="title"> @@ -714,7 +654,6 @@ <tabstop>pushButton30</tabstop> <tabstop>pushButton32</tabstop> <tabstop>pushButton31</tabstop> - <tabstop>PopupCheckBox</tabstop> <tabstop>EmailAddress</tabstop> <tabstop>SMTPServer</tabstop> <tabstop>Username</tabstop> diff --git a/ui/unloadform_base.py b/ui/unloadform_base.py index d44e7df5f..b8003f720 100644 --- a/ui/unloadform_base.py +++ b/ui/unloadform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/unloadform_base.ui' # -# Created: Wed Feb 23 13:21:57 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:29 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! diff --git a/ui/waitform_base.py b/ui/waitform_base.py index 8614b670e..7319e3af7 100644 --- a/ui/waitform_base.py +++ b/ui/waitform_base.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/waitform_base.ui' # -# Created: Tue Jan 25 11:22:49 2005 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Fri Apr 1 14:51:32 2005 +# by: The PyQt User Interface Compiler (pyuic) 3.14.1 # # WARNING! All changes made in this file will be lost! |