anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tab funcs changed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6691 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-04-02 22:12:52 +00:00
parent d283cc7745
commit 3c1b0ea16b
12 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -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

6
src/LyXAction.C
View File

@ -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 },

4
src/insets/ChangeLog
View File

@ -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

6
src/insets/insettabular.C
View File

@ -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);

6
src/lfuns.h
View File

@ -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

10
src/lyx_main.C
View File

@ -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
}

2
src/lyxtext.h
View File

@ -383,8 +383,6 @@ public:
///
void cursorNext();
///
void cursorTab();
///
void cursorTop();
///
void cursorBottom();

5
src/mathed/ChangeLog
View File

@ -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

6
src/mathed/formulabase.C
View File

@ -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;

2
src/mathed/math_gridinset.C
View File

@ -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;

18
src/text.C
View File

@ -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()

9
src/text3.C
View File

@ -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);