/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <algorithm>
-
#include "importer.h"
#include "converter.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+#include "format.h"
+#include "frontends/LyXView.h"
+#include "funcrequest.h"
#include "bufferlist.h"
#include "support/filetools.h"
-#include "lyx_gui_misc.h" //WriteAlert
+#include "frontends/Alert.h"
#include "gettext.h"
+#include "BufferView.h"
+
+#include "BoostFormat.h"
+
+#include <algorithm>
using std::vector;
using std::find;
extern void InsertAsciiFile(BufferView *, string const &, bool);
-bool Importer::Import(LyXView * lv, string const & filename,
+bool Importer::Import(LyXView * lv, string const & filename,
string const & format)
{
string const displaypath = MakeDisplayPath(filename);
- string const s1 = _("Importing") + ' ' + displaypath + "...";
- lv->message(s1);
+ ostringstream s1;
+#if USE_BOOST_FORMAT
+ s1 << boost::format(_("Importing %1$s...")) % displaypath;
+#else
+ s1 << _("Importing ") << displaypath << _("...");
+#endif
+ lv->message(STRCONV(s1.str()));
string const lyxfile = ChangeExtension(filename, ".lyx");
if (find(loaders.begin(), loaders.end(), format) == loaders.end()) {
for (vector<string>::const_iterator it = loaders.begin();
it != loaders.end(); ++it) {
- if (converters.IsReachable(format, *it)) {
- if (!converters.Convert(0, filename, filename,
+ if (converters.isReachable(format, *it)) {
+ if (!converters.convert(0, filename, filename,
format, *it))
return false;
loader_format = *it;
}
}
if (loader_format.empty()) {
- WriteAlert(_("Can not import file"),
- _("No information for importing from ")
- + formats.PrettyName(format));
+#if USE_BOOST_FORMAT
+ Alert::alert(_("Cannot import file"),
+ boost::io::str(boost::format(_("No information for importing from %1$s"))
+ % formats.prettyName(format)));
+#else
+ Alert::alert(_("Cannot import file"),
+ _("No information for importing from ")
+ + formats.prettyName(format));
+#endif
return false;
}
} else
bool as_paragraphs = loader_format == "textparagraph";
string filename2 = (loader_format == format) ? filename
: ChangeExtension(filename,
- formats.Extension(loader_format));
- InsertAsciiFile(lv->view(), filename2, as_paragraphs);
- lv->getLyXFunc()->Dispatch(LFUN_MARK_OFF);
+ formats.extension(loader_format));
+ InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+ lv->dispatch(FuncRequest(LFUN_MARK_OFF));
}
// we are done
}
-#if 0
-bool Importer::IsImportable(string const & format)
-{
- vector<string> loaders = Loaders();
- for (vector<string>::const_iterator it = loaders.begin();
- it != loaders.end(); ++it)
- if (converters.IsReachable(format, *it))
- return true;
- return false;
-}
-#endif
-
-
vector<Format const *> const Importer::GetImportableFormats()
{
vector<string> loaders = Loaders();
- vector<Format const *> result =
- converters.GetReachableTo(loaders[0], true);
+ vector<Format const *> result =
+ converters.getReachableTo(loaders[0], true);
for (vector<string>::const_iterator it = loaders.begin() + 1;
it != loaders.end(); ++it) {
vector<Format const *> r =
- converters.GetReachableTo(*it, false);
+ converters.getReachableTo(*it, false);
result.insert(result.end(), r.begin(), r.end());
}
return result;