*
* \author Dekel Tsur
*
- * Full author contact details are available in file CREDITS
+ * 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 "support/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 {
}
-bool Formats::view(Buffer const * buffer, string const & filename,
+bool Formats::view(Buffer const & buffer, string const & filename,
string const & format_name) const
{
if (filename.empty())
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::error(_("Cannot view file"),
- boost::io::str(boost::format(_("No information for viewing %1$s"))
- % prettyName(format_name)));
-#else
Alert::error(_("Cannot view file"),
- _("No information for viewing ")
- + prettyName(format_name));
-#endif
- return false;
+ bformat(_("No information for viewing %1$s"),
+ prettyName(format_name)));
+ return false;
}
string command = format->viewer();
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)
+ if (buffer.params.orientation == ORIENTATION_LANDSCAPE)
command += 'r';
}
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) {
-#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
+ bformat(_("An error occurred whilst running %1$s"),
+ command.substr(0, 50)));
return false;
}
return true;
}
-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;