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, 18 insertions, 18 deletions

diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop
index 472b07a6..3847bb89 100644
--- a/quanta/quanta.tdevelop
+++ b/quanta/quanta.tdevelop
@@ -263,7 +263,7 @@
       <type icon="" ext="h" name="C++ header" create="template" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
+      <type icon="text-x-c++src" ext="cpp" name="C++ source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 804a4ecd..37202d2f 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -188,7 +188,7 @@ void QuantaInit::initQuanta()
   addToolTreeView(StructTreeView::ref(), i18n("Document Structure"), BarIcon("view_sidetree"), KDockWidget::DockLeft);
   addToolTreeView(m_quanta->scriptTab, i18n("Scripts"), BarIcon("system-run"), KDockWidget::DockLeft);
   m_quanta->m_messageOutputView = addToolTreeView(m_quanta->m_messageOutput, i18n("Messages"), SmallIcon("openterm"), KDockWidget::DockBottom);
-  m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom);
+  m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("application-vnd.tde.info"), KDockWidget::DockBottom);
   m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom);
 
   // Restore the dock layout
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index 158ba563..6d3ef86f 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -289,7 +289,7 @@ void QuantaView::updateTab()
         // try to set the icon from mimetype
         TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, TDEIcon::Small));
         if (mimeIcon.isNull())
-          mimeIcon = TQIconSet(SmallIcon("document"));
+          mimeIcon = TQIconSet(SmallIcon("text-x-generic"));
         TQString urlStr = QExtFileInfo::shortName(m_document->url().path());
         if (m_document->isModified())
         {
diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp
index 358fec8a..ac2e840d 100644
--- a/quanta/treeviews/docfolder.cpp
+++ b/quanta/treeviews/docfolder.cpp
@@ -45,7 +45,7 @@ DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *c
     if ( item[0] != '#' ) {
       TQString url = config->readEntry( item );
       DocItem *el = new DocItem( this, TQString(item), basePath+url);
-      el->setPixmap( 0, SmallIcon("info") );
+      el->setPixmap( 0, SmallIcon("application-vnd.tde.info") );
     } else
     if ( item[0] == '#' ) { // current item is folder
       item++; // remove leading #
@@ -75,7 +75,7 @@ DocFolder::DocFolder(TQListView *parent, const TQString &_name, TDEConfig *confi
     if ( item[0] != '#' ) {
       TQString url = config->readEntry( item );
       DocItem *el = new DocItem( this, TQString(item), basePath+url);
-      el->setPixmap( 0, SmallIcon("info") );
+      el->setPixmap( 0, SmallIcon("application-vnd.tde.info") );
     } else
     if ( item[0] == '#' ) { // current item is folder
       item++; // remove leading #
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index 1b438a0e..1de8333b 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -93,18 +93,18 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
   createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
-  createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
+  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu();
 
   m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()));
   m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop()));
   m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate()));
-  m_folderMenu->insertItem(SmallIcon("empty"), i18n("&Create New"), createNewMenu);
+  m_folderMenu->insertItem(SmallIcon("application-x-zerosize"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
   m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
   m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
@@ -113,7 +113,7 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
   m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
   m_emptyMenu = new TDEPopupMenu();
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 26e6ed43..1bb822b3 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -137,11 +137,11 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
   createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
-  createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
+  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
@@ -156,7 +156,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_folderMenu->insertSeparator();
   m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus()));
   m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_projectMenu = new TDEPopupMenu(this);
   m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu);
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 5fd761fa..78dbd78e 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -84,7 +84,7 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name )
   m_localDir->excludeFilterRx.setPattern(excludeString);
 
   m_fileMenu = new TDEPopupMenu(this);
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Description"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQT_SLOT(slotProperties()));
   m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript()));
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index c1cc3b62..922ea03a 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -109,7 +109,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_folderMenu = new TDEPopupMenu();
 
@@ -119,7 +119,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
   m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
   addColumn(i18n("Upload Tree"), -1);
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index 03a59ac1..7c3ffdc1 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -70,7 +70,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
               } else
               if (title == "img")
               {
-                setPixmap( 0, SmallIcon("image") );
+                setPixmap( 0, SmallIcon("image-x-generic") );
                 title = space + tag->attributeValue("src");
 
               } else
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index b50665bf..2fa9b7e1 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -153,7 +153,7 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
   m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
@@ -167,7 +167,7 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
   m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
   m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
   m_emptyAreaMenu = new TDEPopupMenu(this);