Attachment #40665 for bug #30133

View | Details | Raw Unified | Return to bug 30133
Collapse All | Expand All




				QStringList	flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);
				if (flist.count() == 0)
				{
					KMessageBox::error(NULL,
							i18n("<qt>No appropriate filter was found to convert the file format %1 into %2.\n"
							     "Go to <i>System Options -> Commands</i> to look through the list of "
							     "possible filters and to see the external programs they require to be " 
							     "available.</qt>").arg(mime).arg(primaryMimeType),
							      i18n("Print"));
								      i18n("Skip")) == KMessageBox::No)
					{
						if (flag)
							QFile::remove(*it);
						it = files.remove(it);
					}
					else
						++it;
					continue;
				}
				QStringList	l(*it);

Lines 733-738 Link Here

(-)kdeprint/kxmlcommand.cpp (+4 lines)
733	const QValueList<KXmlCommand*> l = d->m_mimemap[mimesrc];	733	const QValueList<KXmlCommand*> l = d->m_mimemap[mimesrc];
734	for (QValueList<KXmlCommand*>::ConstIterator it=l.begin(); it!=l.end(); ++it)	734	for (QValueList<KXmlCommand*>::ConstIterator it=l.begin(); it!=l.end(); ++it)
735	{	735	{
		736	// check filter availability
		737	if (!KdeprintChecker::check((*it)->requirements()))
		738	continue;
		739
736	// direct filter: shortest path => return immediately	740	// direct filter: shortest path => return immediately
737	if ((*it)->mimeType() == mimedest)	741	if ((*it)->mimeType() == mimedest)
738	{	742	{

Return to bug 30133

Lines 507-526 Link Here

(-)kdeprint/kprinterimpl.cpp (-11 / +6 lines)
507	QStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);	507	QStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);
508	if (flist.count() == 0)	508	if (flist.count() == 0)
509	{	509	{
510	if (KMessageBox::warningYesNo(NULL,	510	KMessageBox::error(NULL,
511	i18n("No appropriate filter was found to convert the file "	511	i18n("<qt>No appropriate filter was found to convert the file format %1 into %2.\n"
512	"format %1 into %2. Do you want to print the "	512	"Go to <i>System Options -> Commands</i> to look through the list of "
513	"file using its original format?").arg(mime).arg(primaryMimeType),	513	"possible filters and to see the external programs they require to be "
514	QString::null,	514	"available.</qt>").arg(mime).arg(primaryMimeType),
515	i18n("Print"),	515	i18n("Print"));
516	i18n("Skip")) == KMessageBox::No)
517	{
518	if (flag)	516	if (flag)
519	QFile::remove(*it);	517	QFile::remove(*it);
520	it = files.remove(it);	518	it = files.remove(it);
521	}
522	else
523	++it;
524	continue;	519	continue;
525	}	520	}
526	QStringList l(*it);	521	QStringList l(*it);