From 207e13471364666e6a6fdceed64207f986899bbc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 22 Oct 2014 14:24:31 -0500
Subject: Fix exec icon location and bring it into XDG compliance

---
 tdeprint/kmjob.cpp                      | 2 +-
 tdeprint/management/kmconfigcommand.cpp | 2 +-
 tdeprint/management/kmconfigjobs.cpp    | 2 +-
 tdeprint/management/kminstancepage.cpp  | 4 ++--
 tdeprint/tools/escputil/escpwidget.cpp  | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tdeprint')

diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp
index 2b42506f5..9f314539e 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -75,7 +75,7 @@ TQString KMJob::pixmap()
 {
 	// special case
 	if (m_type == KMJob::Threaded)
-		return TQString::fromLatin1("exec");
+		return TQString::fromLatin1("application-x-executable");
 
 	// normal case
 	QString	str("tdeprint_job");
diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp
index 4cf33998f..971f8cce5 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -32,7 +32,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
 {
 	setPageName(i18n("Commands"));
 	setPageHeader(i18n("Command Settings"));
-	setPagePixmap("exec");
+	setPagePixmap("application-x-executable");
 
 	TQGroupBox	*gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this);
 	TQLabel	*lab = new TQLabel(i18n(
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index c31e525be..1c712de3d 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -32,7 +32,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
 {
 	setPageName(i18n("Jobs"));
 	setPageHeader(i18n("Print Job Settings"));
-	setPagePixmap("exec");
+	setPagePixmap("application-x-executable");
 
 	TQGroupBox	*box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this);
 
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 09fe56867..45030a587 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -88,7 +88,7 @@ void KMInstancePage::initActions()
 	addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy()));
 	addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove()));
 	m_buttons.append(0);
-	addButton(i18n("Set as Default"), "exec", TQT_SLOT(slotDefault()));
+	addButton(i18n("Set as Default"), "application-x-executable", TQT_SLOT(slotDefault()));
 	addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings()));
 	m_buttons.append(0);
 	addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest()));
@@ -110,7 +110,7 @@ void KMInstancePage::setPrinter(KMPrinter *p)
 		for (;it.current();++it)
 		{
 			TQStringList	pair = TQStringList::split('/',it.current()->name(),false);
-			m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "document-print")),(pair.count() > 1 ? pair[1] : i18n("(Default)")));
+			m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "application-x-executable" : "document-print")),(pair.count() > 1 ? pair[1] : i18n("(Default)")));
 		}
 		m_view->sort();
 	}
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index 9afff64ac..901d509c9 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -72,15 +72,15 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
 
 	TQPushButton	*cleanbtn = new TQPushButton(this, "-c");
-	cleanbtn->setPixmap(DesktopIcon("exec"));
+	cleanbtn->setPixmap(DesktopIcon("application-x-executable"));
 	TQPushButton	*nozzlebtn = new TQPushButton(this, "-n");
-	nozzlebtn->setPixmap(DesktopIcon("exec"));
+	nozzlebtn->setPixmap(DesktopIcon("application-x-executable"));
 	TQPushButton	*alignbtn = new TQPushButton(this, "-a");
-	alignbtn->setPixmap(DesktopIcon("exec"));
+	alignbtn->setPixmap(DesktopIcon("application-x-executable"));
 	TQPushButton	*inkbtn = new TQPushButton(this, "-i");
 	inkbtn->setPixmap(DesktopIcon("tdeprint_inklevel"));
 	TQPushButton	*identbtn = new TQPushButton(this, "-d");
-	identbtn->setPixmap(DesktopIcon("exec"));
+	identbtn->setPixmap(DesktopIcon("application-x-executable"));
 
 	TQFont	f(font());
 	f.setBold(true);
-- 
cgit v1.2.1