X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=8b741b7b0ace1deae4cf9fcb8d660a3139af8aa6;hb=73368ed2d97728ee3ec889383b3803d8e3309e9d;hp=2587df3f68eb238d1f32d0eef0aced32886a764f;hpb=2cb20b211c9290efd68eda9e0ca33a96db8b7b11;p=lyx.git

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 2587df3f68..8b741b7b0a 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;
@@ -89,6 +94,9 @@ static void build_translator()
 	insetnames[FLOAT_CODE] = InsetName("float", _("Float"));
 	insetnames[WRAP_CODE] = InsetName("wrap");
 	insetnames[SPECIALCHAR_CODE] = InsetName("specialchar");
+	insetnames[IPA_CODE] = InsetName("ipa");
+	insetnames[IPACHAR_CODE] = InsetName("ipachar");
+	insetnames[IPADECO_CODE] = InsetName("ipadeco");
 	insetnames[TABULAR_CODE] = InsetName("tabular", _("Table"));
 	insetnames[EXTERNAL_CODE] = InsetName("external");
 	insetnames[CAPTION_CODE] = InsetName("caption");
@@ -97,7 +105,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"));
@@ -110,6 +118,7 @@ static void build_translator()
 	insetnames[INFO_CODE] = InsetName("info", _("Info"));
 	insetnames[COLLAPSABLE_CODE] = InsetName("collapsable");
 	insetnames[NEWPAGE_CODE] = InsetName("newpage");
+	insetnames[SCRIPT_CODE] = InsetName("script");
 	insetnames[CELL_CODE] = InsetName("tablecell");
 	insetnames[MATH_AMSARRAY_CODE] = InsetName("mathamsarray");
 	insetnames[MATH_ARRAY_CODE] = InsetName("matharray");
@@ -117,6 +126,8 @@ static void build_translator()
 	insetnames[MATH_BOLDSYMBOL_CODE] = InsetName("mathboldsymbol");
 	insetnames[MATH_BOX_CODE] = InsetName("mathbox");
 	insetnames[MATH_BRACE_CODE] = InsetName("mathbrace");
+	insetnames[MATH_CANCEL_CODE] = InsetName("mathcancel");
+	insetnames[MATH_CANCELTO_CODE] = InsetName("mathcancelto");
 	insetnames[MATH_CASES_CODE] = InsetName("mathcases");
 	insetnames[MATH_CHAR_CODE] = InsetName("mathchar");
 	insetnames[MATH_COLOR_CODE] = InsetName("mathcolor");
@@ -163,6 +174,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;
@@ -179,12 +191,11 @@ Buffer & Inset::buffer()
 {
 	if (!buffer_) {
 		odocstringstream s;
-		lyxerr << "Inset: " << this
-					<< " LyX Code: " << lyxCode()
-					<< " name: " << insetName(lyxCode())
-					<< std::endl;
-		s << "LyX Code: " << lyxCode() << " name: " << name();
-		LASSERT(false, /**/);
+		string const iname = insetName(lyxCode());
+		LYXERR0("Inset: " << this << " LyX Code: " << lyxCode()
+					<< " name: " << iname);
+		s << "LyX Code: " << lyxCode() << " name: " << iname;
+		LATTEST(false);
 		throw ExceptionMessage(BufferException, 
 			from_ascii("Inset::buffer_ member not initialized!"), s.str());
 	}
@@ -211,7 +222,7 @@ bool Inset::isBufferValid() const
 }
 
 
-docstring Inset::name() const
+docstring Inset::layoutName() const
 {
 	return from_ascii("unknown");
 }
@@ -228,15 +239,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();
 }
 
 
@@ -246,9 +258,20 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 }
 
 
-docstring Inset::contextMenu(BufferView const &, int, int) const
+void Inset::forToc(docstring &, size_t) const
 {
-	return docstring();
+}
+
+
+string Inset::contextMenu(BufferView const &, int, int) const
+{
+	return contextMenuName();
+}
+
+
+string Inset::contextMenuName() const
+{
+	return string();
 }
 
 
@@ -291,7 +314,7 @@ void Inset::dispatch(Cursor & cur, FuncRequest & cmd)
 		       << 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);
 }
@@ -322,12 +345,12 @@ 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
 		if (!cur.selection() && cmd.button() == mouse_button::button1
-			  && hasSettings()) {
+		    && clickable(cmd.x(), cmd.y()) && hasSettings()) {
 			FuncRequest tmpcmd(LFUN_INSET_SETTINGS);
 			dispatch(cur, tmpcmd);
 		}
@@ -342,7 +365,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
 		break;
 
 	default:
-		cur.noUpdate();
+		cur.noScreenUpdate();
 		cur.undispatched();
 		break;
 	}
@@ -360,11 +383,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;
 
@@ -381,10 +409,19 @@ 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;
+
+	case LFUN_IN_IPA:
+		// By default we're not in an IPA inset
+		flag.setEnabled(false);
+		return true;
+
 	default:
 		break;
 	}
@@ -491,7 +528,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);
@@ -508,7 +545,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);
@@ -551,7 +588,7 @@ InsetLayout const & Inset::getLayout() const
 {
 	if (!buffer_)
 		return DocumentClass::plainInsetLayout();
-	return buffer().params().documentClass().insetLayout(name());
+	return buffer().params().documentClass().insetLayout(layoutName());
 }
 
 
@@ -595,6 +632,12 @@ void Inset::setDimCache(MetricsInfo const & mi, Dimension const & dim) const
 
 Buffer const * Inset::updateFrontend() const
 {
+	//FIXME (Abdel 03/12/10): see bugs #6814 and #6949
+	// If the Buffer is null and we end up here this is most probably because we
+	// are in the CutAndPaste stack. See InsetGraphics, RenderGraphics and
+	// RenderPreview.
+	if (!buffer_)
+		return 0;
 	return theApp() ? theApp()->updateInset(this) : 0;
 }