Hello,
here are a few more text changes for LyX 1.4 (partly ported from the 1.3 branch). Once again, the objective is GUI consistency.
Due to the fact that "Goto Reference" is called "Goto Label" now (see previous emails), I also changed the name of the corresponding LFUN. I hope this is OK.
Please check and apply.
Michael
Index: src/BufferView_pimpl.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.581
diff -u -p -r1.581 BufferView_pimpl.C
--- src/BufferView_pimpl.C 2005/04/20 17:35:46 1.581
+++ src/BufferView_pimpl.C 2005/05/07 15:59:23
@@ -964,7 +964,7 @@ FuncStatus BufferView::Pimpl::getStatus(
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(FuncReq
restorePosition(convert<unsigned int>(cmd.argument));
break;
- case LFUN_REF_GOTO: {
+ case LFUN_LABEL_GOTO: {
string label = cmd.argument;
if (label.empty()) {
InsetRef * inset =
Index: src/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/ChangeLog,v
retrieving revision 1.2175
diff -u -p -r1.2175 ChangeLog
--- src/ChangeLog 2005/05/06 18:54:33 1.2175
+++ src/ChangeLog 2005/05/07 15:59:46
@@ -1,3 +1,9 @@
+2005-05-07 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * lfuns.h:
+ * LyXAction.C:
+ * BufferView_pimpl.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
2005-05-07 André Pönitz <[EMAIL PROTECTED]>
* cursor.[Ch] (leaveInset): new function
Index: src/LyXAction.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/LyXAction.C,v
retrieving revision 1.205
diff -u -p -r1.205 LyXAction.C
--- src/LyXAction.C 2005/02/08 02:06:34 1.205
+++ src/LyXAction.C 2005/05/07 15:59:46
@@ -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 },
Index: src/lfuns.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lfuns.h,v
retrieving revision 1.40
diff -u -p -r1.40 lfuns.h
--- src/lfuns.h 2005/01/24 17:12:18 1.40
+++ src/lfuns.h 2005/05/07 15:59:47
@@ -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
Index: src/insets/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.1143
diff -u -p -r1.1143 ChangeLog
--- src/insets/ChangeLog 2005/05/06 20:00:31 1.1143
+++ src/insets/ChangeLog 2005/05/07 15:59:58
@@ -1,3 +1,9 @@
+2005-05-07 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * insetbibtex.C: change screen label
+ * insetref.C:
+ * insetert.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
2005-05-06 José Matos <[EMAIL PROTECTED]>
* insetcommandparams.C (scanCommand): fix out of range string access.
Index: src/insets/insetbibtex.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetbibtex.C,v
retrieving revision 1.52
diff -u -p -r1.52 insetbibtex.C
--- src/insets/insetbibtex.C 2005/04/18 17:43:10 1.52
+++ src/insets/insetbibtex.C 2005/05/07 15:59:58
@@ -90,7 +90,7 @@ void InsetBibtex::doDispatch(LCursor & c
string const InsetBibtex::getScreenLabel(Buffer const &) const
{
- return _("BibTeX Generated References");
+ return _("BibTeX Generated Bibliography");
}
Index: src/insets/insetert.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetert.C,v
retrieving revision 1.206
diff -u -p -r1.206 insetert.C
--- src/insets/insetert.C 2005/05/06 20:00:31 1.206
+++ src/insets/insetert.C 2005/05/07 15:59:58
@@ -324,7 +324,7 @@ bool InsetERT::getStatus(LCursor & cur,
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:
Index: src/insets/insetref.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetref.C,v
retrieving revision 1.93
diff -u -p -r1.93 insetref.C
--- src/insets/insetref.C 2004/11/24 21:58:39 1.93
+++ src/insets/insetref.C 2005/05/07 15:59:59
@@ -48,7 +48,7 @@ void InsetRef::doDispatch(LCursor & cur,
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;
Index: lib/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/lib/ChangeLog,v
retrieving revision 1.694
diff -u -p -r1.694 ChangeLog
--- lib/ChangeLog 2005/05/05 18:33:49 1.694
+++ lib/ChangeLog 2005/05/07 16:00:04
@@ -1,3 +1,11 @@
+2005-05-07 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* layouts/stdlists.inc:
Index: lib/ui/classic.ui
===================================================================
RCS file: /cvs/lyx/lyx-devel/lib/ui/classic.ui,v
retrieving revision 1.16
diff -u -p -r1.16 classic.ui
--- lib/ui/classic.ui 2005/01/24 17:12:14 1.16
+++ lib/ui/classic.ui 2005/05/07 16:00:05
@@ -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
Index: lib/ui/stdmenus.ui
===================================================================
RCS file: /cvs/lyx/lyx-devel/lib/ui/stdmenus.ui,v
retrieving revision 1.45
diff -u -p -r1.45 stdmenus.ui
--- lib/ui/stdmenus.ui 2005/04/25 14:10:10 1.45
+++ lib/ui/stdmenus.ui 2005/05/07 16:00:05
@@ -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
Index: lib/ui/stdtoolbars.ui
===================================================================
RCS file: /cvs/lyx/lyx-devel/lib/ui/stdtoolbars.ui,v
retrieving revision 1.17
diff -u -p -r1.17 stdtoolbars.ui
--- lib/ui/stdtoolbars.ui 2005/04/21 06:21:25 1.17
+++ lib/ui/stdtoolbars.ui 2005/05/07 16:00:06
@@ -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"
Index: src/mathed/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.496
diff -u -p -r1.496 ChangeLog
--- src/mathed/ChangeLog 2005/05/01 16:15:32 1.496
+++ src/mathed/ChangeLog 2005/05/07 16:00:10
@@ -1,3 +1,7 @@
+2005-05-07 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * ref_inset.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
2005-05-01 Martin Vermeer <[EMAIL PROTECTED]>
* math_nestinset.C (getStatus): suppress math/text fonts,
Index: src/mathed/ref_inset.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/mathed/ref_inset.C,v
retrieving revision 1.50
diff -u -p -r1.50 ref_inset.C
--- src/mathed/ref_inset.C 2005/02/23 12:01:50 1.50
+++ src/mathed/ref_inset.C 2005/05/07 16:00:10
@@ -73,7 +73,7 @@ void RefInset::doDispatch(LCursor & cur,
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) {
Index: src/frontends/controllers/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/controllers/ChangeLog,v
retrieving revision 1.478
diff -u -p -r1.478 ChangeLog
--- src/frontends/controllers/ChangeLog 2005/05/03 22:24:42 1.478
+++ src/frontends/controllers/ChangeLog 2005/05/07 16:00:14
@@ -1,3 +1,7 @@
+2005-05-07 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * ControlRef.C: rename LFUN_REF_GOTO to LFUN_LABEL_GOTO
+
2005-05-03 Alfredo Braunstein <[EMAIL PROTECTED]>
* ControlSpellchecker.C (check): increment 'start', the beginning
Index: src/frontends/controllers/ControlRef.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/controllers/ControlRef.C,v
retrieving revision 1.32
diff -u -p -r1.32 ControlRef.C
--- src/frontends/controllers/ControlRef.C 2004/11/08 10:54:28 1.32
+++ src/frontends/controllers/ControlRef.C 2005/05/07 16:00:15
@@ -48,7 +48,7 @@ vector<string> const ControlRef::getLabe
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));
}
