don't rm emergency saves ever

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index 79cfdf78b67f378c1312fa4bdaecdae992096c2e..27b6d9d3f17eb5c1b5587af8d1c6d62ab20d2dcb 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -15,7 +15,7 @@
 #include "lyx_cb.h" // for ShowMessage() ... to be removed?
 #include "gettext.h"
 #include "LString.h"
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include "frontends/Alert.h" //to be removed?
 
@@ -43,11 +43,11 @@ bool operator<(Format const & a, Format const & b)
 }
 
 Format::Format(string const & n, string const & e, string const & p,
-       string const & s, string const & v): name_(n), 
-                                           extension_(e), 
-                                           prettyname_(p), 
+       string const & s, string const & v): name_(n),
+                                           extension_(e),
+                                           prettyname_(p),
                                            shortcut_(s),
-                                           viewer_(v) 
+                                           viewer_(v)
 {}
 
 
@@ -158,12 +158,14 @@ bool Formats::view(Buffer const * buffer, string const & filename,
            format->isChildFormat())
                format = getFormat(format->parentFormat());
        if (!format || format->viewer().empty()) {
+// I believe this is the wrong place to show alerts, it should be done by
+// the caller (this should be "utility" code
 #if USE_BOOST_FORMAT
-               Alert::alert(_("Cannot view file"),
+               Alert::error(_("Cannot view file"),
                             boost::io::str(boost::format(_("No information for viewing %1$s"))
                           % prettyName(format_name)));
 #else
-               Alert::alert(_("Cannot view file"),
+               Alert::error(_("Cannot view file"),
                             _("No information for viewing ")
                             + prettyName(format_name));
 #endif
@@ -199,9 +201,15 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        int const res = one.startscript(Systemcall::DontWait, command);
 
        if (res) {
-               Alert::alert(_("Cannot view file"),
-                          _("Error while executing"),
-                          command.substr(0, 50));
+#if USE_BOOST_FORMAT
+               Alert::error(_("Cannot view file"),
+                            boost::io::str(boost::format(_("An error occurred whilst running %1$s"))
+                          % command.substr(0, 50)));
+#else
+               Alert::error(_("Cannot view file"),
+                            _("An error occurred whilst running ")
+                            + command.substr(0, 50));
+#endif
                return false;
        }
        return true;