Branch: master

a327e64d 2014-10-22 11:55:17 Timothy Pearson
Repair mimetype icon usage, part 1.  The following are not fully verified in source as of this commit due to ubiquity: info, unknown
M kbabel/commonui/projectpref.cpp
M umbrello/umbrello/dialogs/classpropdlg.cpp
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index 5fae9f8..1f53f2f 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -87,7 +87,7 @@
 
     _sourcePage = new SourceContextPreferences(0);
     addPage(_sourcePage, i18n("title of page in preferences dialog","Source")
-		, "source"
+		, "text-x-src"
                 ,i18n("Options for Showing Source Context"));
     connect(_sourcePage, TQT_SIGNAL (itemsChanged())
 	, this, TQT_SLOT (updateButtons()) );
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 81e1c8c..ec2e4c1 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -176,7 +176,7 @@
     //add extra pages for class
     if (ot == Uml::ot_Class ) {
         //setup attributes page
-        TQFrame* newPage = addPage( i18n("Attributes"), i18n("Attribute Settings"), DesktopIcon("application-vnd.tde.misc") );
+        TQFrame* newPage = addPage( i18n("Attributes"), i18n("Attribute Settings"), DesktopIcon("misc") );
         m_pAttPage = new ClassifierListPage(newPage, (UMLClassifier *)c, m_pDoc, Uml::ot_Attribute);
         TQHBoxLayout * attLayout = new TQHBoxLayout(newPage);
         attLayout -> addWidget(m_pAttPage);
@@ -184,7 +184,7 @@
 
     if (ot == Uml::ot_Class || ot == Uml::ot_Interface) {
         //setup operations page
-        TQFrame* newPage = addPage( i18n("Operations"), i18n("Operation Settings"), DesktopIcon("application-vnd.tde.misc") );
+        TQFrame* newPage = addPage( i18n("Operations"), i18n("Operation Settings"), DesktopIcon("misc") );
         m_pOpsPage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_Operation);
         TQHBoxLayout* pOpsLayout = new TQHBoxLayout(newPage);
         pOpsLayout -> addWidget(m_pOpsPage);
@@ -192,28 +192,28 @@
 
     if (ot == Uml::ot_Class || ot == Uml::ot_Interface) {
         //setup templates page
-        TQFrame* newPage = addPage( i18n("Templates"), i18n("Templates Settings"), DesktopIcon("application-vnd.tde.misc") );
+        TQFrame* newPage = addPage( i18n("Templates"), i18n("Templates Settings"), DesktopIcon("misc") );
         m_pTemplatePage = new ClassifierListPage(newPage, (UMLClassifier *)c, m_pDoc, Uml::ot_Template);
         TQHBoxLayout* templatesLayout = new TQHBoxLayout(newPage);
         templatesLayout->addWidget(m_pTemplatePage);
     }
     if (ot == Uml::ot_Enum) {
         //setup enum literals page
-        TQFrame* newPage = addPage( i18n("Enum Literals"), i18n("Enum Literals Settings"), DesktopIcon("application-vnd.tde.misc") );
+        TQFrame* newPage = addPage( i18n("Enum Literals"), i18n("Enum Literals Settings"), DesktopIcon("misc") );
         m_pEnumLiteralPage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_EnumLiteral);
         TQHBoxLayout* enumLiteralsLayout = new TQHBoxLayout(newPage);
         enumLiteralsLayout->addWidget(m_pEnumLiteralPage);
     }
     if (ot == Uml::ot_Entity) {
         //setup enum literals page
-        TQFrame* newPage = addPage( i18n("Entity Attributes"), i18n("Entity Attributes Settings"), DesktopIcon("application-vnd.tde.misc") );
+        TQFrame* newPage = addPage( i18n("Entity Attributes"), i18n("Entity Attributes Settings"), DesktopIcon("misc") );
         m_pEntityAttributePage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_EntityAttribute);
         TQHBoxLayout* entityAttributesLayout = new TQHBoxLayout(newPage);
         entityAttributesLayout->addWidget(m_pEntityAttributePage);
     }
     if (ot == Uml::ot_Package ) {
         // Set up containment page.
-        TQFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("application-vnd.tde.misc") );
+        TQFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("misc") );
         m_pPkgContentsPage = new PkgContentsPage(newPage, (UMLPackage*)(c));
         TQHBoxLayout* contentsLayout = new TQHBoxLayout(newPage);
         contentsLayout->addWidget(m_pPkgContentsPage);
@@ -229,7 +229,7 @@
 }
 
 void ClassPropDlg::setupInstancePages(UMLWidget* widget) {
-    TQFrame* page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon("application-vnd.tde.misc") );
+    TQFrame* page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon("misc") );
     TQHBoxLayout* genLayout = new TQHBoxLayout(page);
     page->setMinimumSize(310, 330);
     m_pGenPage = new ClassGenPage(m_pDoc, page, widget);