tex2lyx: support for Spreadsheet and chess external templates

[lyx.git] / src / insets / InsetInfo.cpp

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 88a27d61be5395af6a96fcf457b2759baffa7ada..2b9b231903e00ab5910493aaa20c5578c0062b24 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -27,6 +27,7 @@
 #include "LyXVC.h"
 #include "Lexer.h"
 #include "ParagraphParameters.h"
+#include "version.h"
 
 #include "frontends/Application.h"
 
@@ -38,6 +39,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/Translator.h"
 
 #include <sstream>
 
@@ -106,7 +108,7 @@ string InsetInfo::infoType() const
 }
 
 
-docstring InsetInfo::name() const 
+docstring InsetInfo::layoutName() const
 {
        return from_ascii("Info:" + infoType());
 }
@@ -358,6 +360,10 @@ void InsetInfo::updateInfo()
                        break;
                }
                // iterate through the menubackend to find it
+               if (!theApp()) {
+                       error("Can't determine menu entry for action %1$s in batch mode");
+                       break;
+               }
                if (!theApp()->searchMenu(func, names)) {
                        error("No menu entry for action %1$s");
                        break;
@@ -389,11 +395,15 @@ void InsetInfo::updateInfo()
        }
        case ICON_INFO: {
                FuncRequest func = lyxaction.lookupFunc(name_);
-               docstring icon_name = theApp()->iconName(func, true);
+               docstring icon_name = frontend::Application::iconName(func, true);
                //FIXME: We should use the icon directly instead of
                // going through FileName. The code below won't work
                // if the icon is embedded in the executable through
                // the Qt resource system.
+               // This is only a negligible performance problem:
+               // If the installed icon differs from the resource icon the
+               // installed one is preferred anyway, and all icons that are
+               // embedded in the resources are installed as well.
                FileName file(to_utf8(icon_name));
                if (!file.exists())
                        break;
@@ -412,7 +422,7 @@ void InsetInfo::updateInfo()
                        break;
                }
                if (name_ == "path") {
-                       setText(from_utf8(buffer().filePath()));
+                       setText(from_utf8(os::latex_path(buffer().filePath())));
                        break;
                }
                if (name_ == "class") {
@@ -439,22 +449,30 @@ void InsetInfo::updateInfo()
                        itype = LyXVC::Date;
                string binfo = buffer().lyxvc().revisionInfo(itype);
                if (binfo.empty())
-                       setText(bformat(_("%1$s unknown"), from_ascii(name_)));
+                       setText(from_ascii(name_) + " unknown");
                else
                        setText(from_utf8(binfo));
                break;
        }
        case LYX_INFO:
                if (name_ == "version")
-                       setText(from_ascii(PACKAGE_VERSION));
+                       setText(from_ascii(lyx_version));
                break;
        }
 }
 
 
-docstring InsetInfo::contextMenu(BufferView const &, int, int) const
+string InsetInfo::contextMenu(BufferView const &, int, int) const
+{
+       //FIXME: We override the implementation of InsetCollapsable,
+       //because this inset is not a collapsable inset.
+       return contextMenuName();
+}
+
+
+string InsetInfo::contextMenuName() const
 {
-       return from_ascii("context-info");
+       return "context-info";
 }