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

chalk/ui/layerlist.cpp

@@ -733,7 +733,7 @@ void LayerList::constructMenu( LayerItem *layer )
         for( int i = 0, n = d->properties.count(); i < n; ++i )
             if( !layer->isFolder() || d->properties[i].validForFolders )
                 d->contextMenu.insertItem( layer->d->properties[i] ? d->properties[i].enabledIcon : d->properties[i].disabledIcon, d->properties[i].displayName, MenuItems::COUNT + i );
-        d->contextMenu.insertItem( SmallIconSet( "info" ), i18n( "&Properties" ), MenuItems::LayerProperties );
+        d->contextMenu.insertItem( SmallIconSet( "application-vnd.tde.info" ), i18n( "&Properties" ), MenuItems::LayerProperties );
         d->contextMenu.insertSeparator();
         d->contextMenu.insertItem( SmallIconSet( "edit-delete" ),
             selectedLayers().count() > 1 ? i18n( "Remove Layers" )

karbon/dialogs/vconfiguredlg.cc

@@ -71,7 +71,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
 
 	page = addVBoxPage(
 			   i18n( "Document" ), i18n( "Document Settings" ),
-			   BarIcon( "document", TDEIcon::SizeMedium ) );
+			   BarIcon( "text-x-generic", TDEIcon::SizeMedium ) );
 
 	m_defaultDocPage = new VConfigDefaultPage( parent, page );
 	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );

kexi/data/trinity4compat/x-sqlite2.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/x-sqlite2
-Icon=empty
+Icon=application-x-zerosize
 Patterns=
 Comment=SQLite2 Database File
 Comment[bg]=Файл на SQLite2

kexi/data/trinity4compat/x-sqlite3.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/x-sqlite3
-Icon=empty
+Icon=application-x-zerosize
 Patterns=
 Comment=SQLite3 Database File
 Comment[bg]=Файл на SQLite3

kexi/formeditor/factories/stdwidgetfactory.cpp

@@ -388,7 +388,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 	if(c == TQLABEL_OBJECT_NAME_STRING)
 		w = new TQLabel(text, p, n);
 	else if(c == "KexiPictureLabel")
-		w = new KexiPictureLabel(DesktopIcon("image"), p, n);
+		w = new KexiPictureLabel(DesktopIcon("image-x-generic"), p, n);
 
 	else if(c == "KLineEdit")
 	{

kexi/kexiutils/debuggui.cpp

@@ -46,7 +46,7 @@ TQWidget *KexiUtils::createDebugWindow(TQWidget *parent)
 	debugWindowTab = new KTabWidget(debugWindow, "debugWindowTab");
 	lyr->addWidget( debugWindowTab );
 	debugWindow->resize(900, 600);
-	debugWindow->setIcon( DesktopIcon("info") );
+	debugWindow->setIcon( DesktopIcon("application-vnd.tde.info") );
 	debugWindow->setCaption("Kexi Internal Debugger");
 	debugWindow->show();
 	return debugWindow;

kexi/main/printing/kexisimpleprintingpagesetup.cpp

@@ -344,7 +344,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 	connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview()));
 
 	m_contents->iconLabel->setFixedWidth(32+6);
-	m_contents->iconLabel->setPixmap( DesktopIcon("document", 32) );
+	m_contents->iconLabel->setPixmap( DesktopIcon("text-x-generic", 32) );
 	TQWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text."));
 	connect(m_contents->headerTitleFontButton, TQT_SIGNAL(clicked()), 
 		this, TQT_SLOT(slotChangeTitleFont()));

kexi/main/startup/KexiProjectSelector.cpp

@@ -107,7 +107,7 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget(
 	TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
 	d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
 	setIcon( d->fileicon );
-	d->dbicon = SmallIcon("database");
+	d->dbicon = SmallIcon("application-vnd.oasis.opendocument.database");
 //	list->setHScrollBarMode( TQScrollView::AlwaysOn );
 
 	if (!d->showConnectionColumns) {

kexi/main/startup/KexiStartupDialog.cpp

@@ -320,7 +320,7 @@ void KexiStartupDialog::setupPageTemplates()
 	d->templatesSectionID_blank = itemID++;
 	TQString clickMsg( "\n\n" + i18n("Click \"OK\" button to proceed.") );
 	templPageFrame = d->templatesWidget->addPage(
-		i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("empty") );
+		i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("application-x-zerosize") );
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
 	TQLabel *lbl_blank = new TQLabel( 
 		i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );

kexi/plugins/forms/kexiformpart.cpp

@@ -501,7 +501,7 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow*
 	KexiProject *prj = mainWin->project();
 	d->dataSourcePage->setProject(prj);
 
-	tab->addTab( d->dataSourcePage, SmallIconSet("database"), "");
+	tab->addTab( d->dataSourcePage, SmallIconSet("application-vnd.oasis.opendocument.database"), "");
 	tab->setTabToolTip( d->dataSourcePage, i18n("Data Source"));
 
 	tab->addTab( d->objectTreeView, SmallIconSet("widgets"), "");

kexi/plugins/reports/kexireportfactory.cpp

@@ -104,7 +104,7 @@ KexiReportFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 	if(c == "Label")
 		return new Label(text, p, n);
 	else if(c == "PicLabel")
-		return new PicLabel(DesktopIcon("image"), p, n);
+		return new PicLabel(DesktopIcon("image-x-generic"), p, n);
 	else if(c == "ReportLine")
 		return new ReportLine(p, n);
 	else if(c == "KexiSubReport")

kexi/plugins/tables/kexitabledesignerview.cpp

@@ -122,7 +122,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
 
 	KexiTableViewColumn *col = new KexiTableViewColumn("pk", KexiDB::Field::Text, TQString(),
 		i18n("Additional information about the field"));
-	col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("info"), d->view->palette() ) );
+	col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("application-vnd.tde.info"), d->view->palette() ) );
 	col->setHeaderTextVisible(false);
 	col->field()->setSubType("TDEIcon");
 	col->setReadOnly(true);

kivio/kiviopart/ui/kiviooptionsdialog.cpp

@@ -98,7 +98,7 @@ KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
 void KivioOptionsDialog::initPage()
 {
   TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
-    kapp->iconLoader()->loadIcon("empty", TDEIcon::Toolbar, 32));
+    kapp->iconLoader()->loadIcon(""application-x-zerosize", TDEIcon::Toolbar, 32));
   m_pageIndex = pageIndex(page);
 
   KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));

kplato/kptconfigdialog.cc

@@ -52,10 +52,10 @@ ConfigDialog::ConfigDialog(Config &config, Project &project, TQWidget *parent, c
       m_config(config)
 {
 
-/*    TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon("misc"));
+/*    TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon(""application-vnd.tde.misc"));
     m_behaviorPage = new ConfigBehaviorPanel(config.behavior(), page);*/
     
-    TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon("misc"));
+    TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon(""application-vnd.tde.misc"));
     m_taskDefaultPage = new TaskDefaultPanel(config.taskDefaults(), project.standardWorktime(), page);
     
     enableButtonOK(false);

kpresenter/KPrConfig.cpp

@@ -102,7 +102,7 @@ KPrConfig::KPrConfig( KPrView* parent )
     _miscPage=new KPrConfigureMiscPage(parent, page);
 
     page = addVBoxPage( i18n("Document"), i18n("Document Settings"),
-                        BarIcon("kpresenter_kpr", TDEIcon::SizeMedium) );
+                        BarIcon("application-x-kpresenter", TDEIcon::SizeMedium) );
 
     _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page);
 

kword/KWConfig.cpp

