Branch: master

cb74882c 2014-10-22 13:25:12 Timothy Pearson
Fix remaining issues from mimetype icon rename
M ksquirrel/ksquirrel.cpp
M ksquirrel/ksquirrelpart/sq_iconloader.cpp
M ksquirrel/sidebar/sq_categoriesview.cpp
M ksquirrel/sidebar/sq_categorybrowsermenu.cpp
M ksquirrel/sq_iconloader.cpp
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index 58a9c20..5c14ee3 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -812,7 +812,7 @@
     pASlideShow = new TDEAction(i18n("Slideshow"), "folder_video", CTRL+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowStart()), actionCollection(), "SQ Slideshow");
     pASlideShowDialog = new TDEAction(i18n("Slideshow advanced"), 0, CTRL+ALT+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog");
     pARename = new TDEAction(i18n("Rename"), "file_move", TQt::Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "SQ Rename");
-    pAPluginsInfo = new TDEAction(i18n("Codec information..."), "info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info");
+    pAPluginsInfo = new TDEAction(i18n("Codec information..."), "application-vnd.tde.info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info");
     pAPluginsDel = new TDEAction(i18n("Codec manager..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter");
     pAGLInfo = new TDEAction(i18n("OpenGL information..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info");
 
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.cpp b/ksquirrel/ksquirrelpart/sq_iconloader.cpp
index b9596b6..c8c9ec8 100644
--- a/ksquirrel/ksquirrelpart/sq_iconloader.cpp
+++ b/ksquirrel/ksquirrelpart/sq_iconloader.cpp
@@ -61,7 +61,7 @@
         else if(name == "edit" && size == 32)
             p = pixmap_edit;
         else
-            p = TDEGlobal::iconLoader()->loadIcon(""text-x-katefilelist", group, size);
+            p = TDEGlobal::iconLoader()->loadIcon("unknown", group, size);
     }
 
     return p;
diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp
index 93aa131..317ca50 100644
--- a/ksquirrel/sidebar/sq_categoriesview.cpp
+++ b/ksquirrel/sidebar/sq_categoriesview.cpp
@@ -168,7 +168,7 @@
 
     toolbar->insertButton("folder-new", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()), true, i18n("New category"));
     toolbar->insertButton("edittrash", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), true, i18n("Delete"));
-    toolbar->insertButton("info", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotItemProperties()), true, i18n("Properties"));
+    toolbar->insertButton("application-vnd.tde.info", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotItemProperties()), true, i18n("Properties"));
     toolbar->insertButton("bookmark_add", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDefaultCategories()), true, i18n("Create default categories"));
 
     view->popupMenu()->reconnect(SQ_TreeViewMenu::New, TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()));
diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
index a30fa85..c94c314 100644
--- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
+++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
@@ -508,7 +508,7 @@
     _icons = new TQMap<TQString, TQPixmap>;
 
     _icons->insert("folder", SmallIcon("folder"));
-    _icons->insert("unknown", SmallIcon("text-x-katefilelist"));
+    _icons->insert("unknown", SmallIcon("unknown"));
     _icons->insert("folder_open", SmallIcon("folder_open"));
     _icons->insert("kdisknav", SmallIcon("kdisknav"));
     _icons->insert("kfm", SmallIcon("kfm"));
diff --git a/ksquirrel/sq_iconloader.cpp b/ksquirrel/sq_iconloader.cpp
index b9596b6..c8c9ec8 100644
--- a/ksquirrel/sq_iconloader.cpp
+++ b/ksquirrel/sq_iconloader.cpp
@@ -61,7 +61,7 @@
         else if(name == "edit" && size == 32)
             p = pixmap_edit;
         else
-            p = TDEGlobal::iconLoader()->loadIcon(""text-x-katefilelist", group, size);
+            p = TDEGlobal::iconLoader()->loadIcon("unknown", group, size);
     }
 
     return p;