Uptil now, it was said that the export was succesful.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40099
a592a061-630c-0410-9148-
cb99ea01b6c8
if (status == CANCEL) {
message(_("Document export cancelled."));
if (status == CANCEL) {
message(_("Document export cancelled."));
- } else if (tmp_result_file.exists()) {
+ return ExportCancel;
+ }
+
+ if (tmp_result_file.exists()) {
// Finally copy the main file
use_force = use_gui ? lyxrc.export_overwrite != NO_FILES
: force_overwrite != NO_FILES;
// Finally copy the main file
use_force = use_gui ? lyxrc.export_overwrite != NO_FILES
: force_overwrite != NO_FILES;
status = copyFile(format, tmp_result_file,
FileName(result_file), result_file,
status == FORCE);
status = copyFile(format, tmp_result_file,
FileName(result_file), result_file,
status == FORCE);
- message(bformat(_("Document exported as %1$s "
- "to file `%2$s'"),
- formats.prettyName(format),
- makeDisplayPath(result_file)));
+ if (status == CANCEL) {
+ message(_("Document export cancelled."));
+ return ExportCancel;
+ } else {
+ message(bformat(_("Document exported as %1$s "
+ "to file `%2$s'"),
+ formats.prettyName(format),
+ makeDisplayPath(result_file)));
+ }
} else {
// This must be a dummy converter like fax (bug 1888)
message(bformat(_("Document exported as %1$s"),
} else {
// This must be a dummy converter like fax (bug 1888)
message(bformat(_("Document exported as %1$s"),
enum ExportStatus {
// export
ExportSuccess,
enum ExportStatus {
// export
ExportSuccess,
ExportError,
ExportNoPathToFormat,
ExportTexPathHasSpaces,
ExportError,
ExportNoPathToFormat,
ExportTexPathHasSpaces,
docstring msg;
switch (status) {
case Buffer::ExportSuccess:
docstring msg;
switch (status) {
case Buffer::ExportSuccess:
- msg = _("Successful export to format: %1$s");
+ msg = bformat(_("Successful export to format: %1$s"), from_utf8(format));
+ break;
+ case Buffer::ExportCancel:
+ msg = _("Document export cancelled.");
break;
case Buffer::ExportError:
case Buffer::ExportNoPathToFormat:
case Buffer::ExportTexPathHasSpaces:
case Buffer::ExportConverterError:
break;
case Buffer::ExportError:
case Buffer::ExportNoPathToFormat:
case Buffer::ExportTexPathHasSpaces:
case Buffer::ExportConverterError:
- msg = _("Error while exporting format: %1$s");
+ msg = bformat(_("Error while exporting format: %1$s"), from_utf8(format));
break;
case Buffer::PreviewSuccess:
break;
case Buffer::PreviewSuccess:
- msg = _("Successful preview of format: %1$s");
+ msg = bformat(_("Successful preview of format: %1$s"), from_utf8(format));
break;
case Buffer::PreviewError:
break;
case Buffer::PreviewError:
- msg = _("Error while previewing format: %1$s");
+ msg = bformat(_("Error while previewing format: %1$s"), from_utf8(format));
- view->message(bformat(msg, from_utf8(format)));