@@ -89,7 +89,7 @@ KWConfig::KWConfig( KWView* parent )
   m_interfacePage=new ConfigureInterfacePage(parent, page2);
 
   TQVBox *page4 = addVBoxPage( i18n("Document"), i18n("Document Settings"),
-                              loadIcon("kword_kwd") );
+                              loadIcon(""x-office-document") );
 
   m_defaultDocPage=new ConfigureDefaultDocPage(parent, page4);
 
@@ -103,7 +103,7 @@ KWConfig::KWConfig( KWView* parent )
                                              this, KWFactory::instance()->config(), page5 );
 
   TQVBox *page3 = addVBoxPage( i18n("Misc"), i18n("Misc Settings"),
-                              loadIcon("misc") );
+                              loadIcon(""application-vnd.tde.misc") );
   m_miscPage=new ConfigureMiscPage(parent, page3);
 
   TQVBox *page6 = addVBoxPage( i18n("Path"), i18n("Path Settings"),

mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.chart
 Patterns=*.odc;*.ODC
-Icon=kchart_chrt
+Icon=application-x-kchart
 Comment=OASIS OpenDocument Chart
 Comment[bg]=Диаграма на OASIS OpenDocument
 Comment[br]=Treser grafoù OpenDocument OASIS

mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.graphics-template
 Patterns=*.otg;*.OTG
-Icon=drawing
+Icon=application-vnd.oasis.opendocument.graphics
 Comment=OASIS OpenDocument Graphics Template
 Comment[bg]=Шаблон за графика на OASIS OpenDocument
 Comment[br]=Patrom skeudenn OpenOffice.org OASIS

mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.graphics
 Patterns=*.odg;*.ODG
-Icon=drawing
+Icon=application-vnd.oasis.opendocument.graphics
 Comment=OASIS OpenDocument Graphics
 Comment[bg]=Графика на OASIS OpenDocument
 Comment[br]=Skeudenn OpenOffice.org OASIS

mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.presentation-template
 Patterns=*.otp;*.OTP
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
 Comment=OASIS OpenDocument Presentation Template
 Comment[bg]=Шаблон за презентация на OASIS OpenDocument
 Comment[br]=Patrom un emginnig OASIS OpenDocument

mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.presentation
 Patterns=*.odp;*.ODP
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
 Comment=OASIS OpenDocument Presentation
 Comment[bg]=Презентация на OASIS OpenDocument
 Comment[br]=Emginnig OASIS OpenDocument

mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.spreadsheet-template
 Patterns=*.ots;*.OTS
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
 Comment=OASIS OpenDocument SpreadSheet Template
 Comment[bg]=Шаблон за електронна таблица на OASIS OpenDocument
 Comment[br]=Patrom loger OpenOffice.org OASIS

mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.spreadsheet
 Patterns=*.ods;*.ODS
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
 Comment=OASIS OpenDocument SpreadSheet
 Comment[bg]=Електронна таблица на OASIS OpenDocument
 Comment[br]=Loger OpenOffice.org OASIS

mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.text-template
 Patterns=*.ott;*.OTT
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
 Comment=OASIS OpenDocument Text Template
 Comment[bg]=Текстов шаблон на OASIS OpenDocument
 Comment[br]=Patrom skrid OpenOffice.org OASIS

mimetypes/trinity3/vnd.oasis.opendocument.text.desktop

@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/vnd.oasis.opendocument.text
 Patterns=*.odt;*.ODT
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
 Comment=OASIS OpenDocument Text
 Comment[bg]=Текстов документ на OASIS OpenDocument
 Comment[br]=Skrid OpenDocument OASIS

mimetypes/trinity51/x-raw.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=image/x-raw
-Icon=image
+Icon=image-x-generic
 Patterns=*.raw;*.RAW;*.dcr;*.DCR;*.dng;*.DNG;*.crw;*.CRW;*.cr2,*.CR2;*.nef;*.NEF;*.mrw;*.MRW;
 Comment=RAW Camera Image
 Comment[bg]=RAW изображение от камера

templates/Illustration.desktop

@@ -105,4 +105,4 @@ Comment[zh_CN]=新建 Karbon14 文档：
 Comment[zh_TW]=新增 Karbon14 文件:
 Type=Link
 URL=.source/Illustration.karbon
-Icon=karbon_karbon
+Icon=application-x-karbon

templates/Presentation.desktop

@@ -110,4 +110,4 @@ Comment[zh_CN]=新建 KPresenter 演示文档：
 Comment[zh_TW]=新建 KPresenter 簡報文件:
 Type=Link
 URL=.source/Presentation.kpt
-Icon=kpresenter_kpr
+Icon=application-x-kpresenter

templates/SpreadSheet.desktop

@@ -113,4 +113,4 @@ Comment[zh_CN]=新建 KSpread 文档：
 Comment[zh_TW]=新建 KSpread 文件:
 Type=Link
 URL=.source/SpreadSheet.kst
-Icon=kspread_ksp
+Icon=application-x-kspread

templates/TextDocument.desktop

@@ -115,4 +115,4 @@ Comment[zh_CN]=新建 KWord 文档：
 Comment[zh_TW]=新建 KWord 文件;
 Type=Link
 URL=.source/TextDocument.kwt
-Icon=kword_kwd
+Icon=x-office-document