3 files changed, 427 insertions, 493 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index fe2f084b8c00..a319ff78c01d 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hplip
 PORTVERSION=	3.13.6
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -22,9 +23,9 @@ RUN_DEPENDS=	espgs:${PORTSDIR}/print/cups-pstoraster \
 CONFLICTS_INSTALL=	hpijs-[0-9]*
 
 USE_GHOSTSCRIPT_RUN=	yes
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_GNOME=	pygobject
-USES=		pkgconfig
+USES=		pkgconfig dos2unix
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-foomatic-ppd-install \
@@ -45,7 +46,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
-USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=.+\.(c|cpp|h|py)$
 
 FILES4FIX=	Makefile.in \
@@ -60,8 +60,10 @@ FILES4FIX=	Makefile.in \
 		installer/core_install.py \
 		installer/dcheck.py \
 		installer/distros.dat \
+		installer/pluginhandler.py \
 		io/hpmud/hp-mkuri.c \
 		prnt/cups.py \
+		prnt/filters/hpps \
 		prnt/hpcups/HPCupsFilter.cpp \
 		prnt/hpcups/Utils.cpp \
 		prnt/hpijs/globals.cpp \
@@ -74,65 +76,37 @@ FILES4FIX=	Makefile.in \
 
 OPTIONS_DEFINE=	QT FAX SNMP SCAN XSANE DOCS
 OPTIONS_DEFAULT=	QT
+OPTIONS_SUB=		yes # QT FAX SCAN
+
+QT_DESC=	Graphical User Interface (Qt 4)
+QT_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbussupport
+QT_CONFIGURE_ENABLE=	qt4 gui-build
 
-QT_DESC=	Graphical User Interface (Qt4)
 FAX_DESC=	PC Send Fax support
-SNMP_DESC=	Network/JetDirect support
-SCAN_DESC=	Scanning support
-XSANE_DESC=	Install XSane for scanning (requires SCAN)
+FAX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
+FAX_CONFIGURE_ENABLE=	fax-build
 
-.include <bsd.port.options.mk>
+SNMP_DESC=	Network/JetDirect support
+SNMP_USE=	OPENSSL=yes
+SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_CONFIGURE_ENABLE=	network-build
 
-USB_INCLUDE=	/usr/include
+SCAN_DESC=	Scanning support
+SCAN_LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
+SCAN_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging
+SCAN_CONFIGURE_ENABLE=	scan-build
 
-.if ${PORT_OPTIONS:MQT}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbussupport
-CONFIGURE_ARGS+=	--enable-qt4 \
-			--enable-gui-build
-PLIST_SUB+=	GUI=""
-.else
-CONFIGURE_ARGS+=	--disable-qt4 \
-			--disable-gui-build
-PLIST_SUB+=	GUI="@comment "
-.endif
+XSANE_DESC=	Install XSane for scanning (requires SCAN)
 
-.if ${PORT_OPTIONS:MFAX}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
-CONFIGURE_ARGS+=	--enable-fax-build
-PLIST_SUB+=	FAX=""
-.else
-CONFIGURE_ARGS+=	--disable-fax-build
-PLIST_SUB+=	FAX="@comment "
-.endif
+DOCS_CONFIGURE_ENABLE=	doc-build
 
-.if ${PORT_OPTIONS:MSNMP}
-USE_OPENSSL=	yes
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=	--enable-network-build
-. if ${ARCH} == i386
-# http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/144833
-CONFIGURE_ENV+=	LIBS="-lssp_nonshared"
-. endif
-.else
-CONFIGURE_ARGS+=	--disable-network-build
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSCAN}
 . if ${PORT_OPTIONS:MXSANE}
 RUN_DEPENDS+=	xsane:${PORTSDIR}/graphics/xsane
 . endif
