Add comment.

[lyx.git] / src / insets / Inset.cpp

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index d99884b20a060954122281c51c16e731d1784d57..916278d96c779b44575f6ab0c0193a98d5c6a8dc 100644 (file)
--- 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;
@@ -228,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();
 }
 
 
@@ -291,7 +298,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);
 }
@@ -342,7 +349,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
                break;
 
        default:
-               cur.noUpdate();
+               cur.noScreenUpdate();
                cur.undispatched();
                break;
        }
@@ -365,6 +372,11 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
                // 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,7 +393,6 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
                        flag.setEnabled(enable);
                        return true;
                } else {
-                       flag.setEnabled(false);
                        return false;
                }
        
@@ -496,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);
@@ -513,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);