X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.cpp;h=6d64c3f8ead6a4f839e1a93f26e2a67b9e0d2b70;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=c2dbe8a2bc85c9e3bb4e2080e3d6c817e5b174fe;hpb=a864caf6f48092698c8632a57d5630e9924137f4;p=lyx.git

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index c2dbe8a2bc..6d64c3f8ea 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -16,23 +16,24 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
 #include "Lexer.h"
+#include "TextClass.h"
 
 #include "support/gettext.h"
 
 #include <ostream>
 
-//#include "support/debug.h"
 using namespace std;
 
 namespace lyx {
 
 
-InsetFlex::InsetFlex(Buffer const & buf, string const & layoutName)
+InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
 	: InsetCollapsable(buf), name_(layoutName)
 {
-	// again, because now the name is initialized
-	setLayout(buf.params().documentClassPtr());
 	status_= Collapsed;
 }
 
@@ -42,9 +43,20 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
-docstring InsetFlex::editMessage() const
+InsetLayout const & InsetFlex::getLayout() const
 {
-	return _("Opened Flex Inset");
+	DocumentClass const & dc = buffer().params().documentClass();
+	docstring const dname = from_utf8(name_); 
+	if (dc.hasInsetLayout(dname))
+		return dc.insetLayout(dname);
+	return dc.insetLayout(from_utf8("Flex:" + name_));
+}
+
+
+InsetLayout::InsetDecoration InsetFlex::decoration() const
+{
+	InsetLayout::InsetDecoration const dec = getLayout().decoration();
+	return dec == InsetLayout::DEFAULT ? InsetLayout::CONGLOMERATE : dec;
 }
 
 
@@ -56,4 +68,50 @@ void InsetFlex::write(ostream & os) const
 }
 
 
+bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) const
+{
+	switch (cmd.action()) {
+	case LFUN_INSET_DISSOLVE:
+		if (!cmd.argument().empty()) {
+			InsetLayout const & il = getLayout();
+			InsetLayout::InsetLyXType const type = 
+				translateLyXType(to_utf8(cmd.argument()));
+			if (il.lyxtype() == type) {
+				FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
+				return InsetCollapsable::getStatus(cur, temp_cmd, flag);
+			} else
+				return false;
+		}
+		// fall-through
+	default:
+		return InsetCollapsable::getStatus(cur, cmd, flag);
+	}
+}
+
+
+void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
+{
+	switch (cmd.action()) {
+	case LFUN_INSET_DISSOLVE:
+		if (!cmd.argument().empty()) {
+			InsetLayout const & il = getLayout();
+			InsetLayout::InsetLyXType const type = 
+				translateLyXType(to_utf8(cmd.argument()));
+			
+			if (il.lyxtype() == type) {
+				FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
+				InsetCollapsable::doDispatch(cur, temp_cmd);
+			} else
+				cur.undispatched();
+			break;
+		}
+		// fall-through
+	default:
+		InsetCollapsable::doDispatch(cur, cmd);
+		break;
+	}
+}
+
+
 } // namespace lyx