-LIB_DEPENDS+=	libsane.so:${PORTSDIR}/graphics/sane-backends
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging
-CONFIGURE_ARGS+=	--enable-scan-build
-PLIST_SUB+=	SCAN=""
-.else
-CONFIGURE_ARGS+=	--disable-scan-build
-PLIST_SUB+=	SCAN="@comment "
-.endif
-
-.if !${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--enable-doc-build=no
 .endif
 
 post-patch:
@@ -156,19 +130,11 @@ post-patch:
 		-e 's,/usr/share,${LOCALBASE}/share,g' \
 		-e 's,/usr/include,${LOCALBASE}/include,g' \
 		${FILES4FIX:S,^,${WRKSRC}/,}
-	${REINPLACE_CMD} -e 's,%USB_INCLUDE%,${USB_INCLUDE},' \
+	${REINPLACE_CMD} -e 's,%USB_INCLUDE%,/usr/include,' \
 		${WRKSRC}/installer/core_install.py
-	cd ${WRKSRC} && \
-		${REINPLACE_CMD} -e "s,^#!/usr/bin/python,#!/usr/bin/env python," \
-			base/magic.py \
-			config_usb_printer.py \
-			doctor.py \
-			logcapture.py \
-			makeuri.py \
-			setup.py \
-			ui/upgradeform.py \
-			uninstall.py \
-			upgrade.py
+	${FIND} ${WRKSRC} -name '*.py' | ${XARGS} ${SED} -i '' \
+		-e 's,^#!/usr/bin/python,#!${PYTHON_CMD},' \
+		-e 's,^#!/usr/bin/env python,#!${PYTHON_CMD},'
 .if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
 		${WRKSRC}/Makefile.in
diff --git a/print/hplip/files/extrapatch-strnlen b/print/hplip/files/extrapatch-strnlen
deleted file mode 100644
index ef95333c40ec..000000000000
--- a/print/hplip/files/extrapatch-strnlen
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./prnt/hpijs/context2.cpp.orig	2010-09-26 21:03:26.000000000 +0400
-+++ ./prnt/hpijs/context2.cpp	2010-10-30 02:35:47.889256370 +0400
-@@ -38,6 +38,18 @@
- #include "colormatch.h"
- //#include "bug.h"
- 
-+size_t
-+strnlen(const char *s, size_t maxlen)
-+{
-+	size_t len;
-+
-+	for (len = 0; len < maxlen; len++, s++) {
-+		if (!*s)
-+			break;
-+	}
-+	return (len);
-+};
-+
- APDK_BEGIN_NAMESPACE
- extern ColorMatcher* Create_ColorMatcher
- (
---- ./prnt/hpijs/ljzjscolor.cpp.orig	2010-09-26 21:10:31.000000000 +0400
-+++ ./prnt/hpijs/ljzjscolor.cpp	2010-10-30 02:35:49.443533239 +0400
-@@ -38,6 +38,8 @@
- #include "ljzjs.h"
- #include "ljzjscolor.h"
- 
-+extern size_t strnlen(const char *s, size_t maxlen);
-+
- APDK_BEGIN_NAMESPACE
- 
- extern uint32_t ulMapGRAY_K_6x6x1[9 * 9 * 9];
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index 451e96782bd5..0201def32ca9 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -30,7 +30,7 @@ bin/hp-setup
 bin/hp-systray
 bin/hp-testpage
 bin/hp-timedate
-%%GUI%%bin/hp-toolbox
+%%QT%%bin/hp-toolbox
 bin/hp-uninstall
 bin/hp-unload
 bin/hp-upgrade
@@ -41,7 +41,7 @@ bin/hpijs
 @unexec if cmp -s %D/etc/hp/hplip.conf.sample %D/etc/hp/hplip.conf; then rm -f %D/etc/hp/hplip.conf; fi
 etc/hp/hplip.conf.sample
 @exec if [ ! -f %B/hplip.conf ]; then cp -p %D/%F %B/hplip.conf; fi
-%%GUI%%etc/xdg/autostart/hplip-systray.desktop
+%%QT%%etc/xdg/autostart/hplip-systray.desktop
 lib/libhpip.la
 lib/libhpip.so
 lib/libhpip.so.0
@@ -69,7 +69,7 @@ libexec/cups/filter/hpcups
 libexec/cups/filter/hplipjs
 libexec/cups/filter/hpps
 libexec/cups/filter/pstotiff
-%%GUI%%share/applications/hplip.desktop
+%%QT%%share/applications/hplip.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README_LIBJPG
 %%PORTDOCS%%%%DOCSDIR%%/commandline.html
@@ -144,324 +144,324 @@ libexec/cups/filter/pstotiff
 %%DATADIR%%/config_usb_printer.py
 %%DATADIR%%/copier/__init__.py
 %%DATADIR%%/copier/copier.py
-%%GUI%%%%DATADIR%%/data/images/128x128/audio.png
-%%GUI%%%%DATADIR%%/data/images/128x128/bmp.png
-%%GUI%%%%DATADIR%%/data/images/128x128/gif.png
-%%GUI%%%%DATADIR%%/data/images/128x128/hp_logo.png
-%%GUI%%%%DATADIR%%/data/images/128x128/jpg.png
-%%GUI%%%%DATADIR%%/data/images/128x128/movie.png
-%%GUI%%%%DATADIR%%/data/images/128x128/mpg.png
-%%GUI%%%%DATADIR%%/data/images/128x128/png.png
-%%GUI%%%%DATADIR%%/data/images/128x128/tif.png
-%%GUI%%%%DATADIR%%/data/images/128x128/unknown.png
-%%GUI%%%%DATADIR%%/data/images/16x16/active.png
-%%GUI%%%%DATADIR%%/data/images/16x16/add_user.png
-%%GUI%%%%DATADIR%%/data/images/16x16/add_user_quick.png
-%%GUI%%%%DATADIR%%/data/images/16x16/add_users.png
-%%GUI%%%%DATADIR%%/data/images/16x16/battery.png
-%%GUI%%%%DATADIR%%/data/images/16x16/busy.png
-%%GUI%%%%DATADIR%%/data/images/16x16/cancel.png
-%%GUI%%%%DATADIR%%/data/images/16x16/close.png
-%%GUI%%%%DATADIR%%/data/images/16x16/down.png
-%%GUI%%%%DATADIR%%/data/images/16x16/down_user.png
-%%GUI%%%%DATADIR%%/data/images/16x16/download.png
-%%GUI%%%%DATADIR%%/data/images/16x16/edit.png
-%%GUI%%%%DATADIR%%/data/images/16x16/error.png
-%%GUI%%%%DATADIR%%/data/images/16x16/fab.png
-%%GUI%%%%DATADIR%%/data/images/16x16/fax.png
-%%GUI%%%%DATADIR%%/data/images/16x16/folder_open.png
-%%GUI%%%%DATADIR%%/data/images/16x16/folder_remove.png
-%%GUI%%%%DATADIR%%/data/images/16x16/help.png
-%%GUI%%%%DATADIR%%/data/images/16x16/hp_logo.png
-%%GUI%%%%DATADIR%%/data/images/16x16/idle.png
-%%GUI%%%%DATADIR%%/data/images/16x16/info.png
-%%GUI%%%%DATADIR%%/data/images/16x16/inkdrop.png
-%%GUI%%%%DATADIR%%/data/images/16x16/list_add.png
-%%GUI%%%%DATADIR%%/data/images/16x16/list_remove.png
-%%GUI%%%%DATADIR%%/data/images/16x16/makecopies.png
-%%GUI%%%%DATADIR%%/data/images/16x16/mimetypes.png
-%%GUI%%%%DATADIR%%/data/images/16x16/minus.png
-%%GUI%%%%DATADIR%%/data/images/16x16/next.png
-%%GUI%%%%DATADIR%%/data/images/16x16/ok.png
-%%GUI%%%%DATADIR%%/data/images/16x16/paper.png
-%%GUI%%%%DATADIR%%/data/images/16x16/pcard.png
-%%GUI%%%%DATADIR%%/data/images/16x16/plus.png
-%%GUI%%%%DATADIR%%/data/images/16x16/prev.png
-%%GUI%%%%DATADIR%%/data/images/16x16/print.png
-%%GUI%%%%DATADIR%%/data/images/16x16/quit.png
-%%GUI%%%%DATADIR%%/data/images/16x16/refresh.png
-%%GUI%%%%DATADIR%%/data/images/16x16/refresh1.png
-%%GUI%%%%DATADIR%%/data/images/16x16/remove_user.png
-%%GUI%%%%DATADIR%%/data/images/16x16/scan.png
-%%GUI%%%%DATADIR%%/data/images/16x16/settings.png
-%%GUI%%%%DATADIR%%/data/images/16x16/status_refresh.png
-%%GUI%%%%DATADIR%%/data/images/16x16/thumbnail.png
-%%GUI%%%%DATADIR%%/data/images/16x16/toner.png
-%%GUI%%%%DATADIR%%/data/images/16x16/troubleshoot.png
-%%GUI%%%%DATADIR%%/data/images/16x16/up.png
-%%GUI%%%%DATADIR%%/data/images/16x16/up_user.png
-%%GUI%%%%DATADIR%%/data/images/16x16/warning.png
-%%GUI%%%%DATADIR%%/data/images/24x24/add_to_group.png
-%%GUI%%%%DATADIR%%/data/images/24x24/new_group.png
-%%GUI%%%%DATADIR%%/data/images/24x24/new_group_from_selection.png
-%%GUI%%%%DATADIR%%/data/images/24x24/new_user.png
-%%GUI%%%%DATADIR%%/data/images/24x24/remove_from_group.png
-%%GUI%%%%DATADIR%%/data/images/24x24/remove_group.png
-%%GUI%%%%DATADIR%%/data/images/24x24/remove_user.png
-%%GUI%%%%DATADIR%%/data/images/24x24/rename_group.png
-%%GUI%%%%DATADIR%%/data/images/256x256/hp_logo.png
-%%GUI%%%%DATADIR%%/data/images/256x256/logo.png
-%%GUI%%%%DATADIR%%/data/images/32x32/align.png
-%%GUI%%%%DATADIR%%/data/images/32x32/battery.png
-%%GUI%%%%DATADIR%%/data/images/32x32/busy.png
-%%GUI%%%%DATADIR%%/data/images/32x32/clean.png
-%%GUI%%%%DATADIR%%/data/images/32x32/colorcal.png
-%%GUI%%%%DATADIR%%/data/images/32x32/cups.png
-%%GUI%%%%DATADIR%%/data/images/32x32/download.png
-%%GUI%%%%DATADIR%%/data/images/32x32/error.png
-%%GUI%%%%DATADIR%%/data/images/32x32/ews.png
-%%GUI%%%%DATADIR%%/data/images/32x32/fab.png
-%%GUI%%%%DATADIR%%/data/images/32x32/fax-disabled.png
-%%GUI%%%%DATADIR%%/data/images/32x32/fax.png
-%%GUI%%%%DATADIR%%/data/images/32x32/fax_machine.png
-%%GUI%%%%DATADIR%%/data/images/32x32/fax_setup.png
-%%GUI%%%%DATADIR%%/data/images/32x32/firmware.png
-%%GUI%%%%DATADIR%%/data/images/32x32/help.png
-%%GUI%%%%DATADIR%%/data/images/32x32/hp_logo.png
-%%GUI%%%%DATADIR%%/data/images/32x32/idle.png
-%%GUI%%%%DATADIR%%/data/images/32x32/info.png
-%%GUI%%%%DATADIR%%/data/images/32x32/inkdrop.png
-%%GUI%%%%DATADIR%%/data/images/32x32/keys.png
-%%GUI%%%%DATADIR%%/data/images/32x32/linefeed_cal.png
-%%GUI%%%%DATADIR%%/data/images/32x32/lock.png
-%%GUI%%%%DATADIR%%/data/images/32x32/lporg.png
-%%GUI%%%%DATADIR%%/data/images/32x32/makecopies-disabled.png
-%%GUI%%%%DATADIR%%/data/images/32x32/makecopies.png
-%%GUI%%%%DATADIR%%/data/images/32x32/ok.png
-%%GUI%%%%DATADIR%%/data/images/32x32/paper.png
-%%GUI%%%%DATADIR%%/data/images/32x32/pcard-disabled.png
-%%GUI%%%%DATADIR%%/data/images/32x32/pcard.png
-%%GUI%%%%DATADIR%%/data/images/32x32/plugin.png
-%%GUI%%%%DATADIR%%/data/images/32x32/pq_diag.png
-%%GUI%%%%DATADIR%%/data/images/32x32/print-disabled.png
-%%GUI%%%%DATADIR%%/data/images/32x32/print.png
-%%GUI%%%%DATADIR%%/data/images/32x32/scan-disabled.png
-%%GUI%%%%DATADIR%%/data/images/32x32/scan.png
-%%GUI%%%%DATADIR%%/data/images/32x32/settings.png
-%%GUI%%%%DATADIR%%/data/images/32x32/testpage.png
-%%GUI%%%%DATADIR%%/data/images/32x32/toner.png
-%%GUI%%%%DATADIR%%/data/images/32x32/toner_cartridge.png
-%%GUI%%%%DATADIR%%/data/images/32x32/troubleshoot.png
-%%GUI%%%%DATADIR%%/data/images/32x32/warning.png
-%%GUI%%%%DATADIR%%/data/images/32x32/wireless.png
-%%GUI%%%%DATADIR%%/data/images/64x64/hp_logo.png
-%%GUI%%%%DATADIR%%/data/images/devices/120.png
-%%GUI%%%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
-%%GUI%%%%DATADIR%%/data/images/devices/CP_1700.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_1120C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_1220C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_2500C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_3820.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_5740.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_610.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_630C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_650C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_840C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_916C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_9600.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_960C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_970C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_990C.png
-%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_995C.png
-%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_3740.png
-%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5700.png
-%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_6500.png
-%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_6800.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_2000C.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_2500C.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_BI_3000.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
-%%GUI%%%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
-%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_3500.png
-%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_4650.png
-%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
-%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5500.png
-%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
-%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5550.png
-%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
-%%GUI%%%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
-%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_5105.png
-%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
-%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_8500_a910.png
-%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_G85.png
-%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
-%%GUI%%%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Officejet_6200_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Officejet_7200_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Officejet_9100_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
-%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
-%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
-%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
-%%GUI%%%%DATADIR%%/data/images/devices/PSC_900_Series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_370_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8050.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8250.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C3100.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C4100.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C5100.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C6100.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D5060.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D5100.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D6160.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D7100.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D7300.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a310.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a510.png
-%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a710.png
-%%GUI%%%%DATADIR%%/data/images/devices/cp1160.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_business_inkjet.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_designjet.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_deskjet.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_laserjet.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_officejet.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_photosmart.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_printer.png
-%%GUI%%%%DATADIR%%/data/images/devices/default_psc.png
-%%GUI%%%%DATADIR%%/data/images/devices/desket_5650.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_1280.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3200.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3320.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3325.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3420.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3425.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3500.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3600.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3840.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5100.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5550.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5552.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5600.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_6120.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_6980.png
-%%GUI%%%%DATADIR%%/data/images/devices/deskjet_D2360.png
-%%GUI%%%%DATADIR%%/data/images/devices/dj350.png
-%%GUI%%%%DATADIR%%/data/images/devices/dj450.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
-%%GUI%%%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/laserjet_2410.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_4200_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_500.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_5500_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_5600.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_j3600_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_j5500_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_k550.png
-%%GUI%%%%DATADIR%%/data/images/devices/officejet_k80.png
-%%GUI%%%%DATADIR%%/data/images/devices/photosmart_7150.png
-%%GUI%%%%DATADIR%%/data/images/devices/photosmart_7900_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/photosmart_a610.png
-%%GUI%%%%DATADIR%%/data/images/devices/photosmart_a820_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/psc_1100_series.png
-%%GUI%%%%DATADIR%%/data/images/devices/psc_1610.png
-%%GUI%%%%DATADIR%%/data/images/devices/psc_2300_series.png
-%%GUI%%%%DATADIR%%/data/images/other/aio_align.png
-%%GUI%%%%DATADIR%%/data/images/other/align10.png
-%%GUI%%%%DATADIR%%/data/images/other/clean.png
-%%GUI%%%%DATADIR%%/data/images/other/color_adj.png
-%%GUI%%%%DATADIR%%/data/images/other/confidential_coverpage.png
-%%GUI%%%%DATADIR%%/data/images/other/confidential_title.png
-%%GUI%%%%DATADIR%%/data/images/other/fax.png
-%%GUI%%%%DATADIR%%/data/images/other/fax2.png
-%%GUI%%%%DATADIR%%/data/images/other/generic_coverpage.png
-%%GUI%%%%DATADIR%%/data/images/other/generic_title.png
-%%GUI%%%%DATADIR%%/data/images/other/h-k-2.png
-%%GUI%%%%DATADIR%%/data/images/other/h-k-3.png
-%%GUI%%%%DATADIR%%/data/images/other/h-kc-2.png
-%%GUI%%%%DATADIR%%/data/images/other/h-kc-3.png
-%%GUI%%%%DATADIR%%/data/images/other/hp-tux-printer.png
-%%GUI%%%%DATADIR%%/data/images/other/load_paper.png
-%%GUI%%%%DATADIR%%/data/images/other/opensource-75x65.png
-%%GUI%%%%DATADIR%%/data/images/other/panel_lcd.png
-%%GUI%%%%DATADIR%%/data/images/other/pens.png
-%%GUI%%%%DATADIR%%/data/images/other/powered_by_python.png
-%%GUI%%%%DATADIR%%/data/images/other/signal0.png
-%%GUI%%%%DATADIR%%/data/images/other/signal1.png
-%%GUI%%%%DATADIR%%/data/images/other/signal2.png
-%%GUI%%%%DATADIR%%/data/images/other/signal3.png
-%%GUI%%%%DATADIR%%/data/images/other/signal4.png
-%%GUI%%%%DATADIR%%/data/images/other/signal5.png
-%%GUI%%%%DATADIR%%/data/images/other/standard_coverpage.png
-%%GUI%%%%DATADIR%%/data/images/other/type4_color_patch.png
-%%GUI%%%%DATADIR%%/data/images/other/type4_gray_patch.png
-%%GUI%%%%DATADIR%%/data/images/other/urgent_coverpage.png
-%%GUI%%%%DATADIR%%/data/images/other/urgent_title.png
-%%GUI%%%%DATADIR%%/data/images/other/usb_connection.png
-%%GUI%%%%DATADIR%%/data/images/other/v-c-2.png
-%%GUI%%%%DATADIR%%/data/images/other/v-c-3.png
-%%GUI%%%%DATADIR%%/data/images/other/v-k-2.png
-%%GUI%%%%DATADIR%%/data/images/other/v-k-3.png
-%%GUI%%%%DATADIR%%/data/images/other/v-kc-2.png
-%%GUI%%%%DATADIR%%/data/images/other/v-kc-3.png
-%%GUI%%%%DATADIR%%/data/images/other/zca.png
+%%QT%%%%DATADIR%%/data/images/128x128/audio.png
+%%QT%%%%DATADIR%%/data/images/128x128/bmp.png
+%%QT%%%%DATADIR%%/data/images/128x128/gif.png
+%%QT%%%%DATADIR%%/data/images/128x128/hp_logo.png
+%%QT%%%%DATADIR%%/data/images/128x128/jpg.png
+%%QT%%%%DATADIR%%/data/images/128x128/movie.png
+%%QT%%%%DATADIR%%/data/images/128x128/mpg.png
+%%QT%%%%DATADIR%%/data/images/128x128/png.png
+%%QT%%%%DATADIR%%/data/images/128x128/tif.png
+%%QT%%%%DATADIR%%/data/images/128x128/unknown.png
+%%QT%%%%DATADIR%%/data/images/16x16/active.png
+%%QT%%%%DATADIR%%/data/images/16x16/add_user.png
+%%QT%%%%DATADIR%%/data/images/16x16/add_user_quick.png
+%%QT%%%%DATADIR%%/data/images/16x16/add_users.png
+%%QT%%%%DATADIR%%/data/images/16x16/battery.png
+%%QT%%%%DATADIR%%/data/images/16x16/busy.png
+%%QT%%%%DATADIR%%/data/images/16x16/cancel.png
+%%QT%%%%DATADIR%%/data/images/16x16/close.png
+%%QT%%%%DATADIR%%/data/images/16x16/down.png
+%%QT%%%%DATADIR%%/data/images/16x16/down_user.png
+%%QT%%%%DATADIR%%/data/images/16x16/download.png
+%%QT%%%%DATADIR%%/data/images/16x16/edit.png
+%%QT%%%%DATADIR%%/data/images/16x16/error.png
+%%QT%%%%DATADIR%%/data/images/16x16/fab.png
+%%QT%%%%DATADIR%%/data/images/16x16/fax.png
+%%QT%%%%DATADIR%%/data/images/16x16/folder_open.png
+%%QT%%%%DATADIR%%/data/images/16x16/folder_remove.png
+%%QT%%%%DATADIR%%/data/images/16x16/help.png
+%%QT%%%%DATADIR%%/data/images/16x16/hp_logo.png
+%%QT%%%%DATADIR%%/data/images/16x16/idle.png
+%%QT%%%%DATADIR%%/data/images/16x16/info.png
+%%QT%%%%DATADIR%%/data/images/16x16/inkdrop.png
+%%QT%%%%DATADIR%%/data/images/16x16/list_add.png
+%%QT%%%%DATADIR%%/data/images/16x16/list_remove.png
+%%QT%%%%DATADIR%%/data/images/16x16/makecopies.png
+%%QT%%%%DATADIR%%/data/images/16x16/mimetypes.png
+%%QT%%%%DATADIR%%/data/images/16x16/minus.png
+%%QT%%%%DATADIR%%/data/images/16x16/next.png
+%%QT%%%%DATADIR%%/data/images/16x16/ok.png
+%%QT%%%%DATADIR%%/data/images/16x16/paper.png
+%%QT%%%%DATADIR%%/data/images/16x16/pcard.png
+%%QT%%%%DATADIR%%/data/images/16x16/plus.png
+%%QT%%%%DATADIR%%/data/images/16x16/prev.png
+%%QT%%%%DATADIR%%/data/images/16x16/print.png
+%%QT%%%%DATADIR%%/data/images/16x16/quit.png
+%%QT%%%%DATADIR%%/data/images/16x16/refresh.png
+%%QT%%%%DATADIR%%/data/images/16x16/refresh1.png
+%%QT%%%%DATADIR%%/data/images/16x16/remove_user.png
+%%QT%%%%DATADIR%%/data/images/16x16/scan.png
+%%QT%%%%DATADIR%%/data/images/16x16/settings.png
+%%QT%%%%DATADIR%%/data/images/16x16/status_refresh.png
+%%QT%%%%DATADIR%%/data/images/16x16/thumbnail.png
+%%QT%%%%DATADIR%%/data/images/16x16/toner.png
+%%QT%%%%DATADIR%%/data/images/16x16/troubleshoot.png
+%%QT%%%%DATADIR%%/data/images/16x16/up.png
+%%QT%%%%DATADIR%%/data/images/16x16/up_user.png
+%%QT%%%%DATADIR%%/data/images/16x16/warning.png
+%%QT%%%%DATADIR%%/data/images/24x24/add_to_group.png
+%%QT%%%%DATADIR%%/data/images/24x24/new_group.png
+%%QT%%%%DATADIR%%/data/images/24x24/new_group_from_selection.png
+%%QT%%%%DATADIR%%/data/images/24x24/new_user.png
+%%QT%%%%DATADIR%%/data/images/24x24/remove_from_group.png
+%%QT%%%%DATADIR%%/data/images/24x24/remove_group.png
+%%QT%%%%DATADIR%%/data/images/24x24/remove_user.png
+%%QT%%%%DATADIR%%/data/images/24x24/rename_group.png
+%%QT%%%%DATADIR%%/data/images/256x256/hp_logo.png
+%%QT%%%%DATADIR%%/data/images/256x256/logo.png
+%%QT%%%%DATADIR%%/data/images/32x32/align.png
+%%QT%%%%DATADIR%%/data/images/32x32/battery.png
+%%QT%%%%DATADIR%%/data/images/32x32/busy.png
+%%QT%%%%DATADIR%%/data/images/32x32/clean.png
+%%QT%%%%DATADIR%%/data/images/32x32/colorcal.png
+%%QT%%%%DATADIR%%/data/images/32x32/cups.png
+%%QT%%%%DATADIR%%/data/images/32x32/download.png
+%%QT%%%%DATADIR%%/data/images/32x32/error.png
+%%QT%%%%DATADIR%%/data/images/32x32/ews.png
+%%QT%%%%DATADIR%%/data/images/32x32/fab.png
+%%QT%%%%DATADIR%%/data/images/32x32/fax-disabled.png
+%%QT%%%%DATADIR%%/data/images/32x32/fax.png
+%%QT%%%%DATADIR%%/data/images/32x32/fax_machine.png
+%%QT%%%%DATADIR%%/data/images/32x32/fax_setup.png
+%%QT%%%%DATADIR%%/data/images/32x32/firmware.png
+%%QT%%%%DATADIR%%/data/images/32x32/help.png
+%%QT%%%%DATADIR%%/data/images/32x32/hp_logo.png
+%%QT%%%%DATADIR%%/data/images/32x32/idle.png
+%%QT%%%%DATADIR%%/data/images/32x32/info.png
+%%QT%%%%DATADIR%%/data/images/32x32/inkdrop.png
+%%QT%%%%DATADIR%%/data/images/32x32/keys.png
+%%QT%%%%DATADIR%%/data/images/32x32/linefeed_cal.png
+%%QT%%%%DATADIR%%/data/images/32x32/lock.png
+%%QT%%%%DATADIR%%/data/images/32x32/lporg.png
+%%QT%%%%DATADIR%%/data/images/32x32/makecopies-disabled.png
+%%QT%%%%DATADIR%%/data/images/32x32/makecopies.png
+%%QT%%%%DATADIR%%/data/images/32x32/ok.png
+%%QT%%%%DATADIR%%/data/images/32x32/paper.png
+%%QT%%%%DATADIR%%/data/images/32x32/pcard-disabled.png
+%%QT%%%%DATADIR%%/data/images/32x32/pcard.png
+%%QT%%%%DATADIR%%/data/images/32x32/plugin.png
+%%QT%%%%DATADIR%%/data/images/32x32/pq_diag.png
+%%QT%%%%DATADIR%%/data/images/32x32/print-disabled.png
+%%QT%%%%DATADIR%%/data/images/32x32/print.png
+%%QT%%%%DATADIR%%/data/images/32x32/scan-disabled.png
+%%QT%%%%DATADIR%%/data/images/32x32/scan.png
+%%QT%%%%DATADIR%%/data/images/32x32/settings.png
+%%QT%%%%DATADIR%%/data/images/32x32/testpage.png
+%%QT%%%%DATADIR%%/data/images/32x32/toner.png
+%%QT%%%%DATADIR%%/data/images/32x32/toner_cartridge.png
+%%QT%%%%DATADIR%%/data/images/32x32/troubleshoot.png
+%%QT%%%%DATADIR%%/data/images/32x32/warning.png
+%%QT%%%%DATADIR%%/data/images/32x32/wireless.png
+%%QT%%%%DATADIR%%/data/images/64x64/hp_logo.png
+%%QT%%%%DATADIR%%/data/images/devices/120.png
+%%QT%%%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
+%%QT%%%%DATADIR%%/data/images/devices/CP_1700.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_1120C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_1220C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_2500C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_3820.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_5740.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_610.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_630C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_650C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_840C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_916C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_9600.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_960C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_970C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_990C.png
+%%QT%%%%DATADIR%%/data/images/devices/DESKJET_995C.png
+%%QT%%%%DATADIR%%/data/images/devices/Deskjet_3740.png
+%%QT%%%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Deskjet_5700.png
+%%QT%%%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Deskjet_6500.png
+%%QT%%%%DATADIR%%/data/images/devices/Deskjet_6800.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_2000C.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_2500C.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_BI_3000.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
+%%QT%%%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
+%%QT%%%%DATADIR%%/data/images/devices/LASERJET_3500.png
+%%QT%%%%DATADIR%%/data/images/devices/LASERJET_4650.png
+%%QT%%%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
+%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5500.png
+%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
+%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5550.png
+%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
+%%QT%%%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
+%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_5105.png
+%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
+%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_8500_a910.png
+%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_G85.png
+%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
+%%QT%%%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
+%%QT%%%%DATADIR%%/data/images/devices/Officejet_6200_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Officejet_7200_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Officejet_9100_series.png
+%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
+%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
+%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
+%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
+%%QT%%%%DATADIR%%/data/images/devices/PSC_900_Series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_370_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8050.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8250.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C3100.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C4100.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C5100.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C6100.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D5060.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D5100.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D6160.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D7100.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D7300.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_a310.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_a510.png
+%%QT%%%%DATADIR%%/data/images/devices/Photosmart_a710.png
+%%QT%%%%DATADIR%%/data/images/devices/cp1160.png
+%%QT%%%%DATADIR%%/data/images/devices/default_business_inkjet.png
+%%QT%%%%DATADIR%%/data/images/devices/default_designjet.png
+%%QT%%%%DATADIR%%/data/images/devices/default_deskjet.png
+%%QT%%%%DATADIR%%/data/images/devices/default_laserjet.png
+%%QT%%%%DATADIR%%/data/images/devices/default_officejet.png
+%%QT%%%%DATADIR%%/data/images/devices/default_photosmart.png
+%%QT%%%%DATADIR%%/data/images/devices/default_printer.png
+%%QT%%%%DATADIR%%/data/images/devices/default_psc.png
+%%QT%%%%DATADIR%%/data/images/devices/desket_5650.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_1280.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3200.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3320.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3325.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3420.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3425.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3500.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3600.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_3840.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_5100.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_5550.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_5552.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_5600.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_6120.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_6980.png
+%%QT%%%%DATADIR%%/data/images/devices/deskjet_D2360.png
+%%QT%%%%DATADIR%%/data/images/devices/dj350.png
+%%QT%%%%DATADIR%%/data/images/devices/dj450.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
+%%QT%%%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
+%%QT%%%%DATADIR%%/data/images/devices/laserjet_2410.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_4200_series.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_500.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_5500_series.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_5600.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_j3600_series.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_j5500_series.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_k550.png
+%%QT%%%%DATADIR%%/data/images/devices/officejet_k80.png
+%%QT%%%%DATADIR%%/data/images/devices/photosmart_7150.png
+%%QT%%%%DATADIR%%/data/images/devices/photosmart_7900_series.png
+%%QT%%%%DATADIR%%/data/images/devices/photosmart_a610.png
+%%QT%%%%DATADIR%%/data/images/devices/photosmart_a820_series.png
+%%QT%%%%DATADIR%%/data/images/devices/psc_1100_series.png
+%%QT%%%%DATADIR%%/data/images/devices/psc_1610.png
+%%QT%%%%DATADIR%%/data/images/devices/psc_2300_series.png
+%%QT%%%%DATADIR%%/data/images/other/aio_align.png
+%%QT%%%%DATADIR%%/data/images/other/align10.png
+%%QT%%%%DATADIR%%/data/images/other/clean.png
+%%QT%%%%DATADIR%%/data/images/other/color_adj.png
+%%QT%%%%DATADIR%%/data/images/other/confidential_coverpage.png
+%%QT%%%%DATADIR%%/data/images/other/confidential_title.png
+%%QT%%%%DATADIR%%/data/images/other/fax.png
+%%QT%%%%DATADIR%%/data/images/other/fax2.png
+%%QT%%%%DATADIR%%/data/images/other/generic_coverpage.png
+%%QT%%%%DATADIR%%/data/images/other/generic_title.png
+%%QT%%%%DATADIR%%/data/images/other/h-k-2.png
+%%QT%%%%DATADIR%%/data/images/other/h-k-3.png
+%%QT%%%%DATADIR%%/data/images/other/h-kc-2.png
+%%QT%%%%DATADIR%%/data/images/other/h-kc-3.png
+%%QT%%%%DATADIR%%/data/images/other/hp-tux-printer.png
+%%QT%%%%DATADIR%%/data/images/other/load_paper.png
+%%QT%%%%DATADIR%%/data/images/other/opensource-75x65.png
+%%QT%%%%DATADIR%%/data/images/other/panel_lcd.png
+%%QT%%%%DATADIR%%/data/images/other/pens.png
+%%QT%%%%DATADIR%%/data/images/other/powered_by_python.png
+%%QT%%%%DATADIR%%/data/images/other/signal0.png
+%%QT%%%%DATADIR%%/data/images/other/signal1.png
+%%QT%%%%DATADIR%%/data/images/other/signal2.png
+%%QT%%%%DATADIR%%/data/images/other/signal3.png
+%%QT%%%%DATADIR%%/data/images/other/signal4.png
+%%QT%%%%DATADIR%%/data/images/other/signal5.png
+%%QT%%%%DATADIR%%/data/images/other/standard_coverpage.png
+%%QT%%%%DATADIR%%/data/images/other/type4_color_patch.png
+%%QT%%%%DATADIR%%/data/images/other/type4_gray_patch.png
+%%QT%%%%DATADIR%%/data/images/other/urgent_coverpage.png
+%%QT%%%%DATADIR%%/data/images/other/urgent_title.png
+%%QT%%%%DATADIR%%/data/images/other/usb_connection.png
+%%QT%%%%DATADIR%%/data/images/other/v-c-2.png
+%%QT%%%%DATADIR%%/data/images/other/v-c-3.png
+%%QT%%%%DATADIR%%/data/images/other/v-k-2.png
+%%QT%%%%DATADIR%%/data/images/other/v-k-3.png
+%%QT%%%%DATADIR%%/data/images/other/v-kc-2.png
+%%QT%%%%DATADIR%%/data/images/other/v-kc-3.png
+%%QT%%%%DATADIR%%/data/images/other/zca.png
 %%DATADIR%%/data/ldl/cb2pcal.ldl.gz
 %%DATADIR%%/data/ldl/cb2pcal_done.ldl.gz
 %%DATADIR%%/data/ldl/cbbcal.ldl.gz
@@ -553,72 +553,72 @@ libexec/cups/filter/pstotiff
 %%DATADIR%%/testpage.py
 %%DATADIR%%/timedate.py
 %%DATADIR%%/toolbox.py
-%%GUI%%%%DATADIR%%/ui4/__init__.py
-%%GUI%%%%DATADIR%%/ui4/aboutdialog.py
-%%GUI%%%%DATADIR%%/ui4/aboutdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/aligndialog.py
-%%GUI%%%%DATADIR%%/ui4/aligndialog_base.py
-%%GUI%%%%DATADIR%%/ui4/cleandialog.py
-%%GUI%%%%DATADIR%%/ui4/cleandialog_base.py
-%%GUI%%%%DATADIR%%/ui4/colorcaldialog.py
-%%GUI%%%%DATADIR%%/ui4/colorcaldialog_base.py
-%%GUI%%%%DATADIR%%/ui4/devicesetupdialog.py
-%%GUI%%%%DATADIR%%/ui4/devicesetupdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/deviceuricombobox.py
-%%GUI%%%%DATADIR%%/ui4/devmgr5.py
-%%GUI%%%%DATADIR%%/ui4/devmgr5_base.py
-%%GUI%%%%DATADIR%%/ui4/fabgrouptable.py
-%%GUI%%%%DATADIR%%/ui4/fabnametable.py
-%%GUI%%%%DATADIR%%/ui4/fabwindow.py
-%%GUI%%%%DATADIR%%/ui4/fabwindow_base.py
-%%GUI%%%%DATADIR%%/ui4/faxsetupdialog.py
-%%GUI%%%%DATADIR%%/ui4/faxsetupdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/filetable.py
-%%GUI%%%%DATADIR%%/ui4/firmwaredialog.py
-%%GUI%%%%DATADIR%%/ui4/firmwaredialog_base.py
-%%GUI%%%%DATADIR%%/ui4/infodialog.py
-%%GUI%%%%DATADIR%%/ui4/infodialog_base.py
-%%GUI%%%%DATADIR%%/ui4/linefeedcaldialog.py
-%%GUI%%%%DATADIR%%/ui4/linefeedcaldialog_base.py
-%%GUI%%%%DATADIR%%/ui4/loadpapergroupbox.py
-%%GUI%%%%DATADIR%%/ui4/makecopiesdialog.py
-%%GUI%%%%DATADIR%%/ui4/makecopiesdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/mimetypesdialog.py
-%%GUI%%%%DATADIR%%/ui4/mimetypesdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/nodevicesdialog.py
-%%GUI%%%%DATADIR%%/ui4/nodevicesdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/plugindiagnose.py
-%%GUI%%%%DATADIR%%/ui4/plugindiagnose_base.py
-%%GUI%%%%DATADIR%%/ui4/plugindialog.py
-%%GUI%%%%DATADIR%%/ui4/plugindialog_base.py
-%%GUI%%%%DATADIR%%/ui4/pluginlicensedialog.py
-%%GUI%%%%DATADIR%%/ui4/pluginlicensedialog_base.py
-%%GUI%%%%DATADIR%%/ui4/pqdiagdialog.py
-%%GUI%%%%DATADIR%%/ui4/pqdiagdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/printdialog.py
-%%GUI%%%%DATADIR%%/ui4/printdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/printernamecombobox.py
-%%GUI%%%%DATADIR%%/ui4/printsettingsdialog.py
-%%GUI%%%%DATADIR%%/ui4/printsettingsdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/printsettingstoolbox.py
-%%GUI%%%%DATADIR%%/ui4/printtestpagedialog.py
-%%GUI%%%%DATADIR%%/ui4/printtestpagedialog_base.py
-%%GUI%%%%DATADIR%%/ui4/queuesconf.py
-%%GUI%%%%DATADIR%%/ui4/readonlyradiobutton.py
-%%GUI%%%%DATADIR%%/ui4/sendfaxdialog.py
-%%GUI%%%%DATADIR%%/ui4/sendfaxdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/settingsdialog.py
-%%GUI%%%%DATADIR%%/ui4/settingsdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/setupdialog.py
-%%GUI%%%%DATADIR%%/ui4/setupdialog_base.py
-%%GUI%%%%DATADIR%%/ui4/systemtray.py
-%%GUI%%%%DATADIR%%/ui4/systrayframe.py
-%%GUI%%%%DATADIR%%/ui4/systrayframe_base.py
-%%GUI%%%%DATADIR%%/ui4/ui_utils.py
-%%GUI%%%%DATADIR%%/ui4/upgradedialog.py
-%%GUI%%%%DATADIR%%/ui4/upgradedialog_base.py
-%%GUI%%%%DATADIR%%/ui4/wifisetupdialog.py
-%%GUI%%%%DATADIR%%/ui4/wifisetupdialog_base.py
+%%QT%%%%DATADIR%%/ui4/__init__.py
+%%QT%%%%DATADIR%%/ui4/aboutdialog.py
+%%QT%%%%DATADIR%%/ui4/aboutdialog_base.py
+%%QT%%%%DATADIR%%/ui4/aligndialog.py
+%%QT%%%%DATADIR%%/ui4/aligndialog_base.py
+%%QT%%%%DATADIR%%/ui4/cleandialog.py
+%%QT%%%%DATADIR%%/ui4/cleandialog_base.py
+%%QT%%%%DATADIR%%/ui4/colorcaldialog.py
+%%QT%%%%DATADIR%%/ui4/colorcaldialog_base.py
+%%QT%%%%DATADIR%%/ui4/devicesetupdialog.py
+%%QT%%%%DATADIR%%/ui4/devicesetupdialog_base.py
+%%QT%%%%DATADIR%%/ui4/deviceuricombobox.py
+%%QT%%%%DATADIR%%/ui4/devmgr5.py
+%%QT%%%%DATADIR%%/ui4/devmgr5_base.py
+%%QT%%%%DATADIR%%/ui4/fabgrouptable.py
+%%QT%%%%DATADIR%%/ui4/fabnametable.py
+%%QT%%%%DATADIR%%/ui4/fabwindow.py
+%%QT%%%%DATADIR%%/ui4/fabwindow_base.py
+%%QT%%%%DATADIR%%/ui4/faxsetupdialog.py
+%%QT%%%%DATADIR%%/ui4/faxsetupdialog_base.py
+%%QT%%%%DATADIR%%/ui4/filetable.py
+%%QT%%%%DATADIR%%/ui4/firmwaredialog.py
+%%QT%%%%DATADIR%%/ui4/firmwaredialog_base.py
+%%QT%%%%DATADIR%%/ui4/infodialog.py
+%%QT%%%%DATADIR%%/ui4/infodialog_base.py
+%%QT%%%%DATADIR%%/ui4/linefeedcaldialog.py
+%%QT%%%%DATADIR%%/ui4/linefeedcaldialog_base.py
+%%QT%%%%DATADIR%%/ui4/loadpapergroupbox.py
+%%QT%%%%DATADIR%%/ui4/makecopiesdialog.py
+%%QT%%%%DATADIR%%/ui4/makecopiesdialog_base.py
+%%QT%%%%DATADIR%%/ui4/mimetypesdialog.py
+%%QT%%%%DATADIR%%/ui4/mimetypesdialog_base.py
+%%QT%%%%DATADIR%%/ui4/nodevicesdialog.py
+%%QT%%%%DATADIR%%/ui4/nodevicesdialog_base.py
+%%QT%%%%DATADIR%%/ui4/plugindiagnose.py
+%%QT%%%%DATADIR%%/ui4/plugindiagnose_base.py
+%%QT%%%%DATADIR%%/ui4/plugindialog.py
+%%QT%%%%DATADIR%%/ui4/plugindialog_base.py
+%%QT%%%%DATADIR%%/ui4/pluginlicensedialog.py
+%%QT%%%%DATADIR%%/ui4/pluginlicensedialog_base.py
+%%QT%%%%DATADIR%%/ui4/pqdiagdialog.py
+%%QT%%%%DATADIR%%/ui4/pqdiagdialog_base.py
+%%QT%%%%DATADIR%%/ui4/printdialog.py
+%%QT%%%%DATADIR%%/ui4/printdialog_base.py
+%%QT%%%%DATADIR%%/ui4/printernamecombobox.py
+%%QT%%%%DATADIR%%/ui4/printsettingsdialog.py
+%%QT%%%%DATADIR%%/ui4/printsettingsdialog_base.py
+%%QT%%%%DATADIR%%/ui4/printsettingstoolbox.py
+%%QT%%%%DATADIR%%/ui4/printtestpagedialog.py
+%%QT%%%%DATADIR%%/ui4/printtestpagedialog_base.py
+%%QT%%%%DATADIR%%/ui4/queuesconf.py
+%%QT%%%%DATADIR%%/ui4/readonlyradiobutton.py
+%%QT%%%%DATADIR%%/ui4/sendfaxdialog.py
+%%QT%%%%DATADIR%%/ui4/sendfaxdialog_base.py
+%%QT%%%%DATADIR%%/ui4/settingsdialog.py
+%%QT%%%%DATADIR%%/ui4/settingsdialog_base.py
+%%QT%%%%DATADIR%%/ui4/setupdialog.py
+%%QT%%%%DATADIR%%/ui4/setupdialog_base.py
+%%QT%%%%DATADIR%%/ui4/systemtray.py
+%%QT%%%%DATADIR%%/ui4/systrayframe.py
+%%QT%%%%DATADIR%%/ui4/systrayframe_base.py
+%%QT%%%%DATADIR%%/ui4/ui_utils.py
+%%QT%%%%DATADIR%%/ui4/upgradedialog.py
+%%QT%%%%DATADIR%%/ui4/upgradedialog_base.py
+%%QT%%%%DATADIR%%/ui4/wifisetupdialog.py
+%%QT%%%%DATADIR%%/ui4/wifisetupdialog_base.py
 %%DATADIR%%/uninstall.py
 %%DATADIR%%/unload.py
 %%DATADIR%%/upgrade.py
@@ -1567,8 +1567,8 @@ share/ppd/HP/hp-psc_950vr-hpijs.ppd.gz
 share/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
 @dirrm share/ppd/HP
 @dirrm share/ppd
-%%GUI%%@dirrm %%DATADIR%%/ui4/plugins
-%%GUI%%@dirrm %%DATADIR%%/ui4
+%%QT%%@dirrm %%DATADIR%%/ui4/plugins
+%%QT%%@dirrm %%DATADIR%%/ui4
 %%SCAN%%@dirrm %%DATADIR%%/scan
 @dirrm %%DATADIR%%/prnt
 @dirrm %%DATADIR%%/pcard
@@ -1579,15 +1579,15 @@ share/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
 @dirrm %%DATADIR%%/data/models
 @dirrm %%DATADIR%%/data/localization
 @dirrm %%DATADIR%%/data/ldl
-%%GUI%%@dirrm %%DATADIR%%/data/images/other
-%%GUI%%@dirrm %%DATADIR%%/data/images/devices
-%%GUI%%@dirrm %%DATADIR%%/data/images/64x64
-%%GUI%%@dirrm %%DATADIR%%/data/images/32x32
-%%GUI%%@dirrm %%DATADIR%%/data/images/256x256
-%%GUI%%@dirrm %%DATADIR%%/data/images/24x24
-%%GUI%%@dirrm %%DATADIR%%/data/images/16x16
-%%GUI%%@dirrm %%DATADIR%%/data/images/128x128
-%%GUI%%@dirrm %%DATADIR%%/data/images
+%%QT%%@dirrm %%DATADIR%%/data/images/other
+%%QT%%@dirrm %%DATADIR%%/data/images/devices
+%%QT%%@dirrm %%DATADIR%%/data/images/64x64
+%%QT%%@dirrm %%DATADIR%%/data/images/32x32
+%%QT%%@dirrm %%DATADIR%%/data/images/256x256
+%%QT%%@dirrm %%DATADIR%%/data/images/24x24
+%%QT%%@dirrm %%DATADIR%%/data/images/16x16
+%%QT%%@dirrm %%DATADIR%%/data/images/128x128
+%%QT%%@dirrm %%DATADIR%%/data/images
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/copier
 @dirrm %%DATADIR%%/base
@@ -1602,6 +1602,6 @@ share/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry etc/hp
 %%FAX%%@dirrmtry etc/cups
-%%GUI%%@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
+%%QT%%@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
 %%SCAN%%@exec if ! grep ^hpaio %%LOCALBASE%%/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then echo hpaio >> %%LOCALBASE%%/etc/sane.d/dll.conf; fi
 %%SCAN%%@unexec sed -i "" -e '/^hpaio$/d' %%LOCALBASE%%/etc/sane.d/dll.conf