Attachment #3033 for bug #3192

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 3192
Collapse All | Expand All

Lines 85-91 Link Here

(-)digikam-trinity-14.0.11/digikam/libs/dialogs/imagedialog.h~ (-1 lines)
85	KURL::List urls() const;	85	KURL::List urls() const;
86		86
87	bool singleSelect() const;	87	bool singleSelect() const;
88	TQString fileformats() const;
89		88
90	static KURL::List getImageURLs(TQWidget* parent, const KURL& url, const TQString& caption=TQString());	89	static KURL::List getImageURLs(TQWidget* parent, const KURL& url, const TQString& caption=TQString());
91	static KURL getImageURL(TQWidget* parent, const KURL& url, const TQString& caption=TQString());	90	static KURL getImageURL(TQWidget* parent, const KURL& url, const TQString& caption=TQString());





    bool       singleSelect;

    TQString    fileformats;

    KURL       url;
    KURL::List urls;
};

    d = new ImageDialogPrivate;
    d->singleSelect = singleSelect;

    TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading);
    mimeTypes.append("image/x-raw");
    // All Images from list must been always the first entry given by KDE API
    TQString allPictures = patternList[0];

#if KDCRAW_VERSION < 0x000106
    // Add other files format witch are missing to All Images" type mime provided by KDE and remplace current.
    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
    {
        allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + TQString(" *.JPE *.TIF"));
        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 (see file #121242 in B.K.O).
        patternList.append(i18n("\n%1|Camera RAW files").arg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
    }
#else
    allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::KDcraw::rawFiles()) + TQString(" *.JPE *.TIF"));
    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 (see file #121242 in B.K.O).
    patternList.append(i18n("\n%1|Camera RAW files").arg(TQString(KDcrawIface::KDcraw::rawFiles())));
#endif

    DDebug() << "mimeTypes=" << mimeTypes.join(" ") << endl;

    KFileDialog dlg(url.path(), mimeTypes.join(" "), parent, "imageFileOpenDialog", false);

    KFileDialog dlg(url.path(), d->fileformats, parent, "imageFileOpenDialog", false);
    ImageDialogPreview *preview = new ImageDialogPreview(&dlg);
    dlg.setPreviewWidget(preview);
    dlg.setOperationMode(KFileDialog::Opening);

    return d->singleSelect;
}

TQString ImageDialog::fileformats() const 
{
    return d->fileformats;
}

KURL ImageDialog::url() const
{
    return d->url;




    if (d->busy)
        return;

    TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading);
    mimeTypes.append("image/x-raw");

    DDebug() << "mimeTypes=" << mimeTypes.join(" ") << endl;

    // 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;

    KURL::List urls = KFileDialog::getOpenURLs(AlbumManager::instance()->getLibraryPath(),
                                               mimeTypes.join(" "), this, i18n("Select Image to Upload"));
    if (!urls.isEmpty())
        slotUploadItems(urls);
}

Return to bug 3192

Lines 255-262 Link Here

