From ce7da69af13ca945169eef57b5fba13e932a5ab6 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 8 May 2005 10:02:38 +0000 Subject: [PATCH] Another set of text changes from Michael, approved by John git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9920 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 8 ++++++++ lib/ui/classic.ui | 10 +++++----- lib/ui/stdmenus.ui | 10 +++++----- lib/ui/stdtoolbars.ui | 2 +- src/BufferView_pimpl.C | 4 ++-- src/ChangeLog | 6 ++++++ src/LyXAction.C | 2 +- src/frontends/controllers/ChangeLog | 4 ++++ src/frontends/controllers/ControlRef.C | 2 +- src/insets/ChangeLog | 6 ++++++ src/insets/insetbibtex.C | 2 +- src/insets/insetert.C | 2 +- src/insets/insetref.C | 2 +- src/lfuns.h | 2 +- src/mathed/ChangeLog | 4 ++++ src/mathed/ref_inset.C | 2 +- 16 files changed, 48 insertions(+), 20 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 99c4f44770..2a63fc25c0 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,11 @@ +2005-05-07 Michael Schmitt + + * ui/*.ui: Synchronize menu entries with dialog titles: + "TeX" => "TeX Code", "BibTeX Reference" => "BibTeX Bibliography", + "Citation Reference" => "Citation", "Cross Reference" => + "Cross-reference"; fix semantics: "Goto Reference" => "Goto Label", + "Refs" => "Labels" + 2005-05-05 Martin Vermeer * layouts/stdlists.inc: diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui index 6f05c4210b..b79f7e057c 100644 --- a/lib/ui/classic.ui +++ b/lib/ui/classic.ui @@ -210,8 +210,8 @@ Menuset Submenu "Math|h" "insert_math" Separator Submenu "Special Character|S" "insert_special" - Item "Citation Reference...|C" "dialog-show-new-inset citation" - Item "Cross Reference...|R" "dialog-show-new-inset ref" + Item "Citation...|C" "dialog-show-new-inset citation" + Item "Cross-reference...|R" "dialog-show-new-inset ref" Item "Label...|L" "label-insert" Item "Footnote|F" "footnote-insert" Item "Marginal Note|M" "marginalnote-insert" @@ -222,7 +222,7 @@ Menuset Item "Note|N" "note-insert" Submenu "Lists & TOC|O" "insert_toc" Separator - Item "TeX|T" "ert-insert" + Item "TeX Code|T" "ert-insert" Item "Minipage|p" "minipage-insert" Item "Graphics...|G" "dialog-show-new-inset graphics" Item "Tabular Material...|b" "tabular-insert" @@ -306,7 +306,7 @@ Menuset Item "Table of Contents|C" "toc-insert" FloatListInsert Item "Index List|I" "index-print" - Item "BibTeX Reference...|B" "dialog-show-new-inset bibtex" + Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex" End Menu "insert_file" @@ -368,7 +368,7 @@ Menuset Toc Separator Item "Note|N" "note-next" - Item "Refs|R" "reference-goto" + Item "Label|L" "label-goto" Submenu "Bookmarks|B" "navigate_bookmarks" End diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui index 4ed8d1a622..c25c6b92bc 100644 --- a/lib/ui/stdmenus.ui +++ b/lib/ui/stdmenus.ui @@ -236,8 +236,8 @@ Menuset Submenu "File|e" "insert_file" Item "Box" "box-insert Frameless" Separator - Item "Citation Reference...|C" "dialog-show-new-inset citation" - Item "Cross Reference...|R" "dialog-show-new-inset ref" + Item "Citation...|C" "dialog-show-new-inset citation" + Item "Cross-reference...|R" "dialog-show-new-inset ref" Item "Label...|L" "label-insert" Item "Index Entry|d" "index-insert" # I'm going to kill this dumb dialog, but for now ... @@ -248,7 +248,7 @@ Menuset Item "Footnote|F" "footnote-insert" Item "Marginal Note|M" "marginalnote-insert" Item "Short Title" "optional-insert" - Item "TeX|X" "ert-insert" + Item "TeX Code|X" "ert-insert" End Menu "insert_special" @@ -332,7 +332,7 @@ Menuset Item "Table of Contents|C" "toc-insert" FloatListInsert Item "Index List|I" "index-print" - Item "BibTeX Reference...|B" "dialog-show-new-inset bibtex" + Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex" End Menu "insert_file" @@ -387,7 +387,7 @@ Menuset Menu "navigate" Submenu "Bookmarks|B" "navigate_bookmarks" Item "Next Note|N" "note-next" - Item "Goto Reference|G" "reference-goto" + Item "Goto Label|G" "label-goto" Separator Toc End diff --git a/lib/ui/stdtoolbars.ui b/lib/ui/stdtoolbars.ui index 85ac00bb36..1e4701995d 100644 --- a/lib/ui/stdtoolbars.ui +++ b/lib/ui/stdtoolbars.ui @@ -78,7 +78,7 @@ Toolbar "extra" "Extra" Item "Insert margin note" "marginalnote-insert" Item "Insert note" "note-insert" Item "Insert URL" "url-insert" - Item "Insert TeX" "ert-insert" + Item "Insert TeX Code" "ert-insert" Item "Include file" "dialog-show-new-inset include" Separator Item "Text style" "dialog-show character" diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 5b8a3b9415..eb6582816f 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -964,7 +964,7 @@ FuncStatus BufferView::Pimpl::getStatus(FuncRequest const & cmd) case LFUN_FONT_STATE: case LFUN_INSERT_LABEL: case LFUN_BOOKMARK_SAVE: - case LFUN_REF_GOTO: + case LFUN_LABEL_GOTO: case LFUN_GOTO_PARAGRAPH: case LFUN_GOTOERROR: case LFUN_GOTONOTE: @@ -1075,7 +1075,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & cmd) restorePosition(convert(cmd.argument)); break; - case LFUN_REF_GOTO: { + case LFUN_LABEL_GOTO: { string label = cmd.argument; if (label.empty()) { InsetRef * inset = diff --git a/src/ChangeLog b/src/ChangeLog index f7bd3d613c..03e681dc80 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-05-07 Michael Schmitt + + * lfuns.h: + * LyXAction.C: + * BufferView_pimpl.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO + 2005-05-07 André Pönitz * cursor.[Ch] (leaveInset): new function diff --git a/src/LyXAction.C b/src/LyXAction.C index 4dbfc1ba94..f803537ef2 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -246,7 +246,7 @@ void LyXAction::init() { LFUN_QUOTE, "quote-insert", Noop }, { LFUN_RECONFIGURE, "reconfigure", NoBuffer }, { LFUN_REDO, "redo", Noop }, - { LFUN_REF_GOTO, "reference-goto", ReadOnly }, + { LFUN_LABEL_GOTO, "label-goto", ReadOnly }, { LFUN_REFERENCE_GOTO, "reference-next", ReadOnly }, { LFUN_NEXT, "screen-down", ReadOnly | NoUpdate}, { LFUN_NEXTSEL, "screen-down-select", ReadOnly }, diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index ae205a45df..c0308b48b8 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2005-05-07 Michael Schmitt + + * ControlRef.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO + 2005-05-03 Alfredo Braunstein * ControlSpellchecker.C (check): increment 'start', the beginning diff --git a/src/frontends/controllers/ControlRef.C b/src/frontends/controllers/ControlRef.C index 4a29acc379..9260d5db86 100644 --- a/src/frontends/controllers/ControlRef.C +++ b/src/frontends/controllers/ControlRef.C @@ -48,7 +48,7 @@ vector const ControlRef::getLabelList(string const & name) const void ControlRef::gotoRef(string const & ref) { kernel().dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0")); - kernel().dispatch(FuncRequest(LFUN_REF_GOTO, ref)); + kernel().dispatch(FuncRequest(LFUN_LABEL_GOTO, ref)); } diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 49d2ce026c..fb62381fb2 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,9 @@ +2005-05-07 Michael Schmitt + + * insetbibtex.C: change screen label + * insetref.C: + * insetert.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO + 2005-05-06 José Matos * insetcommandparams.C (scanCommand): fix out of range string access. diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C index 7cb57e6686..56d4ba5831 100644 --- a/src/insets/insetbibtex.C +++ b/src/insets/insetbibtex.C @@ -90,7 +90,7 @@ void InsetBibtex::doDispatch(LCursor & cur, FuncRequest & cmd) string const InsetBibtex::getScreenLabel(Buffer const &) const { - return _("BibTeX Generated References"); + return _("BibTeX Generated Bibliography"); } diff --git a/src/insets/insetert.C b/src/insets/insetert.C index 3d4b17887a..0dca4e4fcc 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -324,7 +324,7 @@ bool InsetERT::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_GOTONOTE: case LFUN_PARAGRAPH_SPACING: case LFUN_QUOTE: - case LFUN_REF_GOTO: + case LFUN_LABEL_GOTO: case LFUN_REFERENCE_GOTO: case LFUN_SPACE_INSERT: case LFUN_GOTOFILEROW: diff --git a/src/insets/insetref.C b/src/insets/insetref.C index d104146ff1..0d57161109 100644 --- a/src/insets/insetref.C +++ b/src/insets/insetref.C @@ -48,7 +48,7 @@ void InsetRef::doDispatch(LCursor & cur, FuncRequest & cmd) case LFUN_MOUSE_PRESS: // Eventually trigger dialog with button 3 not 1 if (cmd.button() == mouse_button::button3) - cur.bv().owner()->dispatch(FuncRequest(LFUN_REF_GOTO, getContents())); + cur.bv().owner()->dispatch(FuncRequest(LFUN_LABEL_GOTO, getContents())); else InsetCommandMailer("ref", *this).showDialog(&cur.bv()); return; diff --git a/src/lfuns.h b/src/lfuns.h index 4613144374..7de4043b98 100644 --- a/src/lfuns.h +++ b/src/lfuns.h @@ -230,7 +230,7 @@ enum kb_action { LFUN_VC_REVERT, // Lgb 97-07-01 LFUN_VC_UNDO, // Lgb 97-07-01 LFUN_EXPORT, // Lgb 97-07-29 - LFUN_REF_GOTO, // Ale 970806 + LFUN_LABEL_GOTO, // Ale 970806 LFUN_LDOTS, // Asger 970929 // 170 LFUN_END_OF_SENTENCE, // Asger 970929 diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index c7a9f3f8ca..f29e46cea4 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2005-05-07 Michael Schmitt + + * ref_inset.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO + 2005-05-01 Martin Vermeer * math_nestinset.C (getStatus): suppress math/text fonts, diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C index 426ba90187..775ba5d9ac 100644 --- a/src/mathed/ref_inset.C +++ b/src/mathed/ref_inset.C @@ -73,7 +73,7 @@ void RefInset::doDispatch(LCursor & cur, FuncRequest & cmd) case LFUN_MOUSE_RELEASE: if (cmd.button() == mouse_button::button3) { lyxerr << "trying to goto ref '" << asString(cell(0)) << "'" << endl; - cur.bv().dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0)))); + cur.bv().dispatch(FuncRequest(LFUN_LABEL_GOTO, asString(cell(0)))); break; } if (cmd.button() == mouse_button::button1) { -- 2.39.2