diff options
Diffstat (limited to 'digikam/utilities/cameragui/cameraui.cpp')
-rw-r--r-- | digikam/utilities/cameragui/cameraui.cpp | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index cdabd06..5481ccc 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -995,37 +995,13 @@ void CameraUI::slotUpload() if (d->busy) return; - TQString fileformats; + TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading); + mimeTypes.append("image/x-raw"); - TQStringList patternList = TQStringList::split('\n', KImageIO::pattern(KImageIO::Reading)); - - // All Images from list must been always the first entry given by KDE API - TQString allPictures = patternList[0]; - - // Add RAW file format to All Images" type mime and remplace current. -#if KDCRAW_VERSION < 0x000106 - allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())); -#else - allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::KDcraw::rawFiles())); -#endif - patternList.remove(patternList[0]); - patternList.prepend(allPictures); - - // Added RAW file formats supported by dcraw program like a type mime. - // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete - // or unavailable(dcraw_0)(see file #121242 in B.K.O). -#if KDCRAW_VERSION < 0x000106 - patternList.append(TQString("\n%1|Camera RAW files").arg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); -#else - patternList.append(TQString("\n%1|Camera RAW files").arg(TQString(KDcrawIface::KDcraw::rawFiles()))); -#endif - - fileformats = patternList.join("\n"); - - DDebug () << "fileformats=" << fileformats << endl; + DDebug() << "mimeTypes=" << mimeTypes.join(" ") << endl; KURL::List urls = KFileDialog::getOpenURLs(AlbumManager::instance()->getLibraryPath(), - fileformats, this, i18n("Select Image to Upload")); + mimeTypes.join(" "), this, i18n("Select Image to Upload")); if (!urls.isEmpty()) slotUploadItems(urls); } |