X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=916278d96c779b44575f6ab0c0193a98d5c6a8dc;hb=f5123ccfa82215030c70561af881175d92244492;hp=5df7d417207ac075e0bbb07290c1735c3148bef4;hpb=821cffab63909ca1025539dc5bfecd4dca963f3a;p=lyx.git

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 5df7d41720..916278d96c 100644
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -60,6 +60,11 @@ public:
 static InsetName insetnames[INSET_CODE_SIZE];
 
 
+// This list should be kept in sync with the list of dialogs in
+// src/frontends/qt4/GuiView.cpp, I.e., if a dialog goes with an
+// inset, the dialog should have the same name as the inset.
+// Changes should be also recorded in LFUN_DIALOG_SHOW doxygen
+// docs in LyXAction.cpp.
 static void build_translator()
 {
 	static bool passed = false;
@@ -97,7 +102,7 @@ static void build_translator()
 	insetnames[FLOAT_LIST_CODE] = InsetName("floatlist");
 	insetnames[INDEX_PRINT_CODE] = InsetName("index_print");
 	insetnames[NOMENCL_PRINT_CODE] = InsetName("nomencl_print");
-	insetnames[OPTARG_CODE] = InsetName("optarg");
+	insetnames[ARG_CODE] = InsetName("optarg");
 	insetnames[NEWLINE_CODE] = InsetName("newline");
 	insetnames[LINE_CODE] = InsetName("line");
 	insetnames[BRANCH_CODE] = InsetName("branch", _("Branch"));
@@ -163,6 +168,7 @@ static void build_translator()
 	insetnames[MATH_XARROW_CODE] = InsetName("mathxarrow");
 	insetnames[MATH_XYARROW_CODE] = InsetName("mathxyarrow");
 	insetnames[MATH_XYMATRIX_CODE] = InsetName("mathxymatrix");
+	insetnames[MATH_DIAGRAM_CODE] = InsetName("mathdiagram");
 	insetnames[MATH_MACRO_CODE] = InsetName("mathmacro");
 
 	passed = true;
@@ -204,6 +210,13 @@ bool Inset::isBufferLoaded() const
 }
 
 
+bool Inset::isBufferValid() const
+{
+	return buffer_ 
+		&& (isBufferLoaded() || buffer_->isClone());
+}
+
+
 docstring Inset::name() const
 {
 	return from_ascii("unknown");
@@ -221,15 +234,16 @@ bool Inset::allowEmpty() const
 	return getLayout().isKeepEmpty();
 }
 
+
 bool Inset::forceLTR() const
 {
 	return getLayout().forceLTR();
 }
 
-void Inset::initView()
+
+bool Inset::isInToc() const
 {
-	if (isLabeled())
-		buffer().updateBuffer();
+	return getLayout().isInToc();
 }
 
 
@@ -280,10 +294,11 @@ void Inset::dispatch(Cursor & cur, FuncRequest & cmd)
 {
 	if (buffer_ == 0) {
 		lyxerr << "Unassigned buffer_ member in Inset::dispatch()" << std::endl;
-		lyxerr << "LyX Code: " << lyxCode() << " name: " << insetName(lyxCode()) << std::endl;
+		lyxerr << "LyX Code: " << lyxCode() << " name: " 
+		       << insetName(lyxCode()) << std::endl;
 	} else if (cur.buffer() != buffer_)
 		lyxerr << "cur.buffer() != buffer_ in Inset::dispatch()" << std::endl;
-	cur.updateFlags(Update::Force | Update::FitCursor);
+	cur.screenUpdateFlags(Update::Force | Update::FitCursor);
 	cur.dispatched();
 	doDispatch(cur, cmd);
 }
@@ -314,7 +329,7 @@ bool Inset::showInsetDialog(BufferView * bv) const
 
 void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_MOUSE_RELEASE:
 		// if the derived inset did not explicitly handle mouse_release,
 		// we assume we request the settings dialog
@@ -334,7 +349,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
 		break;
 
 	default:
-		cur.noUpdate();
+		cur.noScreenUpdate();
 		cur.undispatched();
 		break;
 	}
@@ -352,11 +367,16 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
 	// Dialogs::checkStatus() ensures that the dialog is deactivated if
 	// LFUN_INSET_APPLY is disabled.
 
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY:
 		// Allow modification of our data.
 		// This needs to be handled in the doDispatch method of our
 		// instantiatable children.
+		// FIXME: Why don't we let the insets determine whether this
+		// should be enabled or not ? Now we need this check for 
+		// the tabular features. (vfr)
+		if (cmd.getArg(0) == "tabular")
+			return false;
 		flag.setEnabled(true);
 		return true;
 
@@ -373,9 +393,13 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
 			flag.setEnabled(enable);
 			return true;
 		} else {
-			flag.setEnabled(false);
 			return false;
 		}
+	
+	case LFUN_IN_MATHMACROTEMPLATE:
+		// By default we're not in a MathMacroTemplate inset
+		flag.setEnabled(false);
+		return true;
 
 	default:
 		break;
@@ -483,7 +507,7 @@ void Inset::metricsMarkers2(Dimension & dim, int framesize) const
 
 void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 {
-	ColorCode pen_color = mouseHovered() || editing(pi.base.bv)?
+	ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)?
 		Color_mathframe : Color_mathcorners;
 
 	Dimension const dim = dimension(*pi.base.bv);
@@ -500,7 +524,7 @@ void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 
 void Inset::drawMarkers2(PainterInfo & pi, int x, int y) const
 {
-	ColorCode pen_color = mouseHovered() || editing(pi.base.bv)?
+	ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)?
 		Color_mathframe : Color_mathcorners;
 
 	drawMarkers(pi, x, y);