rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

[lyx.git] / src / mathed / math_gridinset.C

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 7cfd702c9adea05ff876d428b66898619f4f06c7..7b773ed54d5856e72f3a0fec6539d104fdc0de3f 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -5,14 +5,43 @@
 #include "funcrequest.h"
 #include "frontends/Painter.h"
 #include "debug.h"
+#include "Lsstream.h"
 
 
+#include "insets/mailinset.h"
+
 using std::swap;
 using std::max;
 using std::min;
 using std::vector;
 
 
+class GridInsetMailer : public MailInset {
+public:
+       GridInsetMailer(MathGridInset & inset) : inset_(inset) {}
+       ///
+       virtual string const & name() const
+       {
+               static const string theName = "tabular";
+               return theName;
+       }
+       ///
+       virtual string const inset2string() const
+       {
+               ostringstream data;
+               //data << name() << " active_cell " << inset.getActCell() << '\n';
+               data << name() << " active_cell " << 0 << '\n';
+               WriteStream ws(data);
+               inset_.write(ws);
+               return data.str();
+       }
+
+protected:
+       InsetBase & inset() const { return inset_; }
+       MathGridInset & inset_; 
+};
+
+
 void mathed_parse_normal(MathGridInset &, string const & argument);
 
 namespace {
@@ -114,6 +143,13 @@ MathGridInset::MathGridInset(col_type m, row_type n, char v, string const & h)
 }
 
 
+MathGridInset::~MathGridInset()
+{
+       GridInsetMailer mailer(*this);
+       mailer.hideDialog();
+}
+
+
 MathInset * MathGridInset::clone() const
 {
        return new MathGridInset(*this);
@@ -967,11 +1003,26 @@ void MathGridInset::splitCell(idx_type & idx, pos_type & pos)
 }
 
 
-MathInset::result_type MathGridInset::dispatch
+dispatch_result MathGridInset::dispatch
        (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
 
+               case LFUN_MOUSE_RELEASE:
+                       //if (cmd.button() == mouse_button::button3) {
+                       //      GridInsetMailer mailer(*this);
+                       //      mailer.showDialog();
+                       //      return DISPATCHED;
+                       //}
+                       break;
+
+               case LFUN_INSET_DIALOG_UPDATE: {
+                       GridInsetMailer mailer(*this);
+                       mailer.updateDialog(cmd.view());
+                       break;
+               }
+
+               // insert file functions
                case LFUN_DELETE_LINE_FORWARD:
                        //autocorrect_ = false;
                        //macroModeClose();
@@ -990,7 +1041,6 @@ MathInset::result_type MathGridInset::dispatch
                case LFUN_TABINSERT:
                        //bv->lockedInsetStoreUndo(Undo::EDIT);
                        splitCell(idx, pos);
-                       //updateLocal(bv, true);
                        return DISPATCHED_POP;
 
                case LFUN_BREAKLINE: {
@@ -1010,7 +1060,6 @@ MathInset::result_type MathGridInset::dispatch
                        pos = cell(idx).size();
 
                        //mathcursor->normalize();
-                       //updateLocal(bv, true);
                        return DISPATCHED_POP;
                }