cosmetic fix

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index e3ad3f0503cd7cc7c61c4110e3a1a0cc4f9d24c1..a84ec86d56d78dd5c226bcb45499b20d708617de 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -8,22 +8,25 @@
  * Full author contact details are available in file CREDITS
  */
 
-#include "config.h"
+#include <config.h>
+
 #include "format.h"
+#include "buffer.h"
+#include "buffer_funcs.h"
 #include "lyxrc.h"
 #include "debug.h"
-#include "lyx_cb.h" // for ShowMessage() ... to be removed?
 #include "gettext.h"
 #include "LString.h"
-#include "BoostFormat.h"
 
 #include "frontends/Alert.h" //to be removed?
 
+#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
 #include "support/lyxfunctional.h"
 
+using namespace lyx::support;
 
 
 namespace {
@@ -158,16 +161,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();
@@ -175,12 +174,12 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        if (format_name == "dvi" &&
            !lyxrc.view_dvi_paper_option.empty()) {
                command += ' ' + lyxrc.view_dvi_paper_option;
-               string paper_size = papersize(buffer);
+               string paper_size = buffer->params.paperSizeName();
                if (paper_size == "letter")
                        paper_size = "us";
                command += ' ' + paper_size;
                if (buffer->params.orientation
-                   == BufferParams::ORIENTATION_LANDSCAPE)
+                   == ORIENTATION_LANDSCAPE)
                        command += 'r';
        }
 
@@ -192,16 +191,16 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        command = subst(command, token_path, QuoteName(OnlyPath(filename)));
 
        lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-       ShowMessage(buffer, _("Executing command:"), command);
+       buffer->message(_("Executing command: ") + command);
 
        Path p(OnlyPath(filename));
        Systemcall one;
        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;
@@ -228,30 +227,6 @@ string const Formats::extension(string const & name) const
 }
 
 
-string const papersize(Buffer const * buffer)
-{
-       char real_papersize = buffer->params.papersize;
-       if (real_papersize == BufferParams::PAPER_DEFAULT)
-               real_papersize = lyxrc.default_papersize;
-
-       switch (real_papersize) {
-       case BufferParams::PAPER_A3PAPER:
-               return "a3";
-       case BufferParams::PAPER_A4PAPER:
-               return "a4";
-       case BufferParams::PAPER_A5PAPER:
-               return "a5";
-       case BufferParams::PAPER_B5PAPER:
-               return "b5";
-       case BufferParams::PAPER_EXECUTIVEPAPER:
-               return "foolscap";
-       case BufferParams::PAPER_LEGALPAPER:
-               return "legal";
-       case BufferParams::PAPER_USLETTER:
-       default:
-               return "letter";
-       }
-}
 
 
 Formats formats;