Changeset View
Changeset View
Standalone View
Standalone View
app/gvcore.cpp
Show First 20 Lines • Show All 355 Lines • ▼ Show 20 Line(s) | |||||
356 | void GvCore::saveAs(const QUrl &url) | 356 | void GvCore::saveAs(const QUrl &url) | ||
357 | { | 357 | { | ||
358 | QByteArray format; | 358 | QByteArray format; | ||
359 | QUrl saveAsUrl; | 359 | QUrl saveAsUrl; | ||
360 | if (!d->showSaveAsDialog(url, &saveAsUrl, &format)) { | 360 | if (!d->showSaveAsDialog(url, &saveAsUrl, &format)) { | ||
361 | return; | 361 | return; | ||
362 | } | 362 | } | ||
363 | 363 | | |||
364 | if (format == "jpg") { | ||||
365 | // Gwenview code assumes JPEG images have "jpeg" format, so if the | ||||
366 | // dialog returned the format "jpg", use "jpeg" instead | ||||
367 | // This does not affect the actual filename extension | ||||
368 | format = "jpeg"; | ||||
369 | } | ||||
370 | | ||||
364 | // Start save | 371 | // Start save | ||
365 | Document::Ptr doc = DocumentFactory::instance()->load(url); | 372 | Document::Ptr doc = DocumentFactory::instance()->load(url); | ||
366 | KJob* job = doc->save(saveAsUrl, format.data()); | 373 | KJob* job = doc->save(saveAsUrl, format); | ||
367 | if (!job) { | 374 | if (!job) { | ||
368 | const QString name = saveAsUrl.fileName().isEmpty() ? saveAsUrl.toDisplayString() : saveAsUrl.fileName(); | 375 | const QString name = saveAsUrl.fileName().isEmpty() ? saveAsUrl.toDisplayString() : saveAsUrl.fileName(); | ||
369 | const QString msg = xi18nc("@info", "<emphasis strong='true'>Saving <filename>%1</filename> failed:</emphasis><nl />%2", | 376 | const QString msg = xi18nc("@info", "<emphasis strong='true'>Saving <filename>%1</filename> failed:</emphasis><nl />%2", | ||
370 | name, doc->errorString()); | 377 | name, doc->errorString()); | ||
371 | KMessageBox::sorry(QApplication::activeWindow(), msg); | 378 | KMessageBox::sorry(QApplication::activeWindow(), msg); | ||
372 | } else { | 379 | } else { | ||
373 | connect(job, SIGNAL(result(KJob*)), SLOT(slotSaveResult(KJob*))); | 380 | connect(job, SIGNAL(result(KJob*)), SLOT(slotSaveResult(KJob*))); | ||
374 | } | 381 | } | ||
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines |