| 50be8112 | 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 buildtools/autotools/autolistviewitems.cpp M buildtools/autotools/kdevautoproject.desktop M buildtools/autotools/kdevtdeautoproject.desktop M buildtools/autotools/tdefilednddetailview.cpp M buildtools/autotools/tdefiledndiconview.cpp M buildtools/qmake/qmakescopeitem.cpp M languages/ada/adasupportpart.cpp M languages/cpp/app_templates/tdecmodule/module.desktop M languages/cpp/cppsupportpart.cpp M languages/cpp/debugger/debuggerpart.cpp M languages/cpp/debugger/kdevdebugger.desktop M languages/cpp/kdevcppsupport.desktop M languages/cpp/kdevcsupport.desktop M languages/java/javasupportpart.cpp M languages/kjssupport/kjsproblems.cpp M languages/php/phpsupportpart.cpp M mimetypes/x-fortran.desktop M parts/abbrev/abbrevconfigwidget.cpp M parts/abbrev/kdevabbrev.desktop M parts/bookmarks/bookmarks_widget.cpp M parts/documentation/interfaces/kdevdocumentationplugin.cpp M parts/doxygen/input.cpp M parts/fileview/filegroupswidget.cpp M parts/scripting/kdevscripting.desktop M vcs/subversion/integrator/kdevsubversionintegrator.desktop M vcs/subversion/kdevsubversion.desktop |
||
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index 971a2db..e69c12b 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -102,7 +102,7 @@
: 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 @@
{
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 043a6c5..dde9db4 100644
--- a/buildtools/autotools/kdevautoproject.desktop
+++ b/buildtools/autotools/kdevautoproject.desktop
@@ -91,7 +91,7 @@
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 18d5364..128eb21 100644
--- a/buildtools/autotools/kdevtdeautoproject.desktop
+++ b/buildtools/autotools/kdevtdeautoproject.desktop
@@ -86,7 +86,7 @@
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 7449257..c4b4f50 100644
--- a/buildtools/autotools/tdefilednddetailview.cpp
+++ b/buildtools/autotools/tdefilednddetailview.cpp
@@ -160,7 +160,7 @@
}
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 d192b3b..f1f9afa 100644
--- a/buildtools/autotools/tdefiledndiconview.cpp
+++ b/buildtools/autotools/tdefiledndiconview.cpp
@@ -149,7 +149,7 @@
}
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 70e9a6b..496adad 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -50,7 +50,7 @@
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 @@
// 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 aac0261..e08ef9a 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -58,7 +58,7 @@
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("<b>Problem reporter</b><p>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 a1975f2..17817af 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 3573904..11a949a 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -449,7 +449,7 @@
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 @@
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 61384cb..6621cbf 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -291,7 +291,7 @@
"<b>Libraries</b>"));
- 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 bcf8246..69ff852 100644
--- a/languages/cpp/debugger/kdevdebugger.desktop
+++ b/languages/cpp/debugger/kdevdebugger.desktop
@@ -78,7 +78,7 @@
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 3b78a13..cf6b0a8 100644
--- a/languages/cpp/kdevcppsupport.desktop
+++ b/languages/cpp/kdevcppsupport.desktop
@@ -79,7 +79,7 @@
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 907b97f..e3c042c 100644
--- a/languages/cpp/kdevcsupport.desktop
+++ b/languages/cpp/kdevcsupport.desktop
@@ -78,7 +78,7 @@
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 63b174f..c4aa739 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -147,7 +147,7 @@
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 1a13870..d6bdeda 100644
--- a/languages/kjssupport/kjsproblems.cpp
+++ b/languages/kjssupport/kjsproblems.cpp
@@ -53,7 +53,7 @@
addColumn ("File");
addColumn ("Line #");
addColumn ("Problem:");
- setIcon( SmallIcon("info") );
+ setIcon( SmallIcon("application-vnd.tde.info") );
}
@@ -65,7 +65,7 @@
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 4f764f1..859864e 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -101,7 +101,7 @@
action->setWhatsThis(i18n("<b>New class</b><p>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("<b>PHP problems</b><p>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 2ba80ee..241c501 100644
--- a/mimetypes/x-fortran.desktop
+++ b/mimetypes/x-fortran.desktop
@@ -36,7 +36,7 @@
Comment[zh_CN]=Fortran ���������
Comment[zh_TW]=Fortran ���������������
** Diff limit reached (max: 250 lines) **
|
||