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

10 files changed, 10 insertions, 10 deletions

diff --git a/kexi/data/trinity4compat/x-sqlite2.desktop b/kexi/data/trinity4compat/x-sqlite2.desktop
index 63f0f1d1..8bdf1f8b 100644
--- a/kexi/data/trinity4compat/x-sqlite2.desktop
+++ b/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
diff --git a/kexi/data/trinity4compat/x-sqlite3.desktop b/kexi/data/trinity4compat/x-sqlite3.desktop
index ee2756d8..3704e186 100644
--- a/kexi/data/trinity4compat/x-sqlite3.desktop
+++ b/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
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index c5a4a5cb..adb4d1bf 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/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")
 	{
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index ec9edfbf..dd36052b 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/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;
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 294b7c0a..ecf21be9 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/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()));
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index b887cdfd..8f7682a4 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/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) {
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 5aebe3b1..2b0666de 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/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 );
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 11d711c3..c53212fb 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/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"), "");
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index 35036222..57753a30 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/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")
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index df715cbe..767b5733 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/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);