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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 99c4f4477051db345324f09118f4586e7c8474bf..2a63fc25c0a264a79f9020e1c893715cac0c7a12 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-07  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * 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  <martin.vermeer@hut.fi>
 
        * layouts/stdlists.inc:

diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index 6f05c4210b430810f1d0dfef4376ded52fbc67f9..b79f7e057ccec0fef655beb841ec64448ad37658 100644 (file)
--- 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 4ed8d1a622a1cc1053d8e03ec4858d3c6e3bbe2e..c25c6b92bc79d820204cb359800a1ff2952b2d7a 100644 (file)
--- 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 85ac00bb36e0c78436f11c5da267f15cde849303..1e4701995d1bccc91eda2d5e1ded67ca3e0388e6 100644 (file)
--- 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 5b8a3b9415278c3906cc28a236330927175c84f7..eb6582816f73c06cfc4ae09894c0d2ca29275460 100644 (file)
--- 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<unsigned int>(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 f7bd3d613cfd98c2cf9a27e8bd591b690211196d..03e681dc8049a053b6d3e5f4981d51bc1a474d61 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-07  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * lfuns.h:
+       * LyXAction.C:
+       * BufferView_pimpl.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
 2005-05-07  André Pönitz  <poenitz@gmx.net>
 
        * cursor.[Ch] (leaveInset): new function

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 4dbfc1ba943739c5c5a177867ad61ad4bcd56de6..f803537ef2df62302ab916025f782cc336f0df9e 100644 (file)
--- 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 ae205a45dfced9d00d0f9b8dfd0877d0edcdce7c..c0308b48b83eb1d0b6bc14b8d2b78f4bfbbde238 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-07  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * ControlRef.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
 2005-05-03  Alfredo Braunstein  <abraunst@lyx.org>
 
        * ControlSpellchecker.C (check): increment 'start', the beginning

diff --git a/src/frontends/controllers/ControlRef.C b/src/frontends/controllers/ControlRef.C
index 4a29acc379dcdc515c11b5277826c46e71156687..9260d5db8674c809e7d6c3b9f421be1c1e34647c 100644 (file)
--- a/src/frontends/controllers/ControlRef.C
+++ b/src/frontends/controllers/ControlRef.C
@@ -48,7 +48,7 @@ vector<string> 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 49d2ce026c24b95cb4f4c04d0ecd112d261777e5..fb62381fb2bba001d243178ad0c0e0089db34fc9 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-07  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * insetbibtex.C: change screen label
+       * insetref.C:
+       * insetert.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
 2005-05-06  José Matos  <jamatos@lyx.org>
 
        * insetcommandparams.C (scanCommand): fix out of range string access.

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index 7cb57e6686e32bf3e8037751c456c312ecea89cd..56d4ba5831de389c6fbd513b95959ebeea798b14 100644 (file)
--- 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 3d4b17887a612c6d3d581f9bb2edc798d519a85b..0dca4e4fcc4bd9328631a31ee154ba7f11b76440 100644 (file)
--- 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 d104146ff150c2add54752bc0c4b2a8d895aca82..0d571611099e82210dde9ca85aaf6cda71b54374 100644 (file)
--- 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 4613144374011cbb5b6bd3923f554205f3a4517e..7de4043b9866d03fd71e70ef989d0a31db17d221 100644 (file)
--- 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 c7a9f3f8ca1a11110bd8f772d0e39098151158b0..f29e46cea4dd4d9f043992216284b11f3ed20de5 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-07  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * ref_inset.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
 2005-05-01  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * math_nestinset.C (getStatus): suppress math/text fonts,

diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C
index 426ba90187b4ca2358da8bcac6e8200b6ae89b5d..775ba5d9ac1461a77c0c2bf5cf98d8888f71cf18 100644 (file)
--- 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) {