← Back to branch summary

~ubuntu-branches/ubuntu/saucy/hplip/saucy-proposed

« back to all changes in this revision

Viewing changes to prnt/hpcups/LidilPrintModes.h

  • Committer: Bazaar Package Importer
  • Author(s): Till Kamppeter
  • Date: 2011-05-26 13:33:18 UTC
  • mfrom: (1.5.1 upstream) (23 sid)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20110526133318-prm4m56loh0i11vv
Tags: 3.11.5-0ubuntu1
https://launchpad.net/bugs/405116
https://launchpad.net/bugs/754383
https://launchpad.net/bugs/776509
https://launchpad.net/bugs/235399
https://launchpad.net/bugs/787580
* New upstream release
   o Added LEDM ADF Scan support
   o Added LEDM Wireless support
   o "/cupsInteger0 <PCL page size number>" is added to the PageSize option
     of the hpcups driver, not only in PageRegion (Upstream fix for Debian
     bug #518227, LP: #405116, Red Hat bug #518756).
   o Fixed HP Laserjet 1020 printing negative images and photos (LP: #754383).
   o ADF now recognised on HP Officejet Pro 8500 A910a (LP: #776509).
   o Added new option "Installed Cartridges" to enable users to select
     correct installed cartridges for printing (Partial upstream fix for
     LP: #235399, currently only applied to the hpcups driver, for the hpijs
     driver we continue with the Debian/Ubuntu patch).
   o Margin issues fixed on HP OfficeJet 7500 E910, 6500 e710n-z, LaserJet
     m1319f MFP
   o Removed scan icon in toolbox for HP Color LaserJet CM4540 MFP (scanner
     is network-only).
   o Fixed "Download Firmware" link in Action tab with HP LaserJet P1566.
   o Redundant PostScript PPDs are removed.
   o Added support for: HP Designjet T790ps 24in/44in, T1300 Postscript,
     LaserJet M4555 MFP, LaserJet Professional m1214nfh MFP
* debian/patches/add-lidil-two-cartridge-modes.dpatch: Adapted to the partial
  upstream fix.
* debian/patches/workaround-sf-server-bug-for-plugin-index-download.dpatch:
  Removed, fixed upstream.
* debian/rules: Removed modification of the PPD generator for hpcups, as
  the missing "/cupsInteger0 <PCL page size number>" in the PostScript code
  of the PageSize option is fixed upstream.
* debian/patches/large-sizes-borderless-on-photosmart-pro-b-series.dpatch:
  The HP PhotoSmart Pro B 8xxx printers are capable of borderless printing
  on all paper sizes including the large formats. The HPLIP-supplied PPD
  allowed borderless only up to Legal size (LP: #787580).
* debian/patches/more-user-friendly-choice-names-for-installed-cartridges.dpatch:
  Make the menu entry strings for the "Installed Cartridges" option (on LIDIL
  printers) more user-friendly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
prnt/hpcups/LidilPrintModes.h
2
2
#include "dj3320PrintModes.h"
3
3
#include "dj4100PrintModes.h"
4
4
 
 
5
 
 
6
/*PQ_Cartridge_Map contains the PrintMode Index value present in PrintMode Array for all combinations of PQ and Installed Cartridges*/
 
7
/*-1 means the combination is not possible*/
 
8
int PQ_Cartridge_Map[][5]={
 
9
                                /*BlackColor*/       /*TriColor*/      /*PhotoColor*/   /*Black+TriColor*/   /*Photo+TriColor*/
 
10
/*Normal Color*/           {           1,                  4,                1,                 1,                   9},  
 
11
                                                
 
12
/*Normal Grey*/            {           6,                  6,                6,                 6,                   7},  
 
13
 
 
14
/*Draft Color*/            {           0,                  3,                0,                 0,                   8},  
 
15
 
 
16
/*Draft Grey*/             {           5,                  5,                5,                 5,                   5}, 
 
17
                                                
 
18
/*High Resolution Photo*/  {           2,                  2,                2,                 2,                  10},  
 
19
};
 
20
 
 
21
int PQ_Cartridge_Map_ViperTrim[][5]={
 
22
                                /*BlackColor*/       /*TriColor*/      /*PhotoColor*/   /*Black+TriColor*/   /*Photo+TriColor*/
 
23
/*Normal Color*/           {           4,                  4,                4,                 4,                   4},  
 
24
                                                
 
25
/*Normal Grey*/            {           6,                  6,                6,                 6,                   7},  
 
26
 
 
27
/*Draft Color*/            {           3,                  3,                3,                 3,                   3},  
 
28
 
 
29
/*Draft Grey*/             {           5,                  5,                5,                 5,                   5}, 
 
30
                                                
 
31
/*High Resolution Photo*/  {           2,                  2,                2,                 2,                  10},  
 
32
};
 
33
 
 
34
 
 
35
#if 0
 
36
 
 
37
/*PQ_Cartridge_Map contains the PrintMode Index value present in PrintMode Array for all combinations of PQ and Installed Cartridges*/
 
38
/*-1 means the combination is not possible*/
 
39
int PQ_Cartridge_Map[][5]={
 
40
                                /*BlackColor*/       /*TriColor*/      /*PhotoColor*/   /*Black+TriColor*/   /*Photo+TriColor*/
 
41
/*Normal Color*/           {          -1,                  4,               -1,                 1,                   9},  
 
42
                                                
 
43
/*Normal Grey*/            {           6,                 -1,                6,                 6,                   7},  
 
44
 
 
45
/*Draft Color*/            {          -1,                  3,               -1,                 0,                   8},  
 
46
 
 
47
/*Draft Grey*/             {           5,                 -1,               -1,                 5,                  -1}, 
 
48
                                                
 
49
/*High Resolution Photo*/  {          -1,                  2,               -1,                 2,                  10},  
 
50
};
 
51
 
 
52
#endif
 
53
 
 
54
 
5
55
PrintModeTable lidil_print_modes_table [] =
6
56
{
7
57
    {"dj3320", dj3320PrintModes, sizeof(dj3320PrintModes)/sizeof(PrintMode)},