(-)digikam-trinity-14.0.11/digikam/libs/dialogs/imagedialog.cpp~ (-37 / +4 lines)
255		255
256	bool singleSelect;	256	bool singleSelect;
257		257
258	TQString fileformats;
259
260	KURL url;	258	KURL url;
261	KURL::List urls;	259	KURL::List urls;
262	};	260	};
Lines 266-303 Link Here
266	d = new ImageDialogPrivate;	264	d = new ImageDialogPrivate;
267	d->singleSelect = singleSelect;	265	d->singleSelect = singleSelect;
268		266
269	TQStringList patternList = TQStringList::split('\n', KImageIO::pattern(KImageIO::Reading));	267	TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading);
270		268	mimeTypes.append("image/x-raw");
271	// All Images from list must been always the first entry given by KDE API
272	TQString allPictures = patternList[0];
273
274	#if KDCRAW_VERSION < 0x000106
275	// Add other files format witch are missing to All Images" type mime provided by KDE and remplace current.
276	if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
277	{
278	allPictures.insert(allPictures.find("\|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + TQString(" .JPE .TIF"));
279	patternList.remove(patternList[0]);
280	patternList.prepend(allPictures);
281	// Added RAW file formats supported by dcraw program like a type mime.
282	// Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
283	// or unavailable (see file #121242 in B.K.O).
284	patternList.append(i18n("\n%1\|Camera RAW files").arg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
285	}
286	#else
287	allPictures.insert(allPictures.find("\|"), TQString(KDcrawIface::KDcraw::rawFiles()) + TQString(" .JPE .TIF"));
288	patternList.remove(patternList[0]);
289	patternList.prepend(allPictures);
290	// Added RAW file formats supported by dcraw program like a type mime.
291	// Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
292	// or unavailable (see file #121242 in B.K.O).
293	patternList.append(i18n("\n%1\|Camera RAW files").arg(TQString(KDcrawIface::KDcraw::rawFiles())));
294	#endif
295		269
296	d->fileformats = patternList.join("\n");	270	DDebug() << "mimeTypes=" << mimeTypes.join(" ") << endl;
297		271
298	DDebug() << "fileformats=" << d->fileformats << endl;	272	KFileDialog dlg(url.path(), mimeTypes.join(" "), parent, "imageFileOpenDialog", false);
299
300	KFileDialog dlg(url.path(), d->fileformats, parent, "imageFileOpenDialog", false);
301	ImageDialogPreview *preview = new ImageDialogPreview(&dlg);	273	ImageDialogPreview *preview = new ImageDialogPreview(&dlg);
302	dlg.setPreviewWidget(preview);	274	dlg.setPreviewWidget(preview);
303	dlg.setOperationMode(KFileDialog::Opening);	275	dlg.setOperationMode(KFileDialog::Opening);
Lines 330-340 Link Here
330	return d->singleSelect;	302	return d->singleSelect;
331	}	303	}
332		304
333	TQString ImageDialog::fileformats() const
334	{
335	return d->fileformats;
336	}
337
338	KURL ImageDialog::url() const	305	KURL ImageDialog::url() const
339	{	306	{
340	return d->url;	307	return d->url;

Lines 995-1031 Link Here

(-)digikam-trinity-14.0.11/digikam/utilities/cameragui/cameraui.cpp~ (-28 / +4 lines)
995	if (d->busy)	995	if (d->busy)
996	return;	996	return;
997		997
998	TQString fileformats;	998	TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading);
		999	mimeTypes.append("image/x-raw");
999		1000
1000	TQStringList patternList = TQStringList::split('\n', KImageIO::pattern(KImageIO::Reading));	1001	DDebug() << "mimeTypes=" << mimeTypes.join(" ") << endl;
1001
1002	// All Images from list must been always the first entry given by KDE API
1003	TQString allPictures = patternList[0];
1004
1005	// Add RAW file format to All Images" type mime and remplace current.
1006	#if KDCRAW_VERSION < 0x000106
1007	allPictures.insert(allPictures.find("\|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()));
1008	#else
1009	allPictures.insert(allPictures.find("\|"), TQString(KDcrawIface::KDcraw::rawFiles()));
1010	#endif
1011	patternList.remove(patternList[0]);
1012	patternList.prepend(allPictures);
1013
1014	// Added RAW file formats supported by dcraw program like a type mime.
1015	// Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
1016	// or unavailable(dcraw_0)(see file #121242 in B.K.O).
1017	#if KDCRAW_VERSION < 0x000106
1018	patternList.append(TQString("\n%1\|Camera RAW files").arg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
1019	#else
1020	patternList.append(TQString("\n%1\|Camera RAW files").arg(TQString(KDcrawIface::KDcraw::rawFiles())));
1021	#endif
1022
1023	fileformats = patternList.join("\n");
1024
1025	DDebug () << "fileformats=" << fileformats << endl;
1026		1002
1027	KURL::List urls = KFileDialog::getOpenURLs(AlbumManager::instance()->getLibraryPath(),	1003	KURL::List urls = KFileDialog::getOpenURLs(AlbumManager::instance()->getLibraryPath(),
1028	fileformats, this, i18n("Select Image to Upload"));	1004	mimeTypes.join(" "), this, i18n("Select Image to Upload"));
1029	if (!urls.isEmpty())	1005	if (!urls.isEmpty())
1030	slotUploadItems(urls);	1006	slotUploadItems(urls);
1031	}	1007	}