diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt index c645cba7..946a1c88 100644 --- a/kimgio/CMakeLists.txt +++ b/kimgio/CMakeLists.txt @@ -22,6 +22,11 @@ if(IMAGEMAGICK_FOUND) ) install( FILES + bmp.desktop + ico.desktop + jpg.desktop + tga.desktop + tiff.desktop dds.desktop eps.desktop exr.desktop diff --git a/kimgio/README b/kimgio/README index 6d15d168..b26874dd 100644 --- a/kimgio/README +++ b/kimgio/README @@ -9,6 +9,11 @@ along with whatever ImageMagick supports but it is assumed that it supports reading atleast the following formats (even if they cannot be loaded) for compatibility: +BMP +ICO +JPEG +TGA +TIFF DDS EPS EXR diff --git a/kimgio/bmp.desktop b/kimgio/bmp.desktop new file mode 100644 index 00000000..8874b93f --- /dev/null +++ b/kimgio/bmp.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Service +X-KDE-ServiceTypes=QImageIOPlugins +X-KDE-ImageFormat=magick +X-KDE-MimeType=image/bmp +X-KDE-Read=true +X-KDE-Write=false diff --git a/kimgio/ico.desktop b/kimgio/ico.desktop new file mode 100644 index 00000000..8b7cb05b --- /dev/null +++ b/kimgio/ico.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Service +X-KDE-ServiceTypes=QImageIOPlugins +X-KDE-ImageFormat=magick +X-KDE-MimeType=image/vnd.microsoft.icon +X-KDE-Read=true +X-KDE-Write=false diff --git a/kimgio/jpg.desktop b/kimgio/jpg.desktop new file mode 100644 index 00000000..606604e5 --- /dev/null +++ b/kimgio/jpg.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Service +X-KDE-ServiceTypes=QImageIOPlugins +X-KDE-ImageFormat=magick +X-KDE-MimeType=image/jpeg +X-KDE-Read=true +X-KDE-Write=false diff --git a/kimgio/tga.desktop b/kimgio/tga.desktop new file mode 100644 index 00000000..0c6a127a --- /dev/null +++ b/kimgio/tga.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Service +X-KDE-ServiceTypes=QImageIOPlugins +X-KDE-ImageFormat=magick +X-KDE-MimeType=image/x-tga +X-KDE-Read=true +X-KDE-Write=false diff --git a/kimgio/tiff.desktop b/kimgio/tiff.desktop new file mode 100644 index 00000000..1bf83702 --- /dev/null +++ b/kimgio/tiff.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Service +X-KDE-ServiceTypes=QImageIOPlugins +X-KDE-ImageFormat=magick +X-KDE-MimeType=image/tiff +X-KDE-Read=true +X-KDE-Write=false diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index 390c65ad..38b338b9 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -21,20 +21,12 @@ static const struct ImageFormatTblData { const QLatin1String format; } ImageFormatTbl[] = { { "image/png", QLatin1String("png") }, - { "image/bmp", QLatin1String("bmp") }, { "image/x-portable-pixmap", QLatin1String("ppm") }, { "image/x-portable-graymap", QLatin1String("pgm") }, { "image/x-portable-bitmap", QLatin1String("pbm") }, { "image/x-xbitmap", QLatin1String("xbm") }, { "image/x-xpixmap", QLatin1String("xpm") }, - { "video/x-mng", QLatin1String("mng") }, { "image/gif", QLatin1String("gif") }, - { "image/vnd.microsoft.icon", QLatin1String("ico") }, - { "image/jpeg", QLatin1String("jpeg") }, - { "image/jpeg", QLatin1String("jpg") }, - { "image/tiff", QLatin1String("tiff") }, - { "image/tiff", QLatin1String("tif") }, - { "image/x-tga", QLatin1String("tga") }, { "image/svg+xml", QLatin1String("svg") }, { "image/svg+xml-compressed", QLatin1String("svgz") }, }; diff --git a/kio/kio/kimageio.h b/kio/kio/kimageio.h index 55d57521..c833822e 100644 --- a/kio/kio/kimageio.h +++ b/kio/kio/kimageio.h @@ -24,6 +24,11 @@ * \b Formats: * * Currently supported formats include: + * @li BMP \ + * @li ICO \ + * @li JPEG \ + * @li TGA \ + * @li TIFF \ * @li DDS \ * @li EPS \ * @li EXR \