Actually move the kde files that were renamed in the last commit

7 files changed, 0 insertions, 414 deletions

diff --git a/kdeprint/tools/CMakeLists.txt b/kdeprint/tools/CMakeLists.txt
deleted file mode 100644
index 4c2682eee..000000000
--- a/kdeprint/tools/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_subdirectory( escputil )
diff --git a/kdeprint/tools/Makefile.am b/kdeprint/tools/Makefile.am
deleted file mode 100644
index d2ca2be71..000000000
--- a/kdeprint/tools/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = escputil
diff --git a/kdeprint/tools/escputil/CMakeLists.txt b/kdeprint/tools/escputil/CMakeLists.txt
deleted file mode 100644
index 3494d3cfb..000000000
--- a/kdeprint/tools/escputil/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-#################################################
-#
-#  (C) 2010 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${TQT_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/tdeui
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-##### other data ################################
-
-install( FILES escputil.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeprint/tools )
-
-
-##### tdeprint_tool_escputil ####################
-
-set( target tdeprint_tool_escputil )
-
-set( ${target}_SRCS
-  escpwidget.cpp
-)
-
-tde_add_kpart( ${target} AUTOMOC
-  SOURCES ${${target}_SRCS}
-  LINK tdeui-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/kdeprint/tools/escputil/Makefile.am b/kdeprint/tools/escputil/Makefile.am
deleted file mode 100644
index ac7620ef1..000000000
--- a/kdeprint/tools/escputil/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(all_includes)
-
-kde_module_LTLIBRARIES = tdeprint_tool_escputil.la
-tdeprint_tool_escputil_la_SOURCES = escpwidget.cpp
-tdeprint_tool_escputil_la_METASOURCES = AUTO
-tdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
-
-noinst_HEADERS = escpwidget.h
-
-service_DATA = escputil.desktop
-servicedir = $(kde_datadir)/tdeprint/tools
diff --git a/kdeprint/tools/escputil/escputil.desktop b/kdeprint/tools/escputil/escputil.desktop
deleted file mode 100644
index 40a5c88f3..000000000
--- a/kdeprint/tools/escputil/escputil.desktop
+++ /dev/null
@@ -1,29 +0,0 @@
-[Desktop Entry]
-Name=EPSON InkJet
-Name[af]=Epson Inkstraal
-Name[bg]=Мастиленоструен принтер EPSON InkJet
-Name[bn]=এপসন ইঙ্কজেট
-Name[de]=Epson InkJet
-Name[eo]=Epson-Inkĵet-ilo
-Name[fa]=چاپگر جوهرافشان EPSON
-Name[fr]=Imprimante jet d'encre Epson
-Name[ga]=Scairdphrintéir EPSON
-Name[hi]=एप्सन इंकजेट
-Name[is]=EPSON bleksprautuprentari
-Name[ja]=EPSON インクジェット
-Name[ko]=엡손 잉크젯
-Name[mn]=Epson InkJet
-Name[ms]=InkJet EPSON
-Name[nb]=EPSON-blekkskriver
-Name[nds]=EPSON Inkjet
-Name[ne]=EPSON इन्कजेट
-Name[nn]=EPSON-blekkskrivar
-Name[nso]=InkJetEPSON
-Name[pt]=Jacto de Tinta da EPSON
-Name[ta]=EPSON இங்க்ஜெட்
-Name[te]=ఎప్సన్ ఇంక్ జెట్
-Name[zh_HK]=EPSON 噴墨印表機
-Name[zh_TW]=EPSON 噴墨印表機
-Type=Service
-
-X-KDE-Library=escputil
diff --git a/kdeprint/tools/escputil/escpwidget.cpp b/kdeprint/tools/escputil/escpwidget.cpp
deleted file mode 100644
index 3000b0788..000000000
--- a/kdeprint/tools/escputil/escpwidget.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation.
- *
- *  This library 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
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#include "escpwidget.h"
-
-#include <tqpushbutton.h>
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqcheckbox.h>
-#include <tqaccel.h>
-#include <kdemacros.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kiconloader.h>
-#include <kdialogbase.h>
-#include <klibloader.h>
-#include <kseparator.h>
-#include <kdebug.h>
-
-class EscpFactory : public KLibFactory
-{
-public:
-	EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {}
-protected:
-	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList())
-	{
-               Q_UNUSED(className);
-		KDialogBase	*dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);
-		EscpWidget	*w = new EscpWidget(dlg);
-		if (args.count() > 0)
-			w->setDevice(args[0]);
-		if (args.count() > 1)
-			w->setPrinterName(args[1]);
-		dlg->setMainWidget(w);
-		return TQT_TQOBJECT(dlg);
-	}
-};
-
-extern "C"
-{
-	void* init_tdeprint_tool_escputil() KDE_EXPORT;
-	void* init_tdeprint_tool_escputil()
-	{
-		return new EscpFactory;
-	}
-}
-
-EscpWidget::EscpWidget(TQWidget *parent, const char *name)
-: TQWidget(parent, name)
-{
-	m_hasoutput = false;
-
-	connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)));
-
-	TQPushButton	*cleanbtn = new TQPushButton(this, "-c");
-	cleanbtn->setPixmap(DesktopIcon("exec"));
-	TQPushButton	*nozzlebtn = new TQPushButton(this, "-n");
-	nozzlebtn->setPixmap(DesktopIcon("exec"));
-	TQPushButton	*alignbtn = new TQPushButton(this, "-a");
-	alignbtn->setPixmap(DesktopIcon("exec"));
-	TQPushButton	*inkbtn = new TQPushButton(this, "-i");
-	inkbtn->setPixmap(DesktopIcon("tdeprint_inklevel"));
-	TQPushButton	*identbtn = new TQPushButton(this, "-d");
-	identbtn->setPixmap(DesktopIcon("exec"));
-
-	TQFont	f(font());
-	f.setBold(true);
-	m_printer = new TQLabel(this);
-	m_printer->setFont(f);
-	m_device = new TQLabel(this);
-	m_device->setFont(f);
-	m_useraw = new TQCheckBox(i18n("&Use direct connection (might need root permissions)"), this);
-
-	connect(cleanbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(nozzlebtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(alignbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-
-	TQLabel	*printerlab = new TQLabel(i18n("Printer:"), this);
-	printerlab->tqsetAlignment(AlignRight|AlignVCenter);
-	TQLabel	*devicelab = new TQLabel(i18n("Device:"), this);
-	devicelab->tqsetAlignment(AlignRight|AlignVCenter);
-	TQLabel	*cleanlab = new TQLabel(i18n("Clea&n print head"), this);
-	TQLabel	*nozzlelab = new TQLabel(i18n("&Print a nozzle test pattern"), this);
-	TQLabel	*alignlab = new TQLabel(i18n("&Align print head"), this);
-	TQLabel	*inklab = new TQLabel(i18n("&Ink level"), this);
-	TQLabel	*identlab = new TQLabel(i18n("P&rinter identification"), this);
-
-	cleanlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	nozzlelab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	alignlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	inklab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-	identlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
-
-	cleanbtn->setAccel(TQAccel::shortcutKey(cleanlab->text()));
-	nozzlebtn->setAccel(TQAccel::shortcutKey(nozzlelab->text()));
-	alignbtn->setAccel(TQAccel::shortcutKey(alignlab->text()));
-	inkbtn->setAccel(TQAccel::shortcutKey(inklab->text()));
-	identbtn->setAccel(TQAccel::shortcutKey(identlab->text()));
-
-	KSeparator	*sep = new KSeparator(this);
-	sep->setFixedHeight(10);
-
-	TQGridLayout	*l0 = new TQGridLayout(this, 8, 2, 10, 10);
-	TQGridLayout	*l1 = new TQGridLayout(0, 2, 2, 0, 5);
-	l0->addMultiCellLayout(l1, 0, 0, 0, 1);
-	l1->addWidget(printerlab, 0, 0);
-	l1->addWidget(devicelab, 1, 0);
-	l1->addWidget(m_printer, 0, 1);
-	l1->addWidget(m_device, 1, 1);
-	l1->setColStretch(1, 1);
-	l0->addMultiCellWidget(sep, 1, 1, 0, 1);
-	l0->addWidget(cleanbtn, 2, 0);
-	l0->addWidget(nozzlebtn, 3, 0);
-	l0->addWidget(alignbtn, 4, 0);
-	l0->addWidget(inkbtn, 5, 0);
-	l0->addWidget(identbtn, 6, 0);
-	l0->addWidget(cleanlab, 2, 1);
-	l0->addWidget(nozzlelab, 3, 1);
-	l0->addWidget(alignlab, 4, 1);
-	l0->addWidget(inklab, 5, 1);
-	l0->addWidget(identlab, 6, 1);
-	l0->addMultiCellWidget(m_useraw, 7, 7, 0, 1);
-	l0->setColStretch(1, 1);
-}
-
-void EscpWidget::startCommand(const TQString& arg)
-{
-	bool	useUSB(false);
-
-	if (m_deviceURL.isEmpty())
-	{
-		KMessageBox::error(this, i18n("Internal error: no device set."));
-		return;
-	}
-	else
-	{
-		TQString	protocol = m_deviceURL.protocol();
-		if (protocol == "usb")
-			useUSB = true;
-		else if (protocol != "file" && protocol != "parallel" && protocol != "serial" && !protocol.isEmpty())
-		{
-			KMessageBox::error(this,
-				i18n("Unsupported connection type: %1").arg(protocol));
-			return;
-		}
-	}
-
-	if (m_proc.isRunning())
-	{
-		KMessageBox::error(this, i18n("An escputil process is still running. "
-		                              "You must wait until its completion before continuing."));
-		return;
-	}
-
-	TQString	exestr = KStandardDirs::findExe("escputil");
-	if (exestr.isEmpty())
-	{
-		KMessageBox::error(this, i18n("The executable escputil cannot be found in your "
-		                              "PATH environment variable. Make sure gimp-print is "
-		                              "installed and that escputil is in your PATH."));
-		return;
-	}
-
-	m_proc.clearArguments();
-	m_proc << exestr;
-	if (m_useraw->isChecked() || arg == "-i")
-		m_proc << "-r" << m_deviceURL.path();
-	else
-		m_proc << "-P" << m_printer->text();
-	if (useUSB)
-		m_proc << "-u";
-
-	m_proc << arg << "-q";
-	m_errorbuffer = m_outbuffer = TQString::null;
-	m_hasoutput = ( arg == "-i" || arg == "-d" );
-	for ( TQValueList<TQCString>::ConstIterator it=m_proc.args().begin(); it!=m_proc.args().end(); ++it )
-		kdDebug() << "ARG: " << *it << endl;
-	if (m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput))
-		setEnabled(false);
-	else
-	{
-		KMessageBox::error(this,
-			i18n("Internal error: unable to start escputil process."));
-		return;
-	}
-}
-
-void EscpWidget::slotProcessExited(KProcess*)
-{
-	setEnabled(true);
-	if (!m_proc.normalExit() || m_proc.exitStatus() != 0)
-	{
-		TQString	msg1 = "<qt>"+i18n("Operation terminated with errors.")+"</qt>";
-		TQString	msg2;
-		if (!m_outbuffer.isEmpty())
-			msg2 += "<p><b><u>"+i18n("Output")+"</u></b></p><p>"+m_outbuffer+"</p>";
-		if (!m_errorbuffer.isEmpty())
-			msg2 += "<p><b><u>"+i18n("Error")+"</u></b></p><p>"+m_errorbuffer+"</p>";
-		if (!msg2.isEmpty())
-			KMessageBox::detailedError(this, msg1, msg2);
-		else
-			KMessageBox::error(this, msg1);
-	}
-	else if ( !m_outbuffer.isEmpty() && m_hasoutput )
-	{
-		KMessageBox::information( this, m_outbuffer );
-	}
-	m_hasoutput = false;
-}
-
-void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len)
-{
-	TQString	bufstr = TQCString(buf, len);
-	m_outbuffer.append(bufstr);
-}
-
-void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len)
-{
-	TQString	bufstr = TQCString(buf, len);
-	m_errorbuffer.append(bufstr);
-}
-
-void EscpWidget::slotButtonClicked()
-{
-	TQString	arg = TQT_TQOBJECT_CONST(sender())->name();
-	startCommand(arg);
-}
-
-void EscpWidget::setPrinterName(const TQString& p)
-{
-	m_printer->setText(p);
-}
-
-void EscpWidget::setDevice(const TQString& dev)
-{
-	m_deviceURL = dev;
-	m_device->setText(dev);
-}
-
-#include "escpwidget.moc"
diff --git a/kdeprint/tools/escputil/escpwidget.h b/kdeprint/tools/escputil/escpwidget.h
deleted file mode 100644
index 7e3ba55e8..000000000
--- a/kdeprint/tools/escputil/escpwidget.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  This file is part of the KDE libraries
- *  Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License version 2 as published by the Free Software Foundation.
- *
- *  This library 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
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- **/
-
-#ifndef ESCPWIDGET_H
-#define ESCPWIDGET_H
-
-#include <tqwidget.h>
-#include <kprocess.h>
-#include <kurl.h>
-
-class TQLabel;
-class TQCheckBox;
-
-class EscpWidget : public TQWidget
-{
-	Q_OBJECT
-
-public:
-	EscpWidget(TQWidget *parent = 0, const char *name = 0);
-	void setDevice(const TQString&);
-	void setPrinterName(const TQString&);
-
-protected slots:
-	void slotReceivedStdout(KProcess*, char*, int);
-	void slotReceivedStderr(KProcess*, char*, int);
-	void slotProcessExited(KProcess*);
-	void slotButtonClicked();
-
-protected:
-	void startCommand(const TQString& arg);
-
-private:
-	KProcess	m_proc;
-	KURL		m_deviceURL;
-	TQString		m_errorbuffer, m_outbuffer;
-	TQLabel		*m_printer, *m_device;
-	TQCheckBox	*m_useraw;
-	bool		m_hasoutput;
-};
-
-#endif