From: Jürgen Vigna Date: Wed, 28 Nov 2001 16:09:25 +0000 (+0000) Subject: Reduce Michael's buglist. X-Git-Tag: 1.6.10~20270 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ba180d40891734f05095c5a056152f4476057a73;p=features.git Reduce Michael's buglist. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3106 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/po/POTFILES.in b/po/POTFILES.in index 60d41c1241..43f1bf43df 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,24 +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/figureForm.C +src/ext_l10n.h 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 @@ -32,8 +29,6 @@ src/frontends/controllers/ControlSpellchecker.C src/frontends/controllers/ControlTexinfo.C src/frontends/controllers/ControlThesaurus.C src/frontends/controllers/ControlVCLog.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 @@ -42,6 +37,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 @@ -50,8 +46,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 @@ -73,88 +69,87 @@ 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/Alert_pimpl.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_texinfo.C src/frontends/xforms/FormTexinfo.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_texinfo.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 @@ -179,18 +174,24 @@ 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_main.C src/lyxfind.C src/lyxfont.C src/lyxfunc.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 @@ -199,6 +200,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/ChangeLog b/src/ChangeLog index e254a32727..8536971afa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2001-11-28 Juergen Vigna + + * sp_spell.C (initialize): changed error text to more general + spellchecker command use (not only ispell!) + + * bufferlist.C (qwriteAll): fixed "Cancel" button handling! + + * debug.h: inserted one for debugging INSETTEXT (and InsetTabular)! + 2001-11-26 John Levon * vspace.C: initialise lyxgluelength on failure diff --git a/src/bufferlist.C b/src/bufferlist.C index 3d39fd6de8..41327e41ec 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -127,32 +127,33 @@ bool BufferList::qwriteOne(Buffer * buf, string const & fname, string & unsaved_ return false; } } - return false; + return true; } bool BufferList::qwriteAll() { - bool are_unsaved = false; - string unsaved; + string unsaved; for (BufferStorage::iterator it = bstore.begin(); - it != bstore.end(); ++it) { + it != bstore.end(); ++it) + { if (!(*it)->isLyxClean()) { string fname; if ((*it)->isUnnamed()) fname = OnlyFilename((*it)->fileName()); else fname = MakeDisplayPath((*it)->fileName(), 50); - are_unsaved = qwriteOne(*it, fname, unsaved); + if (!qwriteOne(*it, fname, unsaved)) // cancel the request! + return false; } } - if (are_unsaved && lyxrc.exit_confirmation) { + if (!unsaved.empty() && lyxrc.exit_confirmation) { return Alert::askQuestion(_("Some documents were not saved:"), - unsaved, _("Exit anyway?")); - } + unsaved, _("Exit anyway?")); + } - return true; + return true; } diff --git a/src/debug.h b/src/debug.h index e92d3c1f69..38c0b7e3df 100644 --- a/src/debug.h +++ b/src/debug.h @@ -68,7 +68,9 @@ struct Debug { /// FILES = (1 << 18), /// - WORKAREA = (1 << 19) + WORKAREA = (1 << 19), + /// + INSETTEXT = (1 << 20) }; /// static type const ANY; diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index ab506aa870..3afb7fe56d 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,9 @@ +2001-11-28 Juergen Vigna + + * insettabular.h: insert missing function allowSpellcheck()! + + * insetcollapsable.C (draw): fixed wrong width of collapsed inset! + 2001-11-04 John Levon * insetfloatlist.h: diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index 520a6260e3..1acb5541d0 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -195,7 +195,6 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, if (!isOpen()) { draw_collapsed(pain, baseline, x); - x += TEXT_TO_INSET_OFFSET; return; } diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index fa5becf69e..b81559b707 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -140,6 +140,7 @@ InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns) clearSelection(); need_update = INIT; in_update = false; + in_reset_pos = false; } @@ -155,6 +156,7 @@ InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf, sel_cell_start = sel_cell_end = 0; need_update = INIT; in_update = false; + in_reset_pos = false; } @@ -353,7 +355,7 @@ void InsetTabular::draw(BufferView * bv, LyXFont const & font, int baseline, } i = tabular->row_of_cell(cell); if (the_locking_inset != tabular->GetCellInset(cell)) { - lyxerr[Debug::INSETS] << "ERROR this shouldn't happen\n"; + lyxerr[Debug::INSETTEXT] << "ERROR this shouldn't happen\n"; return; } float dx = nx + tabular->GetBeginningOfTextInCell(cell); @@ -524,7 +526,7 @@ void InsetTabular::edit(BufferView * bv, int x, int y, unsigned int button) UpdatableInset::edit(bv, x, y, button); if (!bv->lockInset(this)) { - lyxerr[Debug::INSETS] << "InsetTabular::Cannot lock inset" << endl; + lyxerr[Debug::INSETTEXT] << "InsetTabular::Cannot lock inset" << endl; return; } locked = true; @@ -545,7 +547,7 @@ void InsetTabular::edit(BufferView * bv, bool front) UpdatableInset::edit(bv, front); if (!bv->lockInset(this)) { - lyxerr[Debug::INSETS] << "InsetTabular::Cannot lock inset" << endl; + lyxerr[Debug::INSETTEXT] << "InsetTabular::Cannot lock inset" << endl; return; } locked = true; @@ -600,24 +602,24 @@ void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what, bool InsetTabular::lockInsetInInset(BufferView * bv, UpdatableInset * inset) { - lyxerr[Debug::INSETS] << "InsetTabular::LockInsetInInset(" + lyxerr[Debug::INSETTEXT] << "InsetTabular::LockInsetInInset(" << inset << "): "; if (!inset) return false; oldcell = -1; if (inset == tabular->GetCellInset(actcell)) { - lyxerr[Debug::INSETS] << "OK" << endl; + lyxerr[Debug::INSETTEXT] << "OK" << endl; the_locking_inset = tabular->GetCellInset(actcell); resetPos(bv); return true; } else if (the_locking_inset && (the_locking_inset == inset)) { - lyxerr[Debug::INSETS] << "OK" << endl; + lyxerr[Debug::INSETTEXT] << "OK" << endl; resetPos(bv); } else if (the_locking_inset) { - lyxerr[Debug::INSETS] << "MAYBE" << endl; + lyxerr[Debug::INSETTEXT] << "MAYBE" << endl; return the_locking_inset->lockInsetInInset(bv, inset); } - lyxerr[Debug::INSETS] << "NOT OK" << endl; + lyxerr[Debug::INSETTEXT] << "NOT OK" << endl; return false; } @@ -1350,6 +1352,11 @@ void InsetTabular::resetPos(BufferView * bv) const { if (!locked || nodraw()) return; + // fast hack to fix infinite repaintings! + if (in_reset_pos) + return; + in_reset_pos = true; + actcol = tabular->column_of_cell(actcell); int cell = 0; @@ -1413,6 +1420,7 @@ void InsetTabular::resetPos(BufferView * bv) const bv->owner()->getDialogs()->updateTabular(inset); oldcell = actcell; } + in_reset_pos = false; } @@ -1998,7 +2006,7 @@ int InsetTabular::getMaxWidth(BufferView * bv, cell = actcell; if (tabular->GetCellInset(cell) != inset) { - lyxerr << "Actcell not equal to actual cell!\n"; + lyxerr[Debug::INSETTEXT] << "Actcell not equal to actual cell!\n"; cell = -1; } } diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index 10e3950f23..ae89b37ca0 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -212,6 +212,7 @@ public: /// LyXCursor const & cursor(BufferView *) const; /// + bool allowSpellcheck() { return true; } string const selectNextWordToSpellcheck(BufferView *, float & value) const; void selectSelectedWord(BufferView *); void toggleSelection(BufferView *, bool kill_selection); @@ -337,5 +338,7 @@ private: mutable UpdateCodes need_update; /// bool in_update; + /// + mutable bool in_reset_pos; }; #endif diff --git a/src/sp_spell.C b/src/sp_spell.C index ee9b546cd6..67c3af6e3d 100644 --- a/src/sp_spell.C +++ b/src/sp_spell.C @@ -413,11 +413,12 @@ void ISpell::initialize(BufferParams const & params, string const & lang) if (isp_pid == -1) { error_ = "\n\n" - "The ispell-process has died for some reason. *One* possible reason\n" - "could be that you do not have a dictionary file\n" - "for the language of this document installed.\n" - "Check /usr/lib/ispell or set another\n" - "dictionary in the Spellchecker Options menu."; + "The spellcheck-process has died for some reason.\n" + "*One* possible reason could be that you do not have\n" + "a dictionary file for the language of this document\n" + "installed.\n" + "Check your spellchecker or set another dictionary\n" + "in the Spellchecker Options menu.\n\n"; } else { error_ = 0; }