"Inter-word Space"

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index 0cb80722ef03727186eb611cc4414e345579cd70..73e037cc309cc0491e3cefdf2c0e3b6e2101f5e8 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -8,7 +8,10 @@
  * Full author contact details are available in file CREDITS
  */
 
+#include <config.h>
+
 #include "format.h"
+#include "buffer.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "lyx_cb.h" // for ShowMessage() ... to be removed?
@@ -17,6 +20,7 @@
 
 #include "frontends/Alert.h" //to be removed?
 
+#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
@@ -40,11 +44,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)
 {}
 
 
@@ -129,9 +133,7 @@ void Formats::erase(string const & name)
 
 void Formats::sort()
 {
-       cout << "here" << endl;
        std::sort(formatlist.begin(), formatlist.end());
-       cout << "and here " << formatlist.size() << endl;
 }
 
 
@@ -157,16 +159,12 @@ bool Formats::view(Buffer const * buffer, string const & filename,
            format->isChildFormat())
                format = getFormat(format->parentFormat());
        if (!format || format->viewer().empty()) {
-#if USE_BOOST_FORMAT
-               Alert::alert(_("Cannot view file"),
-                            boost::io::str(boost::format(_("No information for viewing %1$s"))
-                          % prettyName(format_name)));
-#else
-               Alert::alert(_("Cannot view file"),
-                            _("No information for viewing ")
-                            + prettyName(format_name));
-#endif
-                          return false;
+// I believe this is the wrong place to show alerts, it should be done by
+// the caller (this should be "utility" code
+               Alert::error(_("Cannot view file"),
+                       bformat(_("No information for viewing %1$s"),
+                               prettyName(format_name)));
+               return false;
        }
 
        string command = format->viewer();
@@ -190,7 +188,7 @@ bool Formats::view(Buffer const * buffer, string const & filename,
                        QuoteName(OnlyFilename(filename)));
        command = subst(command, token_path, QuoteName(OnlyPath(filename)));
 
-       lyxerr[Debug::FILES] << "Executing command: " << command << endl;
+       lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
        ShowMessage(buffer, _("Executing command:"), command);
 
        Path p(OnlyPath(filename));
@@ -198,9 +196,9 @@ 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));
+               Alert::error(_("Cannot view file"),
+                            bformat(_("An error occurred whilst running %1$s"),
+                              command.substr(0, 50)));
                return false;
        }
        return true;