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

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 0d84eae1bb..2b9b231903 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -14,6 +14,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "CutAndPaste.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "InsetGraphics.h"
@@ -26,6 +27,7 @@
 #include "LyXVC.h"
 #include "Lexer.h"
 #include "ParagraphParameters.h"
+#include "version.h"
 
 #include "frontends/Application.h"
 
@@ -37,6 +39,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/Translator.h"
 
 #include <sstream>
 
@@ -105,7 +108,7 @@ string InsetInfo::infoType() const
 }
 
 
-docstring InsetInfo::name() const 
+docstring InsetInfo::layoutName() const
 {
 	return from_ascii("Info:" + infoType());
 }
@@ -207,18 +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;
 	}
@@ -227,32 +231,28 @@ bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	// allow selection, copy but not cut, delete etc
 	switch (cmd.action()) {
-	case LFUN_INSET_SETTINGS:
-		InsetCollapsable::doDispatch(cur, cmd);
-		break;
-
 	case LFUN_INSET_MODIFY:
+		cur.recordUndo();
 		setInfo(to_utf8(cmd.argument()));
 		break;
 
-	case LFUN_MOUSE_PRESS:
-		switch (cmd.button()) {
-		case mouse_button::button1:
-		case mouse_button::button3:
-			cur.undispatched();
-			break;
-		case mouse_button::none:
-		case mouse_button::button2:
-		case mouse_button::button4:
-		case mouse_button::button5:
-			// Nothing to do.
-			cur.noUpdate();
-			break;
-		}
+	case LFUN_INSET_COPY_AS: {
+		cap::clearSelection();
+		Cursor copy(cur);
+		copy.pushBackward(*this);
+		copy.pit() = 0;
+		copy.pos() = 0;
+		copy.resetAnchor();
+		copy.pit() = copy.lastpit();
+		copy.pos() = copy.lastpos();
+		copy.setSelection();
+		cap::copySelection(copy);
+		break;
+	}
 
 	default:
+		InsetCollapsable::doDispatch(cur, cmd);
 		break;
 	}
 }
@@ -312,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, "\"");
@@ -326,9 +342,14 @@ void InsetInfo::updateInfo()
 		// check in packages.lst
 		setText(LaTeXFeatures::isAvailable(name_) ? _("yes") : _("no"));
 		break;
+
 	case TEXTCLASS_INFO: {
 		// name_ is the class name
-		setText(LayoutFileList::get().haveClass(name_) ? _("yes") : _("no"));
+		LayoutFileList const & list = LayoutFileList::get();
+		bool available = false;
+		if (list.haveClass(name_))
+			available = list[name_].isTeXClassAvailable();
+		setText(available ? _("yes") : _("no"));
 		break;
 	}
 	case MENU_INFO: {
@@ -339,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;
@@ -370,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;
@@ -393,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") {
@@ -420,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";
 }