Update Win installer for new dictionary links. Untested.

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index ee4f7f464b82d3cc3d64bca4915dddb00e3791c4..7128e2a7744692f739ee3759726cbcc4cbadb3df 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -14,6 +14,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "LyXRC.h"
+#include "OutputParams.h"
 #include "ServerSocket.h"
 
 #include "frontends/alert.h" //to be removed?
@@ -94,9 +95,9 @@ string const Format::extensions() const
 }
 
 
-bool Format::hasExtension(string const & e) const
+bool Format::hasExtension(string const & ext) const
 {
-       return (find(extension_list_.begin(), extension_list_.end(), e)
+       return (find(extension_list_.begin(), extension_list_.end(), ext)
                != extension_list_.end());
 }
 
@@ -255,8 +256,12 @@ string guessFormatFromContents(FileName const & fn)
                        } else if (stamp == "\377\330") {
                                format =  "jpg";
 
+                       } else if (prefixIs(str, "\x89PNG")) {
+                               format =  "png";
+
                        } else if (stamp == "\001\332") {
                                format =  "sgi";
+
                        } else if (prefixIs(str, binEPSStamp)) {
                                format =  "eps";
 
@@ -319,9 +324,6 @@ string guessFormatFromContents(FileName const & fn)
                else if (contains(str, " EMF"))
                        format = "emf";
 
-               else if (contains(str, "PNG"))
-                       format = "png";
-
                else if (contains(str, "%!PS-Adobe")) {
                        // eps or ps
                        ifs >> str;
@@ -642,7 +644,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 // by the caller (this should be "utility" code)
                Alert::error(_("Cannot view file"),
                        bformat(_("No information for viewing %1$s"),
-                               prettyName(format_name)));
+                               translateIfPossible(prettyName(format_name))));
                return false;
        }
        // viewer is 'auto'
@@ -718,10 +720,9 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 bool Formats::edit(Buffer const & buffer, FileName const & filename,
                         string const & format_name) const
 {
-       if (filename.empty() || !filename.exists()) {
-               Alert::error(_("Cannot edit file"),
-                       bformat(_("File does not exist: %1$s"),
-                               from_utf8(filename.absFileName())));
+       if (filename.empty()) {
+               Alert::error(_("No Filename"),
+                       _("No filename was provided!"));
                return false;
        }
 
@@ -746,7 +747,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
 // be done by the caller (this should be "utility" code)
                Alert::error(_("Cannot edit file"),
                        bformat(_("No information for editing %1$s"),
-                               prettyName(format_name)));
+                               translateIfPossible(prettyName(format_name))));
                return false;
        }
 
@@ -817,20 +818,20 @@ string const Formats::extensions(string const & name) const
 
 namespace {
 
-typedef Translator<OutputParams::FLAVOR, string> FlavorTranslator;
+typedef Translator<Flavor, string> FlavorTranslator;
 
 
 FlavorTranslator initFlavorTranslator()
 {
-       FlavorTranslator f(OutputParams::LATEX, "latex");
-       f.addPair(OutputParams::DVILUATEX, "dviluatex");
-       f.addPair(OutputParams::LUATEX, "luatex");
-       f.addPair(OutputParams::PDFLATEX, "pdflatex");
-       f.addPair(OutputParams::XETEX, "xetex");
-       f.addPair(OutputParams::XML, "docbook-xml");
-       f.addPair(OutputParams::HTML, "xhtml");
-       f.addPair(OutputParams::TEXT, "text");
-       f.addPair(OutputParams::LYX, "lyx");
+       FlavorTranslator f(Flavor::LaTeX, "latex");
+       f.addPair(Flavor::DviLuaTeX, "dviluatex");
+       f.addPair(Flavor::LuaTeX, "luatex");
+       f.addPair(Flavor::PdfLaTeX, "pdflatex");
+       f.addPair(Flavor::XeTeX, "xetex");
+       f.addPair(Flavor::DocBook5, "docbook-xml");
+       f.addPair(Flavor::Html, "xhtml");
+       f.addPair(Flavor::Text, "text");
+       f.addPair(Flavor::LyX, "lyx");
        return f;
 }
 
@@ -844,14 +845,14 @@ FlavorTranslator const & flavorTranslator()
 } // namespace
 
 
-std::string flavor2format(OutputParams::FLAVOR flavor)
+std::string flavor2format(Flavor flavor)
 {
        return flavorTranslator().find(flavor);
 }
 
 
 /* Not currently needed, but I'll leave the code in case it is.
-OutputParams::FLAVOR format2flavor(std::string fmt)
+Flavor format2flavor(std::string fmt)
 {
        return flavorTranslator().find(fmt);
 } */