-/* This file is part of
- * ======================================================
+/**
+ * \file importer.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <algorithm>
-
#include "importer.h"
#include "converter.h"
+#include "format.h"
#include "frontends/LyXView.h"
-#include "lyxfunc.h"
+#include "funcrequest.h"
#include "bufferlist.h"
+#include "buffer_funcs.h"
#include "support/filetools.h"
#include "frontends/Alert.h"
#include "gettext.h"
#include "BufferView.h"
+#include <algorithm>
+
+using namespace lyx::support;
+
using std::vector;
using std::find;
+
extern BufferList bufferlist;
extern void InsertAsciiFile(BufferView *, string const &, bool);
string const & format)
{
string const displaypath = MakeDisplayPath(filename);
- ostringstream s1;
- s1 << _("Importing") << ' ' << displaypath << "...";
- lv->message(s1.str().c_str());
+ lv->message(bformat(_("Importing %1$s..."), displaypath));
string const lyxfile = ChangeExtension(filename, ".lyx");
}
}
if (loader_format.empty()) {
- Alert::alert(_("Cannot import file"),
- _("No information for importing from ")
- + formats.prettyName(format));
+ Alert::error(_("Couldn't import file"),
+ bformat(_("No information for importing the format %1$s."),
+ formats.prettyName(format)));
return false;
}
} else
if (loader_format == "lyx") {
- Buffer * buffer = bufferlist.loadLyXFile(lyxfile);
- if (buffer)
- lv->view()->buffer(buffer);
+ lv->view()->loadLyXFile(lyxfile);
} else {
- lv->view()->buffer(bufferlist.newFile(lyxfile, string(), true));
+ lv->view()->newFile(lyxfile, string(), true);
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);
+ InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+ lv->dispatch(FuncRequest(LFUN_MARK_OFF));
}
// we are done