namespace grfx -> lyx::graphics

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 749ff9b19c7e85bbfd167e9488366e3ebd250212..3e6ccf69e09c3aa9f1ef4dafb818e27504864371 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,35 +1,37 @@
-/* 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
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
-
-#include <config.h>
+ * Full author contact details are available in file CREDITS
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
-#include <algorithm>
+#include <config.h>
 
 #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);
 
@@ -38,9 +40,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
                      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");
 
@@ -58,9 +58,9 @@ bool Importer::Import(LyXView * lv, string const & filename,
                        }
                }
                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
@@ -68,17 +68,15 @@ bool Importer::Import(LyXView * lv, string const & filename,
 
 
        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()->buffer(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().get(), filename2, as_paragraphs);
-               lv->getLyXFunc()->dispatch(LFUN_MARK_OFF);
+               lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }
 
        // we are done