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

src/bnpview.cpp

@@ -418,7 +418,7 @@ void BNPView::setupActions()
 								   TQT_TQOBJECT(this), TQT_SLOT(hideOnEscape()), actionCollection(), "window_hide" );
 	m_actHideWindow->setEnabled(Settings::useSystray()); // Init here !
 
-	m_actExportToHtml = new TDEAction( i18n("&HTML Web Page..."), "html", 0,
+	m_actExportToHtml = new TDEAction( i18n("&HTML Web Page..."), "text-html", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(exportToHTML()),      actionCollection(), "basket_export_html" );
 	new TDEAction( i18n("K&Notes"), "knotes", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importKNotes()),      actionCollection(), "basket_import_knotes" );
@@ -432,7 +432,7 @@ void BNPView::setupActions()
 	             TQT_TQOBJECT(this), TQT_SLOT(importStickyNotes()), actionCollection(), "basket_import_sticky_notes" );
 	new TDEAction( i18n("&Tomboy"), "tintin", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importTomboy()),      actionCollection(), "basket_import_tomboy" );
-	new TDEAction( i18n("Text &File..."), "txt", 0,
+	new TDEAction( i18n("Text &File..."), "text-plain", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importTextFile()),    actionCollection(), "basket_import_text_file" );
 
 	new TDEAction( i18n("&Backup && Restore..."), "", 0,
@@ -497,9 +497,9 @@ void BNPView::setupActions()
 	connect( insertWizardMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(insertWizard(int)) );
 
 //	m_actInsertText   = new TDEAction( i18n("Plai&n Text"), "text",     "Ctrl+T", actionCollection(), "insert_text"     );
-	m_actInsertHtml   = new TDEAction( i18n("&Text"),       "html",     "Insert", actionCollection(), "insert_html"     );
+	m_actInsertHtml   = new TDEAction( i18n("&Text"),       "text-html",     "Insert", actionCollection(), "insert_html"     );
 	m_actInsertLink   = new TDEAction( i18n("&Link"),       "link",     "Ctrl+Y", actionCollection(), "insert_link"     );
-	m_actInsertImage  = new TDEAction( i18n("&Image"),      "image",    "",       actionCollection(), "insert_image"    );
+	m_actInsertImage  = new TDEAction( i18n("&Image"),      "image-x-generic",    "",       actionCollection(), "insert_image"    );
 	m_actInsertColor  = new TDEAction( i18n("&Color"),      "colorset", "",       actionCollection(), "insert_color"    );
 	m_actInsertLauncher=new TDEAction( i18n("L&auncher"),   "launch",   "",       actionCollection(), "insert_launcher" );
 

src/settings.cpp

@@ -794,8 +794,8 @@ NotesAppearancePage::NotesAppearancePage(TQWidget * parent, const char * name)
 	TQTabWidget *tabs = new TQTabWidget(this);
 	layout->addWidget(tabs);
 
-	m_soundLook       = new LinkLookEditWidget(this, i18n("Conference audio record"),                         "sound",       tabs);
-	m_fileLook        = new LinkLookEditWidget(this, i18n("Annual report"),                                   "document",    tabs);
+	m_soundLook       = new LinkLookEditWidget(this, i18n("Conference audio record"),                         "audio-x-generic",       tabs);
+	m_fileLook        = new LinkLookEditWidget(this, i18n("Annual report"),                                   "text-x-generic",    tabs);
 	m_localLinkLook   = new LinkLookEditWidget(this, i18n("Home folder"),                                     "folder_home", tabs);
 	m_networkLinkLook = new LinkLookEditWidget(this, "www.kde.org",             KMimeType::iconForURL("http://www.kde.org"), tabs);
 	m_launcherLook    = new LinkLookEditWidget(this, i18n("Launch %1").arg(kapp->aboutData()->programName()), "basket",      tabs);

src/softwareimporters.cpp

@@ -492,7 +492,7 @@ void SoftwareImporters::importTextFile()
 
 		// First create a basket for it:
 		TQString title = i18n("From TextFile.txt", "From %1").arg(KURL(fileName).fileName());
-		BasketFactory::newBasket(/*icon=*/"txt", title, /*backgroundImage=*/"", /*backgroundColor=*/TQColor(), /*textColor=*/TQColor(), /*templateName=*/"1column", /*createIn=*/0);
+		BasketFactory::newBasket(/*icon=*/"text-plain", title, /*backgroundImage=*/"", /*backgroundColor=*/TQColor(), /*textColor=*/TQColor(), /*templateName=*/"1column", /*createIn=*/0);
 		Basket *basket = Global::bnpView->currentBasket();
 		basket->load();