Commit 9c780c43 authored by Didier Raboud's avatar Didier Raboud

Imported Upstream version 2.8.12

parent d29ae37b

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -32,13 +32,14 @@ endif
if HPLIP_BUILD
dist_hplip_SCRIPTS = hpssd.py __init__.py
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
dist_noinst_DATA += scan/sane/hpaio.desc prnt/drv/hpijs.drv.in.template
dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install
cmddir = $(hplipdir)
dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
sendfax.py setup.py makecopies.py probe.py timedate.py firmware.py scan.py systray.py plugin.py
sendfax.py setup.py makecopies.py probe.py timedate.py firmware.py scan.py systray.py plugin.py linefeedcal.py pqdiag.py \
faxsetup.py devicesetup.py printsettings.py
# hp backend.
hpdir = $(cupsbackenddir)
......@@ -234,6 +235,8 @@ hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
# hpmud.rules
rulesdir = /etc/udev/rules.d
dist_rules_DATA = data/rules/55-hpmud.rules
halpredir = /usr/share/hal/fdi/preprobe/10osvendor
dist_halpre_DATA = data/rules/20-hplip-devices.fdi
# ui (qt3)
if GUI_BUILD
......@@ -331,7 +334,8 @@ endif
noinst_PROGRAMS += hppgsz
hppgsz_SOURCES = $(apdk_SOURCES) prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h
hppgsz_CXXFLAGS = $(hpijs_CXXFLAGS)
hppgsz_CFLAGS = $(hpijs_CXXFLAGS) -Iprnt/hpijs
#hppgsz_CFLAGS = $(hpijs_CXXFLAGS) -Iprnt/hpijs
hppgsz_CFLAGS = $(hpijs_CFLAGS)
hppgsz_LDADD = $(hpijs_LDADD)
# hplip.desktop
......@@ -397,10 +401,11 @@ hpijs_CXXFLAGS = -DAPDK_DJ660 -DAPDK_DJ6xx -DAPDK_DJ6xxPhoto -DAPDK_DJ8xx -DAPDK
-DAPDK_HIGH_RES_MODES -DAPDK_LJMONO -DAPDK_DJ540 -DAPDK_DJ850 -DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \
-DAPDK_LJJETREADY -DAPDK_LJFASTRASTER -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \
-DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LJZJS_MONO -DAPDK_LJM1005 -DAPDK_QUICKCONNECT \
$(APDK_ENDIAN_FLAG) $(APDK_AUTO_INCLUDE_FLAG) -DAPDK_LINUX -DNDEBUG
hpijs_CFLAGS = $(hpijs_CXXFLAGS) -Iprnt/hpijs
$(APDK_ENDIAN_FLAG) $(APDK_AUTO_INCLUDE_FLAG) -DAPDK_LINUX -DNDEBUG $(DBUS_CFLAGS)
hpijs_CFLAGS = $(hpijs_CXXFLAGS) -Iprnt/hpijs
if HPLIP_BUILD
hpijs_LDADD = -ljpeg -ldl libhpip.la libhpmud.la
hpijs_LDADD = -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS)
else
hpijs_LDADD = -ljpeg -ldl
endif
......@@ -441,7 +446,11 @@ if HPLIP_BUILD
# Install fax support.
if [ "$(fax_build)" = "yes" ]; then \
mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \
chmod 700 $(DESTDIR)$(hpfaxdir)/hpfax; \
fi
#
# Make backend run as root.
# chmod 700 $(DESTDIR)$(hpdir)/hp
endif # if HPLIP_BUILD
uninstall-hook:
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -39,7 +39,7 @@ from prnt import cups
def enterAlignmentNumber(letter, hortvert, colors, line_count, maximum):
ok, value = tui.enter_range("Enter the best aligned value for line %s (1-%d): " %
ok, value = tui.enter_range("Enter the best aligned value for line %s (1-%d): " %
(letter, maximum),
1,
maximum)
......@@ -50,7 +50,7 @@ def enterAlignmentNumber(letter, hortvert, colors, line_count, maximum):
def enterPaperEdge(maximum):
ok, value = tui.enter_range("Enter numbered arrow that is best aligned with the paper edge (1-%d): "
ok, value = tui.enter_range("Enter numbered arrow that is best aligned with the paper edge (1-%d): "
% maximum,
1,
maximum)
......@@ -61,7 +61,7 @@ def enterPaperEdge(maximum):
def colorAdj(line, maximum):
ok, value = tui.enter_range("Enter the numbered box on line %s that is best color matched to the background color (1-%d): " %
ok, value = tui.enter_range("Enter the numbered box on line %s that is best color matched to the background color (1-%d): " %
(line, maximum),
1,
maximum)
......@@ -107,7 +107,7 @@ def type10and11Align(pattern, align_type):
if not controls[line][0]:
values.append(0)
else:
ok, value = tui.enter_range("Enter the numbered box on line %s where the inner lines best line up with the outer lines (1-%d): "
ok, value = tui.enter_range("Enter the numbered box on line %s where the inner lines best line up with the outer lines (1-%d): "
% (line, controls[line][1]), 1, controls[line][1])
values.append(value)
......@@ -128,10 +128,10 @@ def aioUI2():
try:
mod = module.Module(__mod__, __title__, __version__, __doc__, None,
try:
mod = module.Module(__mod__, __title__, __version__, __doc__, None,
(INTERACTIVE_MODE, GUI_MODE), (UI_TOOLKIT_QT4,))
mod.setUsage(module.USAGE_FLAG_DEVICE_ARGS,
see_also_list=['hp-clean', 'hp-colorcal', 'hp-linefeedcal',
'hp-pqdiag'])
......@@ -139,13 +139,13 @@ try:
opts, device_uri, printer_name, mode, ui_toolkit, lang = \
mod.parseStdOpts()
device_uri = mod.getDeviceUri(device_uri, printer_name,
filter={'align-type': (operator.gt, 0)})
device_uri = mod.getDeviceUri(device_uri, printer_name,
filter={'align-type': (operator.ne, ALIGN_TYPE_NONE)})
if mode == GUI_MODE:
if not utils.canEnterGUIMode4():
log.error("%s -u/--gui requires Qt4 GUI support. Entering interactive mode." % __mod__)
mode = INTERACTIVE_MODE
mode = INTERACTIVE_MODE
if mode == INTERACTIVE_MODE:
try:
......@@ -162,15 +162,14 @@ try:
sys.exit(1)
if d.isIdleAndNoError():
align_type = d.mq.get('align-type', 0)
align_type = d.mq.get('align-type', ALIGN_TYPE_NONE)
log.debug("Alignment type=%d" % align_type)
d.close()
if align_type == ALIGN_TYPE_NONE:
log.error("Alignment not supported or required by device.")
sys.exit(0)
if align_type == ALIGN_TYPE_UNSUPPORTED:
log.error("Alignment through HPLIP not supported for this printer. Please use the printer's front panel to perform cartrdige alignment.")
if align_type == ALIGN_TYPE_AUTO:
elif align_type == ALIGN_TYPE_AUTO:
maint.AlignType1PML(d, tui.load_paper_prompt)
elif align_type == ALIGN_TYPE_AIO:
......@@ -219,8 +218,8 @@ try:
from ui4.aligndialog import AlignDialog
except ImportError:
log.error("Unable to load Qt4 support. Is it installed?")
sys.exit(1)
sys.exit(1)
#try:
if 1:
......
......@@ -87,6 +87,7 @@ STATUS_UNKNOWN = 0
EVENT_MIN_USER_EVENT = 500
EVENT_START_PRINT_JOB = 500 # sent by hp: backend
EVENT_END_PRINT_JOB = 501 # sent by hp: backend
EVENT_PRINT_FAILED_MISSING_PLUGIN = 502
EVENT_START_FAX_PRINT_JOB = 600 # sent by hpfax: backend
EVENT_END_FAX_PRINT_JOB = 601 # sent by hpfax: backend
......@@ -102,6 +103,7 @@ EVENT_FAX_QUEUE_STARTED = 801
EVENT_FAX_QUEUE_REJECTING_JOBS = 802
EVENT_FAX_QUEUE_ACCEPTING_JOBS = 803
EVENT_FAX_QUEUE_SET_AS_DEFAULT = 804
EVENT_FAX_FAILED_MISSING_PLUGIN = 805
STATUS_PRINTER_BASE = 1000
STATUS_PRINTER_IDLE = 1000
......@@ -151,7 +153,7 @@ STATUS_PRINTER_CUSTOM_MEDIA_MISMATCH = 1043
STATUS_PRINTER_PEN_CLEANING = 1044
STATUS_PRINTER_PEN_CHECKING = 1045
# "synthetic" codes
# derived codes
# set to AGENT_TYPE + base (base: 1500=ink, 1600=laser )
STATUS_PRINTER_LOW_INK_BASE = 1500
STATUS_PRINTER_LOW_BLACK_INK = 1501
......@@ -173,7 +175,7 @@ STATUS_PRINTER_LOW_MAGENTA_TONER = 1605
STATUS_PRINTER_LOW_YELLOW_TONER = 1606
# end
# "synthetic" laserjet codes
# derived laserjet codes
STATUS_PRINTER_WARMING_UP = 1800
STATUS_PRINTER_LOW_PAPER = 1801
STATUS_PRINTER_DOOR_OPEN = 1802
......@@ -184,7 +186,7 @@ STATUS_PRINTER_SERVICE_REQUEST = 1806
STATUS_PRINTER_FUSER_ERROR = 1807
#end
# other "synthetic" codes
# other derived codes
STATUS_DEVICE_UNSUPPORTED = 1900
#end
......@@ -192,6 +194,7 @@ STATUS_DEVICE_UNSUPPORTED = 1900
EVENT_START_SCAN_JOB = 2000
EVENT_END_SCAN_JOB = 2001
EVENT_SCANNER_FAIL = 2002
EVENT_SCAN_FAILED_MISSING_PLUGIN = 2003
#end
# fax
......@@ -538,6 +541,7 @@ AGENT_CONFIG_COLOR_AND_GREY = 7
AGENT_CONFIG_INVALID = 99
# align-types
ALIGN_TYPE_UNSUPPORTED = -1
ALIGN_TYPE_NONE = 0
ALIGN_TYPE_AUTO = 1
ALIGN_TYPE_8XX = 2
......@@ -554,12 +558,14 @@ ALIGN_TYPE_OJ_PRO = 12 # OJ Pro L7xxx
ALIGN_TYPE_AIO = 13 # AiO Non-LIDIL (OJ J4500/J4600)
# clean-types
CLEAN_TYPE_UNSUPPORTED = -1
CLEAN_TYPE_NONE = 0
CLEAN_TYPE_PCL = 1
CLEAN_TYPE_LIDIL = 2
CLEAN_TYPE_PCL_WITH_PRINTOUT = 3
# color-cal-types
COLOR_CAL_TYPE_UNSUPPORTED = -1
COLOR_CAL_TYPE_NONE = 0
COLOR_CAL_TYPE_DESKJET_450 = 1
COLOR_CAL_TYPE_MALIBU_CRICK = 2
......@@ -710,6 +716,28 @@ PLUGIN_NONE = 0
PLUGIN_REQUIRED = 1
PLUGIN_OPTIONAL = 2
# plugin-reason
PLUGIN_REASON_NONE = 0x0
PLUGIN_REASON_PRINTING_SUPPORT = 0x1
PLUGIN_REASON_FASTER_PRINTING = 0x2
PLUGIN_REASON_BETTER_PRINTING_PQ = 0x4
PLUGIN_REASON_PRINTING_FEATURES = 0x8
PLUGIN_REASON_RESERVED_10 = 0x10
PLUGIN_REASON_RESERVED_20 = 0x20
PLUGIN_REASON_SCANNING_SUPPORT = 0x40
PLUGIN_REASON_FASTER_SCANNING = 0x80
PLUGIN_REASON_BETTER_SCANNING_IQ = 0x100
PLUGIN_REASON_RESERVED_200 = 0x200
PLUGIN_REASON_RESERVED_400 = 0x400
PLUGIN_REASON_FAXING_SUPPORT = 0x800
PLUGIN_REASON_FAX_FEATURES = 0x1000
PLUGIN_REASON_RESERVED_2000 = 0x2000
PLUGIN_REASON_IO_SUPPORT = 0x4000
PLUGIN_REASON_UI_FEATURES = 0x8000
PLUGIN_REASON_OTHER_FEATURES = 0x10000
PLUGIN_REASON_RESERVED_20000 = 0x20000
PLUGIN_REASON_RESERVED_40000 = 0x40000
# embedded web server
EWS_NONE = 0
EWS_PRESENT = 1
......@@ -719,11 +747,13 @@ PANEL_CHECK_TYPE_NONE = 0
PANEL_CHECK_TYPE_CHECK = 1
# pq diag
PQ_DIAG_TYPE_UNSUPPORTED = -1
PQ_DIAG_TYPE_NONE = 0
PQ_DIAG_TYPE_1 = 1
PQ_DIAG_TYPE_2 = 2
# line feed cal