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 years ago · da2a999dfb
parent 4ad72f6575
commit da2a999dfb
35 changed files with 36 additions and 36 deletions
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@ -87,7 +87,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
    new TDEAction(i18n("Zoom -"), "zoom-out", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");

    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P));
-    new TDEAction(i18n("Properties"), "image",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
+    new TDEAction(i18n("Properties"), "image-x-generic",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");

    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R));
    new TDEAction(i18n("Normalize"), "rebuild",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart normalize");
--- a/ksquirrel/ksquirrelpart/sq_iconloader.cpp
+++ b/ksquirrel/ksquirrelpart/sq_iconloader.cpp
@ -61,7 +61,7 @@ TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int
        else if(name == "edit" && size == 32)
            p = pixmap_edit;
        else
-            p = TDEGlobal::iconLoader()->loadIcon("unknown", group, size);
+            p = TDEGlobal::iconLoader()->loadIcon(""text-x-katefilelist", group, size);
    }

    return p;
--- a/ksquirrel/mime/ljpeg.desktop
+++ b/ksquirrel/mime/ljpeg.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/ljpeg
-Icon=image
+Icon=image-x-generic
 Patterns=*.ljpg;*.LJPG;*.ljpeg;*.LJPEG;
 Comment=Lossless JPEG
--- a/ksquirrel/mime/x-avs.desktop
+++ b/ksquirrel/mime/x-avs.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-avs
-Icon=image
+Icon=image-x-generic
 Patterns=*.x;*.X;
 Comment=AVS X image
--- a/ksquirrel/mime/x-cut.desktop
+++ b/ksquirrel/mime/x-cut.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-cut
-Icon=image
+Icon=image-x-generic
 Patterns=*.cut;*.CUT;
 Comment=Dr. Halo CUT
--- a/ksquirrel/mime/x-dicom.desktop
+++ b/ksquirrel/mime/x-dicom.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-dicom
-Icon=image
+Icon=image-x-generic
 Patterns=*.dcm;*.DCM;*.dicom;*.DICOM
 Comment=DICOM
--- a/ksquirrel/mime/x-dxf.desktop
+++ b/ksquirrel/mime/x-dxf.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-dxf
-Icon=image
+Icon=image-x-generic
 Patterns=*.dxf;*.DXF;
 Comment=AutoCAD/QCAD Drawing
--- a/ksquirrel/mime/x-iff.desktop
+++ b/ksquirrel/mime/x-iff.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-iff
-Icon=image
+Icon=image-x-generic
 Patterns=*.iff;*.IFF;*.ilbm;*.ILBM;*.lbm;*.LBM;
 Comment=Interchange File Format
--- a/ksquirrel/mime/x-jbig.desktop
+++ b/ksquirrel/mime/x-jbig.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-jbig
-Icon=image
+Icon=image-x-generic
 Patterns=*.jbg;*.JBG;*.jbig;*.JBIG;
 Comment=JBIG
--- a/ksquirrel/mime/x-koala.desktop
+++ b/ksquirrel/mime/x-koala.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-koala
-Icon=image
+Icon=image-x-generic
 Patterns=*.koa;*.KOA;*.kla;*.KLA
 Comment=Commodore 64 Koala
--- a/ksquirrel/mime/x-leaf.desktop
+++ b/ksquirrel/mime/x-leaf.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-leaf
-Icon=image
+Icon=image-x-generic
 Patterns=*.leaf;*.LEAF;
 Comment=ILEAF Image
--- a/ksquirrel/mime/x-lif.desktop
+++ b/ksquirrel/mime/x-lif.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-lif
-Icon=image
+Icon=image-x-generic
 Patterns=*.lif;*.LIF;
 Comment=Homeworld LIF
--- a/ksquirrel/mime/x-mac.desktop
+++ b/ksquirrel/mime/x-mac.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-mac
-Icon=image
+Icon=image-x-generic
 Patterns=*.mac;*.MAC;
 Comment=Macintosh Paint
--- a/ksquirrel/mime/x-mdl.desktop
+++ b/ksquirrel/mime/x-mdl.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-mdl
-Icon=image
+Icon=image-x-generic
 Patterns=*.mdl;*.MDL;
 Comment=HalfLife Model
--- a/ksquirrel/mime/x-msp.desktop
+++ b/ksquirrel/mime/x-msp.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-msp
-Icon=image
+Icon=image-x-generic
 Patterns=*.msp;*.MSP;
 Comment=Microsoft Paint
--- a/ksquirrel/mime/x-mtv.desktop
+++ b/ksquirrel/mime/x-mtv.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-mtv
-Icon=image
+Icon=image-x-generic
 Patterns=*.mtv;*.MTV;
 Comment=MTV Ray Tracer
--- a/ksquirrel/mime/x-neo.desktop
+++ b/ksquirrel/mime/x-neo.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-neo
-Icon=image
+Icon=image-x-generic
 Patterns=*.neo;*.NEO;
 Comment=Neochrome NEO
--- a/ksquirrel/mime/x-pi1.desktop
+++ b/ksquirrel/mime/x-pi1.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pi1
-Icon=image
+Icon=image-x-generic
 Patterns=*.pi1;*.PI1;
 Comment=Degas PI1
--- a/ksquirrel/mime/x-pi3.desktop
+++ b/ksquirrel/mime/x-pi3.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pi3
-Icon=image
+Icon=image-x-generic
 Patterns=*.pi3;*.PI3;
 Comment=Degas PI3
--- a/ksquirrel/mime/x-pict.desktop
+++ b/ksquirrel/mime/x-pict.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pict
-Icon=image
+Icon=image-x-generic
 Patterns=*.pict;*.PICT;
 Comment=Macintosh PICT
--- a/ksquirrel/mime/x-pix.desktop
+++ b/ksquirrel/mime/x-pix.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pix
-Icon=image
+Icon=image-x-generic
 Patterns=*.pix;*.PIX;
 Comment=Irix PIX Image
--- a/ksquirrel/mime/x-pxr.desktop
+++ b/ksquirrel/mime/x-pxr.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pxr
-Icon=image
+Icon=image-x-generic
 Patterns=*.pxr;*.PXR;
 Comment=Pxrar format
--- a/ksquirrel/mime/x-ras.desktop
+++ b/ksquirrel/mime/x-ras.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-ras
-Icon=image
+Icon=image-x-generic
 Patterns=*.ras;*.RAS;
 Comment=SUN Raster
--- a/ksquirrel/mime/x-rawrgb.desktop
+++ b/ksquirrel/mime/x-rawrgb.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-rawrgb
-Icon=image
+Icon=image-x-generic
 Patterns=*.rawrgb;*.RAWRGB;
 Comment=KSquirrel RAWRGB
--- a/ksquirrel/mime/x-sct.desktop
+++ b/ksquirrel/mime/x-sct.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-sct
-Icon=image
+Icon=image-x-generic
 Patterns=*.sct;*.SCT;*.ct;*.CT;
 Comment=Scitex CT
--- a/ksquirrel/mime/x-sun.desktop
+++ b/ksquirrel/mime/x-sun.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-sun
-Icon=image
+Icon=image-x-generic
 Patterns=*.sun;*.SUN;
 Comment=SUN Icon
--- a/ksquirrel/mime/x-utah.desktop
+++ b/ksquirrel/mime/x-utah.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-utah
-Icon=image
+Icon=image-x-generic
 Patterns=*.rle;*.RLE;
 Comment=UTAH RLE
--- a/ksquirrel/mime/x-wal.desktop
+++ b/ksquirrel/mime/x-wal.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-wal
-Icon=image
+Icon=image-x-generic
 Patterns=*.wal;*.WAL;
 Comment=Quake2 texture
--- a/ksquirrel/mime/x-wbmp.desktop
+++ b/ksquirrel/mime/x-wbmp.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-wbmp
-Icon=image
+Icon=image-x-generic
 Patterns=*.wbmp;*.WBMP;
 Comment=Wireless Application Protocol Bitmap
--- a/ksquirrel/mime/x-xim.desktop
+++ b/ksquirrel/mime/x-xim.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-xim
-Icon=image
+Icon=image-x-generic
 Patterns=*.xim;*.XIM;
 Comment=X Image
--- a/ksquirrel/mime/x-xwd.desktop
+++ b/ksquirrel/mime/x-xwd.desktop
@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-xwd
-Icon=image
+Icon=image-x-generic
 Patterns=*.xwd;*.XWD;
 Comment=X Window Dump
--- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
+++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
@ -508,12 +508,12 @@ void SQ_CategoryBrowserMenu::initIconMap()
    _icons = new TQMap<TQString, TQPixmap>;

    _icons->insert("folder", SmallIcon("folder"));
-    _icons->insert("unknown", SmallIcon("mime_empty"));
+    _icons->insert("unknown", SmallIcon("text-x-katefilelist"));
    _icons->insert("folder_open", SmallIcon("folder_open"));
    _icons->insert("kdisknav", SmallIcon("kdisknav"));
    _icons->insert("kfm", SmallIcon("kfm"));
    _icons->insert("terminal", SmallIcon("terminal"));
-    _icons->insert("txt", SmallIcon("txt"));
+    _icons->insert("txt", SmallIcon("text-plain"));
    _icons->insert("exec", SmallIcon("exec"));
    _icons->insert("chardevice", SmallIcon("chardevice"));
 }
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@ -70,7 +70,7 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
    popup->insertSeparator();
    popup->insertItem(i18n("Execute")+"\tEnter", TQT_TQOBJECT(this), TQT_SIGNAL(execute()));

-    multi_pix = SQ_IconLoader::instance()->loadIcon("tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
+    multi_pix = SQ_IconLoader::instance()->loadIcon(""application-vnd.tde.tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);

    setMinimumHeight(20);
    setFocusPolicy(TQ_WheelFocus);
--- a/ksquirrel/sq_dragprovider.cpp
+++ b/ksquirrel/sq_dragprovider.cpp
@ -122,7 +122,7 @@ void SQ_DragProvider::start()
    TQPixmap dragIcon;

    if(urls.count() > 1)
-        dragIcon = SQ_IconLoader::instance()->loadIcon("tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
+        dragIcon = SQ_IconLoader::instance()->loadIcon(""application-vnd.tde.tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
    else
        dragIcon = first->pixmap(TDEIcon::SizeSmall);

--- a/ksquirrel/sq_iconloader.cpp
+++ b/ksquirrel/sq_iconloader.cpp
@ -61,7 +61,7 @@ TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int
        else if(name == "edit" && size == 32)
            p = pixmap_edit;
        else
-            p = TDEGlobal::iconLoader()->loadIcon("unknown", group, size);
+            p = TDEGlobal::iconLoader()->loadIcon(""text-x-katefilelist", group, size);
    }

    return p;