Fix exec icon location and bring it into XDG compliance

20 files changed, 16 insertions, 16 deletions

diff --git a/mimetypes/application/x-desktop.desktop b/mimetypes/application/x-desktop.desktop
index 82b96250e..6aab0a8b8 100644
--- a/mimetypes/application/x-desktop.desktop
+++ b/mimetypes/application/x-desktop.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=桌面配置文件
 Comment[zh_HK]=桌面設定檔
 Comment[zh_TW]=桌面設定檔
 Comment[zu]=Ifayela Lokuhlanganisela Ledesktop
-Icon=exec
+Icon=application-x-executable
 Type=MimeType
 MimeType=application/x-desktop
 Patterns=*.desktop;*.kdelnk;
diff --git a/mimetypes/application/x-executable-script.desktop b/mimetypes/application/x-executable-script.desktop
index 003ad2c26..76c326560 100644
--- a/mimetypes/application/x-executable-script.desktop
+++ b/mimetypes/application/x-executable-script.desktop
@@ -69,7 +69,7 @@ Comment[vi]=Tập lệnh (có lẽ có khả năng thực hiện)
 Comment[zh_CN]=脚本(可能可执行)
 Comment[zh_HK]=Script (可能是可執行檔)
 Comment[zh_TW]=文稿（可能可執行）
-Icon=exec
+Icon=application-x-executable
 Type=MimeType
 MimeType=application/x-executable-script
 X-TDE-IsAlso=text/plain
diff --git a/mimetypes/application/x-executable.desktop b/mimetypes/application/x-executable.desktop
index 212aec65c..0fd6486e3 100644
--- a/mimetypes/application/x-executable.desktop
+++ b/mimetypes/application/x-executable.desktop
@@ -81,6 +81,6 @@ Comment[zh_CN]=可执行文件
 Comment[zh_HK]=可執行檔
 Comment[zh_TW]=可執行檔
 Comment[zu]=Ifayela Eliphumelelisekayo
-Icon=exec
+Icon=application-x-executable
 Type=MimeType
 MimeType=application/x-executable
diff --git a/mimetypes/application/x-msdos-program.desktop b/mimetypes/application/x-msdos-program.desktop
index 20fc266bc..3fbc53c0e 100644
--- a/mimetypes/application/x-msdos-program.desktop
+++ b/mimetypes/application/x-msdos-program.desktop
@@ -79,7 +79,7 @@ Comment[zh_CN]=Windows 可执行文件
 Comment[zh_HK]=Windows 可執行檔
 Comment[zh_TW]=Windows 可執行檔
 Comment[zu]=Ama-window Aphumelelanga
-Icon=exec
+Icon=application-x-executable
 Type=MimeType
 MimeType=application/x-msdos-program
 X-TDE-IsAlso=application/x-executable
diff --git a/pics/crystalsvg/cr128-filesys-exec.png b/pics/crystalsvg/cr128-mime-application-x-executable.png
index f20b42433..f20b42433 100644
--- a/pics/crystalsvg/cr128-filesys-exec.png
+++ b/pics/crystalsvg/cr128-mime-application-x-executable.png
diff --git a/pics/crystalsvg/cr16-filesys-exec.png b/pics/crystalsvg/cr16-mime-application-x-executable.png
index 0c1c3ccf5..0c1c3ccf5 100644
--- a/pics/crystalsvg/cr16-filesys-exec.png
+++ b/pics/crystalsvg/cr16-mime-application-x-executable.png
diff --git a/pics/crystalsvg/cr22-action-exec.png b/pics/crystalsvg/cr22-mime-application-x-executable.png
index 14dc7455c..14dc7455c 100644
--- a/pics/crystalsvg/cr22-action-exec.png
+++ b/pics/crystalsvg/cr22-mime-application-x-executable.png
diff --git a/pics/crystalsvg/cr22-system-run.png b/pics/crystalsvg/cr22-system-run.png
new file mode 100644
index 000000000..14dc7455c
--- /dev/null
+++ b/pics/crystalsvg/cr22-system-run.png
diff --git a/pics/crystalsvg/cr32-filesys-exec.png b/pics/crystalsvg/cr32-mime-application-x-executable.png
index ac16b2882..ac16b2882 100644
--- a/pics/crystalsvg/cr32-filesys-exec.png
+++ b/pics/crystalsvg/cr32-mime-application-x-executable.png
diff --git a/pics/crystalsvg/cr32-action-exec.png b/pics/crystalsvg/cr32-system-run.png
index d38538649..d38538649 100644
--- a/pics/crystalsvg/cr32-action-exec.png
+++ b/pics/crystalsvg/cr32-system-run.png
diff --git a/pics/crystalsvg/cr48-filesys-exec.png b/pics/crystalsvg/cr48-mime-application-x-executable.png
index 2aa25245c..2aa25245c 100644
--- a/pics/crystalsvg/cr48-filesys-exec.png
+++ b/pics/crystalsvg/cr48-mime-application-x-executable.png
diff --git a/pics/crystalsvg/cr64-filesys-exec.png b/pics/crystalsvg/cr64-mime-application-x-executable.png
index f05e3e446..f05e3e446 100644
--- a/pics/crystalsvg/cr64-filesys-exec.png
+++ b/pics/crystalsvg/cr64-mime-application-x-executable.png
diff --git a/pics/crystalsvg/crsc-filesys-exec.svgz b/pics/crystalsvg/crsc-mime-application-x-executable.svgz
index 75e3d8ae1..75e3d8ae1 100644
--- a/pics/crystalsvg/crsc-filesys-exec.svgz
+++ b/pics/crystalsvg/crsc-mime-application-x-executable.svgz
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index eee9c9ee5..5d1aba62d 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -237,7 +237,7 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name,
     m_listview->setFullWidth( true );
     m_listview->setAllColumnsShowFocus( true );
 
-    TQPixmap pexec = SmallIcon("exec");
+    TQPixmap pexec = SmallIcon("application-x-executable");
     TQPixmap pstderr = SmallIcon("terminal");
     TQPixmap pmessage = SmallIcon("application-vnd.tde.info");
     TQPixmap plogfile = SmallIcon("text-x-log");
diff --git a/tdeio/tdeio/kurifilter.cpp b/tdeio/tdeio/kurifilter.cpp
index 809e2f504..3d79d0bfd 100644
--- a/tdeio/tdeio/kurifilter.cpp
+++ b/tdeio/tdeio/kurifilter.cpp
@@ -191,7 +191,7 @@ TQString KURIFilterData::iconName()
                 }
                 else {
                     // use default
-                    m_strIconName = TQString::fromLatin1("exec");
+                    m_strIconName = TQString::fromLatin1("application-x-executable");
                 }
 #else // HAVE_ELFICON
 		// Try to find an icon with the same name as the binary (useful for non-tde apps)
@@ -205,7 +205,7 @@ TQString KURIFilterData::iconName()
 		}
 		else {
 			// use default
-			m_strIconName = TQString::fromLatin1("exec");
+			m_strIconName = TQString::fromLatin1("application-x-executable");
 		}
 		// Try to load from elf file (if supported)
 		// Check for an embedded icon
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);