tab funcs changed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6691 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 24a82cea5a38c42ba2abfa03e0d9f2cf5dfa94cf..855f795721eaeb945652fc7635b9bbdc5b76d9da 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-02  John Levon  <levon@movementarian.org>
+
+       * LyXAction.C:
+       * lfuns.h:
+       * lyx_main.C:
+       * lyxtext.h:
+       * text.C:       
+       * text3.C: rename the "tab" lfuns. Remove tab support from normal text
+
 2003-04-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * paragraph.h: make ParagraphList and ParagraphList::iterator

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 3856916b15a0c381427bdab544a22756dfbb74fb..df045b4aa6209e9d97253d383174b3510ef54860 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -340,9 +340,9 @@ void LyXAction::init()
                { LFUN_SETXY, "server-set-xy", "", ReadOnly },
                { LFUN_SET_COLOR, "set-color", "", ReadOnly|NoBuffer },
                { LFUN_SPELLCHECK, "spellchecker", "", Noop },
-               { LFUN_SHIFT_TAB, "tab-backward", "", Noop },
-               { LFUN_TAB, "tab-forward", "", Noop },
-               { LFUN_TABINSERT, "tab-insert", "", Noop },
+               { LFUN_CELL_BACKWARD, "cell-backward", "", Noop },
+               { LFUN_CELL_FORWARD, "cell-forward", "", Noop },
+               { LFUN_CELL_SPLIT, "cell-split", "", Noop },
                { LFUN_TABULAR_INSERT, "tabular-insert", N_("Insert Table"), Noop },
                { LFUN_TABULAR_FEATURE, "tabular-feature",
                  N_("Tabular Features"), Noop },

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 9e964591429a2d6ff181ed8d50a4604d176e21bb..112b7901a9ebe0cee79b15aba2499a58b6aa50d5 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-02  John Levon  <levon@movementarian.org>
+
+       * insettabular.C: tab lfuns renamed
+
 2003-04-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * insettext.C (update): move towards ParagraphList

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 2c0e3aff52eb9f729322fad23d0aba79fc259865..8f1939db07a00cd93898fe94d8de1efb78ba4c7e 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -812,11 +812,11 @@ Inset::RESULT InsetTabular::localDispatch(FuncRequest const & cmd)
                case LFUN_MOUSE_RELEASE:
                        return lfunMouseRelease(cmd) ? DISPATCHED : UNDISPATCHED;
 
-               case LFUN_SHIFT_TAB:
-               case LFUN_TAB:
+               case LFUN_CELL_BACKWARD:
+               case LFUN_CELL_FORWARD:
                        hideInsetCursor(bv);
                        unlockInsetInInset(bv, the_locking_inset);
-                       if (cmd.action == LFUN_TAB)
+                       if (cmd.action == LFUN_CELL_FORWARD)
                                moveNextCell(bv, old_locking_inset != 0);
                        else
                                movePrevCell(bv, old_locking_inset != 0);

