From f5cc372223f22fdbf0462ff952c4db69559cf786 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 14 Feb 2003 13:52:32 +0000 Subject: [PATCH] fix 773 and more (from Juergen S); fix warning git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6149 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/frontends/controllers/ChangeLog | 5 +++++ src/frontends/controllers/tex_helpers.C | 14 +++++++++---- src/frontends/qt2/ChangeLog | 6 ++++++ src/frontends/qt2/QBibtexDialog.C | 17 ++++++++++++++-- src/frontends/qt2/ui/QBibtexDialogBase.ui | 24 ++--------------------- src/text2.C | 8 ++++---- 7 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2dcf8199ff..a35de78541 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-02-14 Jean-Marc Lasgouttes + + * text2.C (LyXText): change order of initilizers to shut off + warnings + 2003-02-14 John Levon * buffer.C: use ParIterator for getParFromID() diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 0c4b4c8b07..0325a69eed 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2003-02-09 Juergen Spitzmueller + + * tex_helpers.C (getTexFileList): sort and dis-duplicate + listWithoutPath correctly. + 2003-02-08 John Levon * ControlPrefs.h: diff --git a/src/frontends/controllers/tex_helpers.C b/src/frontends/controllers/tex_helpers.C index ace8afab43..327f6f2d23 100644 --- a/src/frontends/controllers/tex_helpers.C +++ b/src/frontends/controllers/tex_helpers.C @@ -78,10 +78,16 @@ string const getTexFileList(string const & filename, bool withFullPath) vector dbase = getVectorFromString(GetFileContents(file), "\n"); - lyx::eliminate_duplicates(dbase); - string const str_out = withFullPath ? - getStringFromVector(dbase, "\n") : - getStringFromVector(listWithoutPath(dbase), "\n"); + if (withFullPath) { + lyx::eliminate_duplicates(dbase); + string const str_out = + getStringFromVector(dbase, "\n"); + return str_out; + } + vector dbaseWP = listWithoutPath(dbase); + lyx::eliminate_duplicates(dbaseWP); + string const str_out = + getStringFromVector(dbaseWP, "\n"); return str_out; } diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 6be5b3fad7..aa1ac54e3c 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,9 @@ +2003-02-09 Juergen Spitzmueller + + * QBibtexDialog.C: Fix browsing mechanism of *.sty files (bug 773). + + * ui/QBibtexDialogBase.ui: Remove unused Update button (bug 773). + 2003-02-13 John Levon * ui/QSpellcheckerDialogBase.ui: A&dd not &Add, bug 884 diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C index 60a084bcb7..260ca756fc 100644 --- a/src/frontends/qt2/QBibtexDialog.C +++ b/src/frontends/qt2/QBibtexDialog.C @@ -58,8 +58,21 @@ void QBibtexDialog::browsePressed() 0, qt_("Select a BibTeX style")); if (!file.isNull()) { - string const filen = ChangeExtension(OnlyFilename(fromqstr(file)), ""); - styleCB->insertItem(toqstr(filen),0); + string const filen = ChangeExtension(fromqstr(file), ""); + bool present = false; + int pres = 0; + + for (unsigned int i = 0; i != styleCB->count(); i++) { + if (fromqstr(styleCB->text(i)) == filen) { + present = true; + pres = i; + } + } + + if (!present) + styleCB->insertItem(toqstr(filen),0); + + styleCB->setCurrentItem(pres); form_->changed(); } } diff --git a/src/frontends/qt2/ui/QBibtexDialogBase.ui b/src/frontends/qt2/ui/QBibtexDialogBase.ui index f92ea50916..9ab985fdf1 100644 --- a/src/frontends/qt2/ui/QBibtexDialogBase.ui +++ b/src/frontends/qt2/ui/QBibtexDialogBase.ui @@ -13,8 +13,8 @@ 0 0 - 285 - 333 + 281 + 315 @@ -213,25 +213,6 @@ Choose a style file - - QPushButton - - name - styleListPB - - - text - &Update - - - autoDefault - false - - - toolTip - Update style list - - QLayoutWidget @@ -376,7 +357,6 @@ deletePB stylePB styleCB - styleListPB bibtocCB okPB closePB diff --git a/src/text2.C b/src/text2.C index 4b818596a5..e6b21acb19 100644 --- a/src/text2.C +++ b/src/text2.C @@ -53,16 +53,16 @@ using lyx::pos_type; LyXText::LyXText(BufferView * bv) : height(0), width(0), first_y(0), - bv_owner(bv), inset_owner(0), the_locking_inset(0), - need_break_row(0), refresh_y(0), refresh_row(0), + inset_owner(0), the_locking_inset(0), need_break_row(0), + refresh_y(0), refresh_row(0), bv_owner(bv), status_(LyXText::UNCHANGED), firstrow(0), lastrow(0) {} LyXText::LyXText(InsetText * inset) : height(0), width(0), first_y(0), - bv_owner(0), inset_owner(inset), the_locking_inset(0), - need_break_row(0), refresh_y(0), refresh_row(0), + inset_owner(inset), the_locking_inset(0), need_break_row(0), + refresh_y(0), refresh_row(0), bv_owner(0), status_(LyXText::UNCHANGED), firstrow(0), lastrow(0) {} -- 2.39.2