X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInfo.cpp;h=2b9b231903e00ab5910493aaa20c5578c0062b24;hb=2906a35663b92030b0668a42ab370dba8ffca4cf;hp=a15270fa3a6acf585a72cdaa22fa5860493ebcb8;hpb=6ec5776991c34bdc97bf758abe479073c2bf252a;p=lyx.git

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index a15270fa3a..2b9b231903 100644
--- 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());
 }
@@ -208,19 +210,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 +233,7 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY:
+		cur.recordUndo();
 		setInfo(to_utf8(cmd.argument()));
 		break;
 
@@ -309,10 +312,26 @@ void InsetInfo::updateInfo()
 	}
 	case LYXRC_INFO: {
 		ostringstream oss;
+		if (name_.empty()) {
+			setText(_("undefined"));
+			break;
+		}
 		lyxrc.write(oss, true, name_);
 		string result = oss.str();
-		// remove leading \\name
-		result = result.substr(name_.size() + 2);
+		if (result.size() < 2) {
+			setText(_("undefined"));
+			break;
+		}
+		string::size_type loc = result.rfind("\n", result.size() - 2);
+		loc = loc == string::npos ? 0 : loc + 1;
+		if (result.size() < loc + name_.size() + 1
+			  || result.substr(loc + 1, name_.size()) != name_) {
+			setText(_("undefined"));
+			break;
+		}
+		// remove leading comments and \\name and space
+		result = result.substr(loc + name_.size() + 2);
+		
 		// remove \n and ""
 		result = rtrim(result, "\n");
 		result = trim(result, "\"");
@@ -341,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;
@@ -372,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;
@@ -395,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") {
@@ -422,22 +449,30 @@ void InsetInfo::updateInfo()
 			itype = LyXVC::Date;
 		string binfo = buffer().lyxvc().revisionInfo(itype);
 		if (binfo.empty())
-			setText(bformat(_("[[%1$s unknown]]"), from_utf8(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";
 }