X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=1c0312f5a3107be6ef4e3bc1c1755a316ff3926e;hb=65192d6cf87f8cf70cbb4d879e97faecdb44a19e;hp=b3fdf6fd944e48d9d2addd3445f1c7c28f82a8ef;hpb=b5049e769bba3923cf8e21c980c75b7c00187420;p=lyx.git

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index b3fdf6fd94..1c0312f5a3 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;
@@ -80,7 +85,7 @@ static void build_translator()
 	insetnames[NOMENCL_CODE] = InsetName("nomenclature");
 	insetnames[INCLUDE_CODE] = InsetName("include");
 	insetnames[GRAPHICS_CODE] = InsetName("graphics");
-	insetnames[BIBITEM_CODE] = InsetName("bibitem");
+	insetnames[BIBITEM_CODE] = InsetName("bibitem", _("Bibliography Entry"));
 	insetnames[BIBTEX_CODE] = InsetName("bibtex");
 	insetnames[TEXT_CODE] = InsetName("text");
 	insetnames[ERT_CODE] = InsetName("ert", _("TeX Code"));
@@ -97,19 +102,20 @@ 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");
+	insetnames[BRANCH_CODE] = InsetName("branch", _("Branch"));
 	insetnames[BOX_CODE] = InsetName("box", _("Box"));
 	insetnames[FLEX_CODE] = InsetName("flex");
-	insetnames[SPACE_CODE] = InsetName("space");
+	insetnames[SPACE_CODE] = InsetName("space", _("Horizontal Space"));
 	insetnames[VSPACE_CODE] = InsetName("vspace", _("Vertical Space"));
 	insetnames[MATH_MACROARG_CODE] = InsetName("mathmacroarg");
 	insetnames[LISTINGS_CODE] = InsetName("listings");
 	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");
@@ -149,7 +155,7 @@ static void build_translator()
 	insetnames[MATH_ROOT_CODE] = InsetName("mathroot");
 	insetnames[MATH_SCRIPT_CODE] = InsetName("mathscript");
 	insetnames[MATH_SIZE_CODE] = InsetName("mathsize");
-	insetnames[MATH_SPACE_CODE] = InsetName("mathspace");
+	insetnames[MATH_SPACE_CODE] = InsetName("mathspace", _("Horizontal Math Space"));
 	insetnames[MATH_SPECIALCHAR_CODE] = InsetName("mathspecialchar");
 	insetnames[MATH_SPLIT_CODE] = InsetName("mathsplit");
 	insetnames[MATH_SQRT_CODE] = InsetName("mathsqrt");
@@ -163,6 +169,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;
@@ -198,12 +205,19 @@ Buffer const & Inset::buffer() const
 }
 
 
-bool Inset::isBufferValid() const
+bool Inset::isBufferLoaded() const
 {
 	return buffer_ && theBufferList().isLoaded(buffer_);
 }
 
 
+bool Inset::isBufferValid() const
+{
+	return buffer_ 
+		&& (isBufferLoaded() || buffer_->isClone());
+}
+
+
 docstring Inset::name() const
 {
 	return from_ascii("unknown");
@@ -221,15 +235,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().updateLabels();
+	return getLayout().isInToc();
 }
 
 
@@ -240,6 +255,12 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 
 
 docstring Inset::contextMenu(BufferView const &, int, int) const
+{
+	return contextMenuName();
+}
+
+
+docstring Inset::contextMenuName() const
 {
 	return docstring();
 }
@@ -280,10 +301,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);
 }
@@ -296,8 +318,11 @@ bool Inset::showInsetDialog(BufferView * bv) const
 	case ERT_CODE:
 	case FLOAT_CODE:
 	case BOX_CODE:
+	case BIBITEM_CODE:
+	case BRANCH_CODE:
 	case INFO_CODE:
-	//FIXME: not ready yet.
+	case MATH_SPACE_CODE:
+	case SPACE_CODE:
 	case TABULAR_CODE:
 	case VSPACE_CODE:
 		bv->showDialog(insetName(code));
@@ -311,7 +336,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
@@ -331,7 +356,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
 		break;
 
 	default:
-		cur.noUpdate();
+		cur.noScreenUpdate();
 		cur.undispatched();
 		break;
 	}
@@ -349,11 +374,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;
 
@@ -370,9 +400,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;
@@ -480,7 +514,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);
@@ -497,7 +531,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);