From cdc6cd63c25e1ab1909b27ac42ffa15435ff575d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 01:27:26 -0500 Subject: [PATCH] Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown --- extras/system/tdeeject.desktop | 2 +- kshutdown/actions.cpp | 2 +- kshutdown/mmainwindow.cpp | 2 +- kshutdown/msettingsdialog.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/system/tdeeject.desktop b/extras/system/tdeeject.desktop index 02013ef..b9b4f1b 100644 --- a/extras/system/tdeeject.desktop +++ b/extras/system/tdeeject.desktop @@ -8,7 +8,7 @@ Comment[el]=Εξαγωγή CD Exec=tdeeject /dev/cdrom GenericName= GenericName[en_US]= -Icon=cdrom_unmount +Icon=application-x-cdrom_unmount MimeType= Path= StartupNotify=true diff --git a/kshutdown/actions.cpp b/kshutdown/actions.cpp index 4b331e0..a433654 100644 --- a/kshutdown/actions.cpp +++ b/kshutdown/actions.cpp @@ -220,7 +220,7 @@ TQPixmap Action::getIcon(const Type action) const { TQMapIterator i = iconCache->find(action); - return (i == iconCache->end()) ? SmallIcon("misc") : i.data(); + return (i == iconCache->end()) ? SmallIcon("application-vnd.tde.misc") : i.data(); } TQString Action::getIconName(const Type action) const diff --git a/kshutdown/mmainwindow.cpp b/kshutdown/mmainwindow.cpp index e030eb1..4ecf3d8 100644 --- a/kshutdown/mmainwindow.cpp +++ b/kshutdown/mmainwindow.cpp @@ -637,7 +637,7 @@ TQWidget *MMainWindow::initWidgets() cb_delayTypes->insertItem(SmallIcon("messagebox_warning"), i18n("No Delay")); cb_delayTypes->insertItem(SmallIcon("clock"), i18n("Time From Now (HH:MM)")); cb_delayTypes->insertItem(SmallIcon("date"), i18n("At Date/Time")); - cb_delayTypes->insertItem(SmallIcon("misc"), i18n("When selected application exit")); + cb_delayTypes->insertItem(SmallIcon("application-vnd.tde.misc"), i18n("When selected application exit")); if (MiscUtils::isRestricted("tab_time")) TQWhatsThis::add(cb_delayTypes, i18n("Disabled by the Administrator.")); else diff --git a/kshutdown/msettingsdialog.cpp b/kshutdown/msettingsdialog.cpp index 95e2480..f4ca335 100644 --- a/kshutdown/msettingsdialog.cpp +++ b/kshutdown/msettingsdialog.cpp @@ -205,7 +205,7 @@ void MSettingsDialog::initAdvancedPage() in_cdTrayCloseCommand, SLOT(setEnabled(bool))); // kde settings - KPushButton *b_kdeSettings = new KPushButton(SmallIcon("misc"), i18n("Related TDE Settings..."), _advancedPage, "KPushButton::b_kdeSettings"); + KPushButton *b_kdeSettings = new KPushButton(SmallIcon("application-vnd.tde.misc"), i18n("Related TDE Settings..."), _advancedPage, "KPushButton::b_kdeSettings"); connect(b_kdeSettings, SIGNAL(clicked()), SLOT(slotKDESettings())); l->addWidget(gb_afterLogin);