From 50be8112bdb941ec5cc0f86bac1b0ab14ee2cf79 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 01:27:30 -0500 Subject: 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 --- buildtools/autotools/autolistviewitems.cpp | 4 ++-- buildtools/autotools/kdevautoproject.desktop | 2 +- buildtools/autotools/kdevtdeautoproject.desktop | 2 +- buildtools/autotools/tdefilednddetailview.cpp | 2 +- buildtools/autotools/tdefiledndiconview.cpp | 2 +- buildtools/qmake/qmakescopeitem.cpp | 4 ++-- languages/ada/adasupportpart.cpp | 2 +- languages/cpp/app_templates/tdecmodule/module.desktop | 2 +- languages/cpp/cppsupportpart.cpp | 4 ++-- languages/cpp/debugger/debuggerpart.cpp | 2 +- languages/cpp/debugger/kdevdebugger.desktop | 2 +- languages/cpp/kdevcppsupport.desktop | 2 +- languages/cpp/kdevcsupport.desktop | 2 +- languages/java/javasupportpart.cpp | 2 +- languages/kjssupport/kjsproblems.cpp | 4 ++-- languages/php/phpsupportpart.cpp | 2 +- mimetypes/x-fortran.desktop | 2 +- parts/abbrev/abbrevconfigwidget.cpp | 4 ++-- parts/abbrev/kdevabbrev.desktop | 2 +- parts/bookmarks/bookmarks_widget.cpp | 2 +- parts/documentation/interfaces/kdevdocumentationplugin.cpp | 2 +- parts/doxygen/input.cpp | 4 ++-- parts/fileview/filegroupswidget.cpp | 2 +- parts/scripting/kdevscripting.desktop | 2 +- vcs/subversion/integrator/kdevsubversionintegrator.desktop | 2 +- vcs/subversion/kdevsubversion.desktop | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index 971a2dbe..e69c12b1 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -102,7 +102,7 @@ TargetItem::TargetItem( TQListView *lv, bool group, const TQString &text ) : ProjectItem( Target, lv, text ) { sources.setAutoDelete( true ); - setPixmap( 0, group ? SmallIcon( "tar" ) : SmallIcon( "binary" ) ); + setPixmap( 0, group ? SmallIcon( "application-x-tar" ) : SmallIcon( "application-octet-stream" ) ); } @@ -115,7 +115,7 @@ FileItem::FileItem( TQListView *lv, const TQString &text, bool set_is_subst ) { if(!is_subst) { - setPixmap( 0, SmallIcon( "document" ) ); + setPixmap( 0, SmallIcon( "text-x-generic" ) ); } else { diff --git a/buildtools/autotools/kdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop index 043a6c5d..dde9db46 100644 --- a/buildtools/autotools/kdevautoproject.desktop +++ b/buildtools/autotools/kdevautoproject.desktop @@ -91,7 +91,7 @@ GenericName[uz@cyrillic]=Automake лойиҳаси GenericName[zh_CN]=Automake 工程 GenericName[zh_TW]=Automake 專案 X-TDE-ServiceTypes=TDevelop/Project -Icon=make +Icon=text-x-text-x-makefile X-TDE-Library=libkdevautoproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/autotools/kdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop index 18d5364b..128eb218 100644 --- a/buildtools/autotools/kdevtdeautoproject.desktop +++ b/buildtools/autotools/kdevtdeautoproject.desktop @@ -86,7 +86,7 @@ GenericName[tr]=TDE Automake Projesi GenericName[zh_CN]=TDE Automake 工程 GenericName[zh_TW]=TDE Automake 專案 X-TDE-ServiceTypes=TDevelop/Project -Icon=make +Icon=text-x-text-x-makefile X-TDE-Library=libkdevautoproject X-TDevelop-Version=5 X-TDevelop-Args=kde diff --git a/buildtools/autotools/tdefilednddetailview.cpp b/buildtools/autotools/tdefilednddetailview.cpp index 74492577..c4b4f504 100644 --- a/buildtools/autotools/tdefilednddetailview.cpp +++ b/buildtools/autotools/tdefilednddetailview.cpp @@ -160,7 +160,7 @@ void KFileDnDDetailView::startDrag(){ } TQPixmap pixmap; if( urls.count() > 1 ){ - pixmap = DesktopIcon( "tdemultiple", 16 ); + pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", 16 ); } if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( 16 ); diff --git a/buildtools/autotools/tdefiledndiconview.cpp b/buildtools/autotools/tdefiledndiconview.cpp index d192b3b0..f1f9afae 100644 --- a/buildtools/autotools/tdefiledndiconview.cpp +++ b/buildtools/autotools/tdefiledndiconview.cpp @@ -149,7 +149,7 @@ TQDragObject* KFileDnDIconView::dragObject() { } TQPixmap pixmap; if( urls.count() > 1 ) - pixmap = DesktopIcon( "tdemultiple", iconSize() ); + pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", iconSize() ); if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( iconSize() ); TQPoint hotspot; diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 70e9a6ba..496adad8 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -50,7 +50,7 @@ GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMak this->owner = spitem; groupType = type; // files.setAutoDelete( true ); - setPixmap( 0, SmallIcon( "tar" ) ); + setPixmap( 0, SmallIcon( "application-x-tar" ) ); } GroupItem::GroupType GroupItem::groupTypeForExtension( const TQString &ext ) @@ -298,7 +298,7 @@ FileItem::FileItem( TQListView *lv, const TQString &text ) // if excluded is set the file is excluded in the subproject/project. // by default excluded is set to false, thus file is included // excluded = exclude; - setPixmap( 0, SmallIcon( "document" ) ); + setPixmap( 0, SmallIcon( "text-x-generic" ) ); } diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index aac02610..e08ef9a3 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -58,7 +58,7 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri d->problemReporter = new ProblemReporter (this); // connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), // d->problemReporter, TQT_SLOT (configWidget (KDialogBase*))); - d->problemReporter->setIcon( SmallIcon("info") ); + d->problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( d->problemReporter, i18n("Problems"), i18n("Problem reporter")); TQWhatsThis::add(d->problemReporter, i18n("Problem reporter

This window shows various \"problems\" in your project. " "It displays errors reported by a language parser.")); diff --git a/languages/cpp/app_templates/tdecmodule/module.desktop b/languages/cpp/app_templates/tdecmodule/module.desktop index a1975f26..17817afe 100644 --- a/languages/cpp/app_templates/tdecmodule/module.desktop +++ b/languages/cpp/app_templates/tdecmodule/module.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=tdecmshell %{APPNAMELC} -Icon=misc +Icon=application-vnd.tde.misc Type=Application X-TDE-ModuleType=Library diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 35739045..11a949a8 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -449,7 +449,7 @@ void CppSupportPart::configWidget( KDialogBase *dlg ) connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) ); vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"), - BarIcon( "source_cpp", TDEIcon::SizeMedium) ); + BarIcon( "text-x-c++src", TDEIcon::SizeMedium) ); ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox ); ww->setPart( this ); connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept())); @@ -581,7 +581,7 @@ void CppSupportPart::embedProblemReporter( bool force ) if ( force || m_backgroundParserConfig->useProblemReporter() ) { m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" ); - m_problemReporter->setIcon( SmallIcon( "info" ) ); + m_problemReporter->setIcon( SmallIcon( "application-vnd.tde.info" ) ); m_problemReporter->setCaption( i18n( "Problem Reporter" ) ); mainWindow( ) ->embedOutputView( m_problemReporter, i18n( "Problems" ), i18n( "Problem reporter" ) ); } diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 61384cbd..6621cbf8 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -291,7 +291,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "Libraries")); - action = new TDEAction(i18n("Examine Core File..."), "core", 0, + action = new TDEAction(i18n("Examine Core File..."), "application-x-core", 0, this, TQT_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); diff --git a/languages/cpp/debugger/kdevdebugger.desktop b/languages/cpp/debugger/kdevdebugger.desktop index bcf82469..69ff8525 100644 --- a/languages/cpp/debugger/kdevdebugger.desktop +++ b/languages/cpp/debugger/kdevdebugger.desktop @@ -78,7 +78,7 @@ GenericName[tg]=Интеграл ёфтани созгузор GenericName[tr]=Hata Ayıklayıcı Önucu GenericName[zh_CN]=调试器前端 GenericName[zh_TW]=除錯器前端 -Icon=debugger +Icon=application-x-debugger X-TDE-ServiceTypes=TDevelop/Plugin X-TDE-Library=libkdevdebugger X-TDevelop-Version=5 diff --git a/languages/cpp/kdevcppsupport.desktop b/languages/cpp/kdevcppsupport.desktop index 3b78a131..cf6b0a8e 100644 --- a/languages/cpp/kdevcppsupport.desktop +++ b/languages/cpp/kdevcppsupport.desktop @@ -79,7 +79,7 @@ GenericName[tr]=C++ Desteği GenericName[zh_CN]=C++ 支持 GenericName[zh_TW]=C++ 支援 X-TDE-ServiceTypes=TDevelop/LanguageSupport -Icon=source_cpp +Icon=text-x-text-x-csrcpp X-TDE-Library=libkdevcppsupport X-TDevelop-Version=5 X-TDevelop-Language=C++ diff --git a/languages/cpp/kdevcsupport.desktop b/languages/cpp/kdevcsupport.desktop index 907b97fb..e3c042c7 100644 --- a/languages/cpp/kdevcsupport.desktop +++ b/languages/cpp/kdevcsupport.desktop @@ -78,7 +78,7 @@ GenericName[tr]=C Desteği GenericName[zh_CN]=C 支持 GenericName[zh_TW]=C 支援 X-TDE-ServiceTypes=TDevelop/LanguageSupport -Icon=source_cpp +Icon=text-x-text-x-csrcpp X-TDE-Library=libkdevcppsupport X-TDevelop-Version=5 X-TDevelop-Language=C diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 63b174fc..c4aa7390 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -147,7 +147,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr this, TQT_SLOT(partRemoved(KParts::Part*))); m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" ); - m_problemReporter->setIcon( SmallIcon("info") ); + m_problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter")); connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), diff --git a/languages/kjssupport/kjsproblems.cpp b/languages/kjssupport/kjsproblems.cpp index 1a13870e..d6bdeda1 100644 --- a/languages/kjssupport/kjsproblems.cpp +++ b/languages/kjssupport/kjsproblems.cpp @@ -53,7 +53,7 @@ KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *nam addColumn ("File"); addColumn ("Line #"); addColumn ("Problem:"); - setIcon( SmallIcon("info") ); + setIcon( SmallIcon("application-vnd.tde.info") ); } @@ -65,7 +65,7 @@ KJSProblems::~KJSProblems() void KJSProblems::clearItems() { clear(); - setIcon( SmallIcon("info") ); + setIcon( SmallIcon("application-vnd.tde.info") ); } void KJSProblems::addLine(const TQString &file, int lineNo, const TQString &message) diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 4f764f1f..859864ee 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -101,7 +101,7 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin action->setWhatsThis(i18n("New class

Runs New Class wizard.")); m_phpErrorView = new PHPErrorView(this, 0, "phpErrorWidget"); - m_phpErrorView->setIcon( SmallIcon("info") ); + m_phpErrorView->setIcon( SmallIcon("application-vnd.tde.info") ); TQWhatsThis::add(m_phpErrorView, i18n("PHP problems

This view shows PHP parser warnings, errors, and fatal errors.")); mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems")); diff --git a/mimetypes/x-fortran.desktop b/mimetypes/x-fortran.desktop index 2ba80ee0..241c5016 100644 --- a/mimetypes/x-fortran.desktop +++ b/mimetypes/x-fortran.desktop @@ -36,7 +36,7 @@ Comment[tr]=Fortran Kaynak Dosyası Comment[zh_CN]=Fortran 源文件 Comment[zh_TW]=Fortran 程式源碼檔 Hidden=false -Icon=source_f +Icon=text-x-text-x-fortran MimeType=text/x-fortran Patterns=*.f;*.F;*.f77;*.f90;*.f95;*.for;*.ftn;*.fpp Type=MimeType diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp index 7019b9fb..dd38e0e8 100644 --- a/parts/abbrev/abbrevconfigwidget.cpp +++ b/parts/abbrev/abbrevconfigwidget.cpp @@ -42,7 +42,7 @@ AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent, const templ->suffixes, templ->code, templ->code ); - it->setPixmap( 0, SmallIcon("template_source")); + it->setPixmap( 0, SmallIcon("application-vnd.tde.template_source")); } checkWordCompletion->setChecked( part->autoWordCompletionEnabled() ); @@ -95,7 +95,7 @@ void AbbrevConfigWidget::codeChanged() if( item ){ item->setText( 3, editCode->text() ); if (item->text(3) == item->text(4)) - item->setPixmap( 0, SmallIcon("template_source") ); + item->setPixmap( 0, SmallIcon("application-vnd.tde.template_source") ); else item->setPixmap( 0, SmallIcon("document-save") ); } diff --git a/parts/abbrev/kdevabbrev.desktop b/parts/abbrev/kdevabbrev.desktop index c13e5770..715e32dc 100644 --- a/parts/abbrev/kdevabbrev.desktop +++ b/parts/abbrev/kdevabbrev.desktop @@ -76,7 +76,7 @@ GenericName[tr]=Kısaltma Genişlemesi GenericName[zh_CN]=缩写扩展 GenericName[zh_TW]=縮寫擴展 X-TDE-ServiceTypes=TDevelop/Plugin -Icon=fontsizeup +Icon=font-x-genericsizeup X-TDE-Library=libkdevabbrev X-TDevelop-Version=5 X-TDevelop-Scope=Global diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index cc7316c8..39dad5e3 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -211,7 +211,7 @@ void BookmarksWidget::createURL( EditorData * data ) { TQListViewItem * file = new BookmarkItem( this, data->url ); file->setOpen( true ); - file->setPixmap( 0, SmallIcon( "document" ) ); + file->setPixmap( 0, SmallIcon( "text-x-generic" ) ); TQValueListIterator< TQPair > it = data->marks.begin(); while ( it != data->marks.end() ) diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index afc9abad..c8366877 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -76,7 +76,7 @@ void DocumentationItem::init( ) icon = "contents"; break; default: - icon = "document"; + icon = "text-x-generic"; } setPixmap(0, SmallIcon(icon)); diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index d8a1ebc7..1194d0bc 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -219,7 +219,7 @@ InputString::InputString(const TQString & label, if (m == StringFile || m == StringDir) { br = new TQPushButton(this); - br->setPixmap(SmallIcon(m==StringFile? "document" : "folder")); + br->setPixmap(SmallIcon(m==StringFile? "text-x-generic" : "folder")); TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder")); layout->addWidget(br, 0, 2); } @@ -362,7 +362,7 @@ InputStrList::InputStrList(const TQString & label, if (lm != ListString) { if (lm & ListFile) { brFile = new TQPushButton(dw); - brFile->setPixmap(SmallIcon("document")); + brFile->setPixmap(SmallIcon("text-x-generic")); TQToolTip::add(brFile, i18n("Browse to a file")); boxlayout->addWidget(brFile); } diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 8a3e19b4..8400b2f1 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -145,7 +145,7 @@ private: FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName) : TQListViewItem(parent), fullname(fileName) { - setPixmap(0, SmallIcon("document")); + setPixmap(0, SmallIcon("text-x-generic")); TQFileInfo fi(fileName); setText(0, fi.fileName()); setText(1, "./" + fi.dirPath()); diff --git a/parts/scripting/kdevscripting.desktop b/parts/scripting/kdevscripting.desktop index ba1f4dea..ef5b56e4 100644 --- a/parts/scripting/kdevscripting.desktop +++ b/parts/scripting/kdevscripting.desktop @@ -61,7 +61,7 @@ Comment[sv]=Skriptinsticksprogrammet erbjuder KScript-baserad styrning av progra Comment[tr]=Betik Yazma eklentisi TDevelop uygulamasına KScript tabanlı betik yazmayı sunar. Comment[zh_CN]=脚本插件可为 TDevelop 应用程序提供基于 KScript 的脚本。 Comment[zh_TW]=文稿外掛程式提供 TDevelop 應用程式一個 KScript 基礎的文稿機制。 -Icon=shellscript +Icon=text-x-text-x-script X-TDE-ServiceTypes=TDevelop/Plugin X-TDevelop-Plugin-Version=1 diff --git a/vcs/subversion/integrator/kdevsubversionintegrator.desktop b/vcs/subversion/integrator/kdevsubversionintegrator.desktop index 76971af6..39e6cdcd 100644 --- a/vcs/subversion/integrator/kdevsubversionintegrator.desktop +++ b/vcs/subversion/integrator/kdevsubversionintegrator.desktop @@ -35,7 +35,7 @@ Comment[sv]=Funktion för integrering av Subversion i projekt Comment[tr]=Subversion Proje Bütünleştirme Aracı Comment[zh_CN]=Subversion 工程集成功能 Comment[zh_TW]=Subversion 專案整合工具 -Icon=misc +Icon=application-vnd.tde.misc Exec=blubb X-TDE-ServiceTypes=TDevelop/VCSIntegrator X-TDE-Library=libsubversionintegrator diff --git a/vcs/subversion/kdevsubversion.desktop b/vcs/subversion/kdevsubversion.desktop index 3fd79b5a..4e9d2d93 100644 --- a/vcs/subversion/kdevsubversion.desktop +++ b/vcs/subversion/kdevsubversion.desktop @@ -27,7 +27,7 @@ GenericName[pt_BR]=Subversão GenericName[ru]=Интеграция Subversion GenericName[ta]=துணை பதிப்பு GenericName[tg]=Зер-ривоят -Icon=misc +Icon=application-vnd.tde.misc X-TDE-ServiceTypes=TDevelop/VersionControl X-TDE-Library=libkdevsubversion X-TDevelop-Version=5 -- cgit v1.2.3