diff --git a/src/lfuns.h b/src/lfuns.h
index 2e0cbb6ff3bd55c1741c16feaae3c732c656c38d..c3a29c0e4292ce0458da2717a91e1dd1a5240159 100644 (file)
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -77,8 +77,8 @@ enum kb_action {
        LFUN_NEXT,
        LFUN_HOME,
        LFUN_END,
-       LFUN_TAB,
-       LFUN_SHIFT_TAB,
+       LFUN_CELL_FORWARD,
+       LFUN_CELL_BACKWARD,
        // 45
        LFUN_WORDRIGHT,
        LFUN_WORDLEFT,
@@ -228,7 +228,7 @@ enum kb_action {
        LFUN_LATEX_LOG,                 // Lgb 97-04-05
        LFUN_LAYOUT_COPY,               // Asger 1997-05-04
        LFUN_LAYOUT_PASTE,              // Asger 1997-05-04
-       LFUN_TABINSERT,                 // Ale 970515
+       LFUN_CELL_SPLIT,
        // 170
        LFUN_CHILDOPEN,                 // Ale 970528
        LFUN_TOC_INSERT,                // Lgb 97-05-27

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 168b299a9f067b255c9eaf7215cf9fa832897273..ba262926874ee876fd9b6cd5697b4c37d47378b7 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -503,8 +503,8 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
        kbmap->bind("Up", LFUN_UP);
        kbmap->bind("Down", LFUN_DOWN);
 
-       kbmap->bind("Tab", LFUN_TAB);
-       kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02
+       kbmap->bind("Tab", LFUN_CELL_FORWARD);
+       kbmap->bind("ISO_Left_Tab", LFUN_CELL_FORWARD); // jbl 2001-23-02
 
        kbmap->bind("Home", LFUN_HOME);
        kbmap->bind("End", LFUN_END);
@@ -548,9 +548,9 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
        kbmap->bind("KP_Prior", LFUN_PRIOR);
        kbmap->bind("KP_Next", LFUN_NEXT);
 
-       kbmap->bind("C-Tab", LFUN_TABINSERT);  // ale970515
-       kbmap->bind("S-Tab", LFUN_SHIFT_TAB);  // jug20000522
-       kbmap->bind("S-ISO_Left_Tab", LFUN_SHIFT_TAB); // jbl 2001-23-02
+       kbmap->bind("C-Tab", LFUN_CELL_SPLIT);  // ale970515
+       kbmap->bind("S-Tab", LFUN_CELL_BACKWARD);  // jug20000522
+       kbmap->bind("S-ISO_Left_Tab", LFUN_CELL_BACKWARD); // jbl 2001-23-02
 }
 
 

diff --git a/src/lyxtext.h b/src/lyxtext.h
index f416f5e3e9344a595bed155cc872b8db44ad8d15..b5764ad3f57ed248c4b07d173d70e111bc8dc345 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -383,8 +383,6 @@ public:
        ///
        void cursorNext();
        ///
-       void cursorTab();
-       ///
        void cursorTop();
        ///
        void cursorBottom();

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 40cacd40af3117477bf857933a2f2d6003d43a9b..4917919340ff4849a8ff09a1ffeb7cfde7f89635 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-02  John Levon  <levon@movementarian.org>
+
+       * formulabase.C:
+       * math_gridinset.C: tab lfuns changed name
+
 2003-03-28  John Levon  <levon@movementarian.org>
 
        * formulabase.C: remove LFUN_GREEK - does nothing

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 04eb31e3c4699338824647a5cfac7ecdf952b04e..971630ebc3799323162e76be5877dccbefcaa4c1 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -450,7 +450,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_MATH_DISPLAY:
        case LFUN_MATH_NUMBER:
        case LFUN_MATH_NONUMBER:
-       case LFUN_TABINSERT:
+       case LFUN_CELL_SPLIT:
        case LFUN_BREAKLINE:
        case LFUN_DELETE_LINE_FORWARD:
        case LFUN_INSERT_LABEL:
@@ -532,11 +532,11 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                result = FINISHED_RIGHT;
                break;
 
-       case LFUN_TAB:
+       case LFUN_CELL_FORWARD:
                mathcursor->idxNext();
                break;
 
-       case LFUN_SHIFT_TAB:
+       case LFUN_CELL_BACKWARD:
                mathcursor->idxPrev();
                break;
 

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index fd8ef6e11cf0991d01cd047471a0a88e071be740..61729990cbd7b51307c2c768ac7a80a340ab27d2 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1048,7 +1048,7 @@ dispatch_result MathGridInset::dispatch
                                pos = cell(idx).size();
                        return DISPATCHED_POP;
 
-               case LFUN_TABINSERT:
+               case LFUN_CELL_SPLIT:
                        //bv->lockedInsetStoreUndo(Undo::EDIT);
                        splitCell(idx, pos);
                        return DISPATCHED_POP;

diff --git a/src/text.C b/src/text.C
index b0d6183723575b4bfbb230202751e45edea8c48e..f4dc07006715c7900e6a8c81974d6f67ec111fd5 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1991,24 +1991,6 @@ void LyXText::cursorRightOneWord()
 }
 
 
-void LyXText::cursorTab()
-{
-       LyXCursor tmpcursor = cursor;
-       while (tmpcursor.pos() < tmpcursor.par()->size()
-          && !tmpcursor.par()->isNewline(tmpcursor.pos()))
-       tmpcursor.pos(tmpcursor.pos() + 1);
-
-       if (tmpcursor.pos() == tmpcursor.par()->size()) {
-               if (tmpcursor.par()->next()) {
-                       tmpcursor.par(tmpcursor.par()->next());
-                       tmpcursor.pos(0);
-               }
-       } else
-               tmpcursor.pos(tmpcursor.pos() + 1);
-       setCursor(tmpcursor.par(), tmpcursor.pos());
-}
-
-
 // Skip initial whitespace at end of word and move cursor to *start*
 // of prior word, not to end of next prior word.
 void LyXText::cursorLeftOneWord()

diff --git a/src/text3.C b/src/text3.C
index 1e445f459f02049472c507ea3b69671ddf1a6313..b916f8d4b05684db4576282c3d3fbe6a6f41c59e 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -460,15 +460,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                finishChange(bv);
                break;
 
-       case LFUN_SHIFT_TAB:
-       case LFUN_TAB:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               update();
-               cursorTab();
-               finishChange(bv);
-               break;
-
        case LFUN_WORDRIGHT:
                if (!selection.mark())
                        bv->beforeChange(this);