| 207e1347 | 2014-10-22 14:24:31 | Timothy Pearson |
Fix exec icon location and bring it into XDG compliance |
||
|
A pics/crystalsvg/cr128-mime-application-x-executable.png A pics/crystalsvg/cr16-mime-application-x-executable.png A pics/crystalsvg/cr22-mime-application-x-executable.png A pics/crystalsvg/cr22-system-run.png A pics/crystalsvg/cr32-mime-application-x-executable.png A pics/crystalsvg/cr32-system-run.png A pics/crystalsvg/cr48-mime-application-x-executable.png A pics/crystalsvg/cr64-mime-application-x-executable.png A pics/crystalsvg/crsc-mime-application-x-executable.svgz M mimetypes/application/x-desktop.desktop M mimetypes/application/x-executable-script.desktop M mimetypes/application/x-executable.desktop M mimetypes/application/x-msdos-program.desktop M tdeio/tdefile/knotifydialog.cpp M tdeio/tdeio/kurifilter.cpp M tdeprint/kmjob.cpp M tdeprint/management/kmconfigcommand.cpp M tdeprint/management/kmconfigjobs.cpp M tdeprint/management/kminstancepage.cpp M tdeprint/tools/escputil/escpwidget.cpp R pics/crystalsvg/cr128-filesys-exec.png R pics/crystalsvg/cr16-filesys-exec.png R pics/crystalsvg/cr22-action-exec.png R pics/crystalsvg/cr32-action-exec.png R pics/crystalsvg/cr32-filesys-exec.png R pics/crystalsvg/cr48-filesys-exec.png R pics/crystalsvg/cr64-filesys-exec.png R pics/crystalsvg/crsc-filesys-exec.svgz |
||
diff --git a/mimetypes/application/x-desktop.desktop b/mimetypes/application/x-desktop.desktop
index 82b9625..6aab0a8 100644
--- a/mimetypes/application/x-desktop.desktop
+++ b/mimetypes/application/x-desktop.desktop
@@ -81,7 +81,7 @@
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 003ad2c..76c3265 100644
--- a/mimetypes/application/x-executable-script.desktop
+++ b/mimetypes/application/x-executable-script.desktop
@@ -69,7 +69,7 @@
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 212aec6..0fd6486 100644
--- a/mimetypes/application/x-executable.desktop
+++ b/mimetypes/application/x-executable.desktop
@@ -81,6 +81,6 @@
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 20fc266..3fbc53c 100644
--- a/mimetypes/application/x-msdos-program.desktop
+++ b/mimetypes/application/x-msdos-program.desktop
@@ -79,7 +79,7 @@
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-filesys-exec.png
deleted file mode 100644
index f20b424..0000000
--- a/pics/crystalsvg/cr128-filesys-exec.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr128-mime-application-x-executable.png b/pics/crystalsvg/cr128-mime-application-x-executable.png
new file mode 100644
index 0000000..f20b424
--- /dev/null
+++ b/pics/crystalsvg/cr128-mime-application-x-executable.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-filesys-exec.png b/pics/crystalsvg/cr16-filesys-exec.png
deleted file mode 100644
index 0c1c3cc..0000000
--- a/pics/crystalsvg/cr16-filesys-exec.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr16-mime-application-x-executable.png b/pics/crystalsvg/cr16-mime-application-x-executable.png
new file mode 100644
index 0000000..0c1c3cc
--- /dev/null
+++ b/pics/crystalsvg/cr16-mime-application-x-executable.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-exec.png b/pics/crystalsvg/cr22-action-exec.png
deleted file mode 100644
index 14dc745..0000000
--- a/pics/crystalsvg/cr22-action-exec.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr22-mime-application-x-executable.png b/pics/crystalsvg/cr22-mime-application-x-executable.png
new file mode 100644
index 0000000..14dc745
--- /dev/null
+++ b/pics/crystalsvg/cr22-mime-application-x-executable.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-system-run.png b/pics/crystalsvg/cr22-system-run.png
new file mode 100644
index 0000000..14dc745
--- /dev/null
+++ b/pics/crystalsvg/cr22-system-run.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-exec.png b/pics/crystalsvg/cr32-action-exec.png
deleted file mode 100644
index d385386..0000000
--- a/pics/crystalsvg/cr32-action-exec.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-filesys-exec.png b/pics/crystalsvg/cr32-filesys-exec.png
deleted file mode 100644
index ac16b28..0000000
--- a/pics/crystalsvg/cr32-filesys-exec.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-mime-application-x-executable.png b/pics/crystalsvg/cr32-mime-application-x-executable.png
new file mode 100644
index 0000000..ac16b28
--- /dev/null
+++ b/pics/crystalsvg/cr32-mime-application-x-executable.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-system-run.png b/pics/crystalsvg/cr32-system-run.png
new file mode 100644
index 0000000..d385386
--- /dev/null
+++ b/pics/crystalsvg/cr32-system-run.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-filesys-exec.png b/pics/crystalsvg/cr48-filesys-exec.png
deleted file mode 100644
index 2aa2524..0000000
--- a/pics/crystalsvg/cr48-filesys-exec.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr48-mime-application-x-executable.png b/pics/crystalsvg/cr48-mime-application-x-executable.png
new file mode 100644
index 0000000..2aa2524
--- /dev/null
+++ b/pics/crystalsvg/cr48-mime-application-x-executable.png
Binary files differ
diff --git a/pics/crystalsvg/cr64-filesys-exec.png b/pics/crystalsvg/cr64-filesys-exec.png
deleted file mode 100644
index f05e3e4..0000000
--- a/pics/crystalsvg/cr64-filesys-exec.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr64-mime-application-x-executable.png b/pics/crystalsvg/cr64-mime-application-x-executable.png
new file mode 100644
index 0000000..f05e3e4
--- /dev/null
+++ b/pics/crystalsvg/cr64-mime-application-x-executable.png
Binary files differ
diff --git a/pics/crystalsvg/crsc-filesys-exec.svgz b/pics/crystalsvg/crsc-filesys-exec.svgz
deleted file mode 100644
index 75e3d8a..0000000
--- a/pics/crystalsvg/crsc-filesys-exec.svgz
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/crsc-mime-application-x-executable.svgz b/pics/crystalsvg/crsc-mime-application-x-executable.svgz
new file mode 100644
index 0000000..75e3d8a
--- /dev/null
+++ b/pics/crystalsvg/crsc-mime-application-x-executable.svgz
Binary files differ
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index eee9c9e..5d1aba6 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -237,7 +237,7 @@
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 809e2f5..3d79d0b 100644
--- a/tdeio/tdeio/kurifilter.cpp
+++ b/tdeio/tdeio/kurifilter.cpp
@@ -191,7 +191,7 @@
}
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 @@
}
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 2b42506..9f31453 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -75,7 +75,7 @@
{
// 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 4cf3399..971f8cc 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -32,7 +32,7 @@
{
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 c31e525..1c712de 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -32,7 +32,7 @@
{
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 09fe568..45030a5 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -88,7 +88,7 @@
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 @@
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
** Diff limit reached (max: 250 lines) **
|
||