| 8bd51635 | 2014-10-22 01:27:30 | Timothy Pearson |
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 |
||
|
M akregator/src/feeditem.cpp M akregator/src/pageviewer.cpp M kaddressbook/viewmanager.cpp M kaddressbook/views/kaddressbookiconview.cpp M kalarm/prefdlg.cpp M karm/karm_part.cpp M karm/mainwindow.cpp M kmail/kmail_config_misc.desktop M kmail/kmheaders.cpp M kmail/kmmimeparttree.cpp M kmail/kmmsgpartdlg.cpp M kmail/searchwindow.cpp M korganizer/korganizer_configfonts.desktop M ktnef/gui/ms-tnef.desktop M tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop |
||
diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp
index b2bb86b..9bbf5c4 100644
--- a/akregator/src/feeditem.cpp
+++ b/akregator/src/feeditem.cpp
@@ -89,7 +89,7 @@
TQPixmap FeedItem::defaultPixmap()
{
- return TDEGlobal::iconLoader()->loadIcon("txt", TDEIcon::Small);
+ return TDEGlobal::iconLoader()->loadIcon(""text-plain", TDEIcon::Small);
}
void FeedItem::initialize(Feed* node)
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index eeeb406..14e702a 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -262,7 +262,7 @@
if (!favicon.isEmpty())
emit setTabIcon(TQPixmap(TDEGlobal::dirs()->findResource("cache", favicon+".png")));
else
- emit setTabIcon(SmallIcon("html"));
+ emit setTabIcon(SmallIcon("text-html"));
return val;
}
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 405b45c..3b78cdf 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -497,7 +497,7 @@
}
}
- drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
+ drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( ""x-office-address-book", TDEIcon::Desktop ) );
drag->dragCopy();
}
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 8b97801..fee2c11 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -112,7 +112,7 @@
setText( mAddressee.givenName() + " " + mAddressee.familyName() );
TQPixmap icon;
- TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
+ TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( ""x-office-address-book", TDEIcon::Desktop ) );
TDEABC::Picture pic = mAddressee.photo();
if ( pic.data().isNull() )
pic = mAddressee.logo();
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index f439d60..b76d877 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -122,7 +122,7 @@
setWFlags(TQt::WDestructiveClose);
setIconListAllVisible(true);
- TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("misc"));
+ TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("application-vnd.tde.misc"));
mMiscPage = new MiscPrefTab(frame);
frame = addVBoxPage(i18n("Email"), i18n("Email Alarm Settings"), DesktopIcon("mail_generic"));
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index c929ba6..d1d6e50 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -156,7 +156,7 @@
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."),
- TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
+ TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
@@ -171,21 +171,21 @@
TQT_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."),
-// TQString::fromLatin1("document"),
+// TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E,
// TQT_TQOBJECT(_taskView),
// TQT_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
- TQString::fromLatin1("document"),
+ TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
- TQString::fromLatin1("document"),
+ TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsIncomplete() ),
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index aa321de..55fadbc 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -294,7 +294,7 @@
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."),
- TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
+ TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
@@ -309,21 +309,21 @@
TQT_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."),
-// TQString::fromLatin1("document"),
+// TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E,
// TQT_TQOBJECT(_taskView),
// TQT_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
- TQString::fromLatin1("document"),
+ TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
- TQString::fromLatin1("document"),
+ TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsIncomplete() ),
diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index 061d4ed..a7aea4e 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=misc
+Icon=application-vnd.tde.misc
Type=Service
X-TDE-ServiceTypes=TDECModule
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 77af8e4..3196e62 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -2401,7 +2401,7 @@
if( count == 1 )
pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
else
- pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
+ pixmap = TQPixmap( DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeSmall) );
// Calculate hotspot (as in Konqueror)
if( !pixmap.isNull() ) {
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 200e773..4448cec 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -366,11 +366,11 @@
setPixmap( 0, SmallIcon("folder") );
} else if ( mimetype == "application/octet-stream" ) {
setText( 1, i18n("Unspecified Binary Data") ); // don't show "Unknown"...
- setPixmap( 0, SmallIcon("unknown") );
+ setPixmap( 0, SmallIcon("text-x-katefilelist") );
} else {
KMimeType::Ptr mtp = KMimeType::mimeType( mimetype );
setText( 1, (mtp && !mtp->comment().isEmpty()) ? mtp->comment() : mimetype );
- setPixmap( 0, mtp ? mtp->pixmap( TDEIcon::Small) : SmallIcon("unknown") );
+ setPixmap( 0, mtp ? mtp->pixmap( TDEIcon::Small) : SmallIcon("text-x-katefilelist") );
}
}
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 869ee01..2a0bd8c 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -65,7 +65,7 @@
// mimetype icon:
mIcon = new TQLabel( plainPage() );
- mIcon->setPixmap( DesktopIcon("unknown") );
+ mIcon->setPixmap( DesktopIcon("text-x-katefilelist") );
glay->addMultiCellWidget( mIcon, 0, 1, 0, 0 );
// row 0: Type combobox:
@@ -325,7 +325,7 @@
== TQValidator::Acceptable )
mIcon->setPixmap( KMimeType::mimeType( mimeType )->pixmap( TDEIcon::Desktop ) );
else
- mIcon->setPixmap( DesktopIcon("unknown") );
+ mIcon->setPixmap( DesktopIcon("text-x-katefilelist") );
}
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index d1f370a..bc97de0 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -95,7 +95,7 @@
if( mailList.count() == 1 )
pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
else
- pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
+ pixmap = TQPixmap( DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeSmall) );
d->setPixmap( pixmap );
return d;
diff --git a/korganizer/korganizer_configfonts.desktop b/korganizer/korganizer_configfonts.desktop
index be6cb42..172eb1f 100644
--- a/korganizer/korganizer_configfonts.desktop
+++ b/korganizer/korganizer_configfonts.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=fonts
+Icon=font-x-generics
Type=Service
X-TDE-ServiceTypes=TDECModule
diff --git a/ktnef/gui/ms-tnef.desktop b/ktnef/gui/ms-tnef.desktop
index 81f71e5..508f5ff 100644
--- a/ktnef/gui/ms-tnef.desktop
+++ b/ktnef/gui/ms-tnef.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/ms-tnef
-Icon=tar
+Icon=application-x-tar
Patterns=*.tnf;
Comment=TNEF File
Comment[af]=TNEF l��er
diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop
index f481a0a..5b6a8f5 100644
--- a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop
+++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=tdeabcdistlistupdater
Exec=tdeabcdistlistupdater --disable-autostart
** Diff limit reached (max: 250 lines) **
|
||