Better TOC output for XHTML, per Rob and Pavel.

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

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 6fee48de2fb71c7934e56339d75fea24c2995ea3..335e1b6a103339a0298d560f1bdf9741c2a4f698 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"
 
@@ -106,7 +107,7 @@ string InsetInfo::infoType() const
 }
 
 
-docstring InsetInfo::name() const 
+docstring InsetInfo::layoutName() const
 {
        return from_ascii("Info:" + infoType());
 }
@@ -208,19 +209,19 @@ bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action()) {
        case LFUN_INSET_SETTINGS:
                return InsetCollapsable::getStatus(cur, cmd, flag);
-               
+
        case LFUN_INSET_DIALOG_UPDATE:
        case LFUN_INSET_COPY_AS:
                flag.setEnabled(true);
                return true;
-               
+
        case LFUN_INSET_MODIFY:
                if (validateModifyArgument(cmd.argument())) {
                        flag.setEnabled(true);
                        return true;
                }
                //fall through
-               
+
        default:
                return false;
        }
@@ -231,6 +232,7 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
        case LFUN_INSET_MODIFY:
+               cur.recordUndo();
                setInfo(to_utf8(cmd.argument()));
                break;
 
@@ -357,6 +359,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;
@@ -388,11 +394,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;
@@ -437,22 +447,29 @@ void InsetInfo::updateInfo()
                else if (name_ == "vcs-date")
                        itype = LyXVC::Date;
                string binfo = buffer().lyxvc().revisionInfo(itype);
-               if (binfo.empty()) {
-                       docstring fmt = _("%1$s unknown[[InsetNote]]");
-                       setText(bformat(fmt, from_utf8(name_)));
-               } else
+               if (binfo.empty())
+                       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
+{
+       //FIXME: We override the implementation of InsetCollapsable,
+       //because this inset is not a collapsable inset.
+       return contextMenuName();
+}
+
+
+docstring InsetInfo::contextMenuName() const
 {
        return from_ascii("context-info");
 }