X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInfo.h;h=8cb7f45adb77a8734a7ecd498279e9b4c8db9bb3;hb=1bd422355430d4753e48eee298dafaf8c1ac458f;hp=66f6a8634a7da29a29199d6f9d4b5abaf89a302d;hpb=7287a259c5436b8f3f384c0d0bd7641a2f2601e9;p=lyx.git

diff --git a/src/insets/InsetInfo.h b/src/insets/InsetInfo.h
index 66f6a8634a..8cb7f45adb 100644
--- a/src/insets/InsetInfo.h
+++ b/src/insets/InsetInfo.h
@@ -12,7 +12,7 @@
 #ifndef INSET_INFO_H
 #define INSET_INFO_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
 
 namespace lyx {
 
@@ -56,12 +56,13 @@ menu: argument is the name of the LFUN such as "paste". The syntax is the same
 
 icon: argument is the name of the LFUN such as "paste". The syntax is the same
     as what is used in the bind and ui files. The output is the icon use in
-    the toolbar for this LFUN.
+    the toolbar for this LFUN. Alternatively, argument can be the icon path
+    without extension specified with respect to the images directory.
 
 buffer: argument can be one of "name", "path", "class". This inset output the
     filename, path, and textclass of this buffer.
-		
-lyxinfo: argument must (presently) be "version". This inset outputs information 
+
+lyxinfo: argument must (presently) be "version". This inset outputs information
 		about the version of LyX currently in use.
 
 There is currently no GUI, no menu entry for this inset. A user can define a
@@ -76,7 +77,7 @@ the command buffer (view->Toolbar->Command Buffer).
 
 */
 
-class InsetInfo : public InsetCollapsable {
+class InsetInfo : public InsetCollapsible {
 public:
 	enum info_type {
 		UNKNOWN_INFO,   // Invalid type
@@ -99,6 +100,11 @@ public:
 	docstring layoutName() const;
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
+	/** FIXME: we would like to do that, but then InsetText::updateBuffer breaks
+	 * on info insets. Do we need to run this method on InsetInfo contents?
+	 * Having a InsetInfo that hides an InsetText is really annoying, actually.
+	 */
+	///bool isActive() const { return false; }
 	///
 	bool editable() const { return false; }
 	///
@@ -129,7 +135,7 @@ public:
 	std::string contextMenu(BufferView const &, int, int) const;
 	///
 	std::string contextMenuName() const;
-	/// should paragraph indendation be ommitted in any case?
+	/// should paragraph indendation be omitted in any case?
 	bool neverIndent() const { return true; }
 
 private:
@@ -140,7 +146,7 @@ private:
 	///
 	void setText(docstring const & str);
 	// make sure that the other version of setText is still available.
-	using InsetCollapsable::setText;
+	using InsetCollapsible::setText;
 	///
 	info_type type_;
 	///