From 12cc8f70228d202fbdc4953b4b59d97cb0e8c8b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Vigna?= Date: Mon, 1 Oct 2001 11:55:08 +0000 Subject: [PATCH] Honor FINISHED_XXX flags in LocalDispatch of InsetText/Tabular. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2825 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/POTFILES.in | 114 +++++++++++++++++++------------------- src/insets/insettabular.C | 6 ++ src/insets/insettext.C | 35 ++++++------ 3 files changed, 82 insertions(+), 73 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 0e539c148e..d22def5a24 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,25 +1,21 @@ +src/buffer.C +src/bufferlist.C src/BufferView2.C +src/bufferview_funcs.C src/BufferView_pimpl.C src/Chktex.C src/ColorHandler.C -src/CutAndPaste.C -src/FontLoader.C -src/LColor.C -src/LaTeX.C -src/LyXAction.C -src/LyXSendto.C -src/LyXView.C -src/MenuBackend.C -src/buffer.C -src/bufferlist.C -src/bufferview_funcs.C src/converter.C +src/CutAndPaste.C src/debug.C src/exporter.C src/ext_l10n.h -src/figureForm.C src/figure_form.C +src/figureForm.C +src/FontLoader.C +src/frontends/controllers/biblio.C src/frontends/controllers/ButtonController.h +src/frontends/controllers/character.C src/frontends/controllers/ControlAboutlyx.C src/frontends/controllers/ControlBibtex.C src/frontends/controllers/ControlCharacter.C @@ -31,8 +27,6 @@ src/frontends/controllers/ControlPrint.C src/frontends/controllers/ControlSearch.C src/frontends/controllers/ControlSpellchecker.C src/frontends/controllers/ControlThesaurus.C -src/frontends/controllers/biblio.C -src/frontends/controllers/character.C src/frontends/controllers/helper_funcs.C src/frontends/gnome/FormCitation.C src/frontends/gnome/FormIndex.C @@ -41,6 +35,7 @@ src/frontends/gnome/FormRef.C src/frontends/gnome/FormToc.C src/frontends/gnome/Menubar_pimpl.C src/frontends/qt2/FileDialog.C +src/frontends/qt2/lengthcombo.C src/frontends/qt2/QAbout.C src/frontends/qt2/QBibitem.C src/frontends/qt2/QBibtex.C @@ -49,8 +44,8 @@ src/frontends/qt2/QCharacter.C src/frontends/qt2/QCitation.C src/frontends/qt2/QCitationDialog.C src/frontends/qt2/QDocument.C -src/frontends/qt2/QERT.C src/frontends/qt2/QError.C +src/frontends/qt2/QERT.C src/frontends/qt2/QExternal.C src/frontends/qt2/QExternalDialog.C src/frontends/qt2/QGraphics.C @@ -72,85 +67,84 @@ src/frontends/qt2/QThesaurus.C src/frontends/qt2/QToc.C src/frontends/qt2/QURL.C src/frontends/qt2/QVCLog.C -src/frontends/qt2/lengthcombo.C +src/frontends/xforms/combox.C src/frontends/xforms/FileDialog.C +src/frontends/xforms/form_aboutlyx.C src/frontends/xforms/FormAboutlyx.C +src/frontends/xforms/form_bibitem.C src/frontends/xforms/FormBibitem.C +src/frontends/xforms/form_bibtex.C src/frontends/xforms/FormBibtex.C +src/frontends/xforms/form_browser.C +src/frontends/xforms/form_character.C src/frontends/xforms/FormCharacter.C +src/frontends/xforms/form_citation.C src/frontends/xforms/FormCitation.C +src/frontends/xforms/form_document.C src/frontends/xforms/FormDocument.C -src/frontends/xforms/FormERT.C +src/frontends/xforms/form_error.C src/frontends/xforms/FormError.C +src/frontends/xforms/form_ert.C +src/frontends/xforms/FormERT.C +src/frontends/xforms/form_external.C src/frontends/xforms/FormExternal.C +src/frontends/xforms/form_filedialog.C src/frontends/xforms/FormFiledialog.C +src/frontends/xforms/form_float.C src/frontends/xforms/FormFloat.C +src/frontends/xforms/form_graphics.C src/frontends/xforms/FormGraphics.C +src/frontends/xforms/form_include.C src/frontends/xforms/FormInclude.C +src/frontends/xforms/form_index.C src/frontends/xforms/FormIndex.C src/frontends/xforms/FormLog.C src/frontends/xforms/FormMathsBitmap.C +src/frontends/xforms/form_maths_deco.C src/frontends/xforms/FormMathsDeco.C +src/frontends/xforms/form_maths_delim.C src/frontends/xforms/FormMathsDelim.C +src/frontends/xforms/form_maths_matrix.C src/frontends/xforms/FormMathsMatrix.C +src/frontends/xforms/form_maths_panel.C src/frontends/xforms/FormMathsPanel.C +src/frontends/xforms/form_maths_space.C src/frontends/xforms/FormMathsSpace.C +src/frontends/xforms/form_minipage.C src/frontends/xforms/FormMinipage.C +src/frontends/xforms/form_paragraph.C src/frontends/xforms/FormParagraph.C +src/frontends/xforms/form_preamble.C src/frontends/xforms/FormPreamble.C +src/frontends/xforms/form_preferences.C src/frontends/xforms/FormPreferences.C +src/frontends/xforms/form_print.C src/frontends/xforms/FormPrint.C +src/frontends/xforms/form_ref.C src/frontends/xforms/FormRef.C +src/frontends/xforms/form_search.C src/frontends/xforms/FormSearch.C +src/frontends/xforms/form_spellchecker.C src/frontends/xforms/FormSpellchecker.C +src/frontends/xforms/form_tabular.C src/frontends/xforms/FormTabular.C +src/frontends/xforms/form_tabular_create.C src/frontends/xforms/FormTabularCreate.C +src/frontends/xforms/form_thesaurus.C src/frontends/xforms/FormThesaurus.C +src/frontends/xforms/form_toc.C src/frontends/xforms/FormToc.C +src/frontends/xforms/form_url.C src/frontends/xforms/FormUrl.C src/frontends/xforms/FormVCLog.C -src/frontends/xforms/Menubar_pimpl.C -src/frontends/xforms/combox.C -src/frontends/xforms/form_aboutlyx.C -src/frontends/xforms/form_bibitem.C -src/frontends/xforms/form_bibtex.C -src/frontends/xforms/form_browser.C -src/frontends/xforms/form_character.C -src/frontends/xforms/form_citation.C -src/frontends/xforms/form_document.C -src/frontends/xforms/form_error.C -src/frontends/xforms/form_ert.C -src/frontends/xforms/form_external.C -src/frontends/xforms/form_filedialog.C -src/frontends/xforms/form_float.C -src/frontends/xforms/form_graphics.C -src/frontends/xforms/form_include.C -src/frontends/xforms/form_index.C -src/frontends/xforms/form_maths_deco.C -src/frontends/xforms/form_maths_delim.C -src/frontends/xforms/form_maths_matrix.C -src/frontends/xforms/form_maths_panel.C -src/frontends/xforms/form_maths_space.C -src/frontends/xforms/form_minipage.C -src/frontends/xforms/form_paragraph.C -src/frontends/xforms/form_preamble.C -src/frontends/xforms/form_preferences.C -src/frontends/xforms/form_print.C -src/frontends/xforms/form_ref.C -src/frontends/xforms/form_search.C -src/frontends/xforms/form_spellchecker.C -src/frontends/xforms/form_tabular.C -src/frontends/xforms/form_tabular_create.C -src/frontends/xforms/form_thesaurus.C -src/frontends/xforms/form_toc.C -src/frontends/xforms/form_url.C src/frontends/xforms/input_validators.C +src/frontends/xforms/Menubar_pimpl.C src/frontends/xforms/xforms_helpers.C src/gettext.h src/importer.C src/insets/figinset.C -src/insets/inset.C src/insets/insetbib.C +src/insets/inset.C src/insets/insetcaption.C src/insets/inseterror.C src/insets/insetert.C @@ -175,19 +169,25 @@ src/insets/insettoc.C src/insets/inseturl.C src/kbsequence.C src/language.C +src/LaTeX.C src/layout.C +src/LColor.C +src/LyXAction.C src/lyx_cb.C -src/lyx_gui_misc.C -src/lyx_main.C src/lyxfind.C src/lyxfont.C src/lyxfunc.C +src/lyx_gui_misc.C +src/lyx_main.C src/lyxrc.C +src/LyXSendto.C src/lyxvc.C -src/mathed/formula.C +src/LyXView.C src/mathed/formulabase.C +src/mathed/formula.C src/mathed/formulamacro.C src/mathed/math_cursor.C +src/MenuBackend.C src/minibuffer.C src/paragraph.C src/print_form.C @@ -196,6 +196,6 @@ src/support/getUserName.C src/support/path.C src/support/path.h src/tabular.C -src/text.C src/text2.C +src/text.C src/ext_l10n.h diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 5fbe7fdeea..643d676bb8 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -878,6 +878,12 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, updateLocal(bv, CELL, false); the_locking_inset->toggleInsetCursor(bv); return result; + } else if (result == FINISHED_UP) { + action = LFUN_UP; + } else if (result == FINISHED_DOWN) { + action = LFUN_DOWN; + } else if (result == FINISHED_RIGHT) { + action = LFUN_RIGHT; } } diff --git a/src/insets/insettext.C b/src/insets/insettext.C index e556322a70..16ab02d013 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -1013,30 +1013,33 @@ InsetText::localDispatch(BufferView * bv, else if (result == DISPATCHED) { updateLocal(bv, CURSOR_PAR, false); return result; - } else if (result == FINISHED) { - bool dispatched = false; - switch (action) { - case LFUN_UNKNOWN_ACTION: - case LFUN_BREAKPARAGRAPH: - case LFUN_BREAKLINE: + } else if (result >= FINISHED) { + switch(result) { + case FINISHED_RIGHT: moveRightIntern(bv, false, false); + result = DISPATCHED; break; - case LFUN_RIGHT: - if (!getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params)) - moveRightIntern(bv, false, false); - dispatched = true; + case FINISHED_UP: + if ((result = moveUp(bv)) >= FINISHED) { + updateLocal(bv, CURSOR, false); + bv->unlockInset(this); + } break; - case LFUN_LEFT: - if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params)) - moveRightIntern(bv, false, false); - dispatched = true; + case FINISHED_DOWN: + if ((result = moveDown(bv)) >= FINISHED) { + updateLocal(bv, CURSOR, false); + bv->unlockInset(this); + } break; default: + result = DISPATCHED; break; } the_locking_inset = 0; - if (dispatched) - return DISPATCHED; +#ifdef WITH_WARNINGS +#warning I changed this to always return Dispatched maybe it is wrong (20011001 Jug) +#endif + return result; } } hideInsetCursor(bv); -- 2.39.2