From 4160f069a794c623f6d3db6efb54a7e1070c133b Mon Sep 17 00:00:00 2001
From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Wed, 4 Oct 2006 21:43:40 +0000
Subject: [PATCH] 	* src/LyXAction.C: 	* src/BufferView.C: 	*
 src/lfuns.h: introduce LFUN_CHANGE_NEXT

	* src/text3.C: activate LFUN_ACCEPT/REJECT_CHANGE only in CT mode

	* src/rowpainter.C: reduce change bar width
	* src/rowpainter.h: enlarge change bar margin

	* lib/ui/stdmenus.ui: add "Next Change" in "Navigate" menu


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15249 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ui/stdmenus.ui | 1 +
 src/BufferView.C   | 8 ++++++--
 src/LyXAction.C    | 1 +
 src/lfuns.h        | 1 +
 src/rowpainter.C   | 2 +-
 src/rowpainter.h   | 2 +-
 src/text3.C        | 7 +++++--
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui
index f594496747..2c0878422d 100644
--- a/lib/ui/stdmenus.ui
+++ b/lib/ui/stdmenus.ui
@@ -414,6 +414,7 @@ Menuset
 	Menu "navigate"
 		Submenu "Bookmarks|B" "navigate_bookmarks"
 		Item "Next Note|N" "note-next"
+		Item "Next Change|C" "change-next"
 		Item "Next Reference|R" "reference-next"
 		Item "Go to Label|L" "label-goto"
 		Separator
diff --git a/src/BufferView.C b/src/BufferView.C
index d3a09a53df..3f156cfa73 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -661,6 +661,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 	case LFUN_BOOKMARK_GOTO:
 		flag.enabled(isSavedPosition(convert<unsigned int>(lyx::to_utf8(cmd.argument()))));
 		break;
+
 	case LFUN_CHANGES_TRACK:
 		flag.enabled(true);
 		flag.setOnOff(buffer_->params().tracking_changes);
@@ -676,8 +677,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 	}
 
 	case LFUN_CHANGES_MERGE:
-	case LFUN_CHANGE_ACCEPT: // what about these two
-	case LFUN_CHANGE_REJECT: // what about these two
+	case LFUN_CHANGE_NEXT:
 	case LFUN_ALL_CHANGES_ACCEPT:
 	case LFUN_ALL_CHANGES_REJECT:
 		flag.enabled(buffer_ && buffer_->params().tracking_changes);
@@ -841,6 +841,10 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 		break;
 	}
 
+	case LFUN_CHANGE_NEXT:
+		lyx::find::findNextChange(this);
+		break;
+
 	case LFUN_CHANGES_MERGE:
 		if (lyx::find::findNextChange(this))
 			showDialog("changes");
diff --git a/src/LyXAction.C b/src/LyXAction.C
index b035494ff3..f434640738 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -315,6 +315,7 @@ void LyXAction::init()
 		{ LFUN_TOOLTIPS_TOGGLE, "tooltips-toggle", NoBuffer },
 		{ LFUN_CHANGES_TRACK, "changes-track", Noop },
 		{ LFUN_CHANGES_OUTPUT, "changes-output", Noop },
+		{ LFUN_CHANGE_NEXT, "change-next", ReadOnly },
 		{ LFUN_CHANGES_MERGE, "changes-merge", Noop },
 		{ LFUN_CHANGE_ACCEPT, "change-accept", Noop },
 		{ LFUN_CHANGE_REJECT, "change-reject", Noop },
diff --git a/src/lfuns.h b/src/lfuns.h
index e4e60dd542..a3941738c8 100644
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -366,6 +366,7 @@ enum kb_action {
 	LFUN_CLIPBOARD_PASTE,
 	// 280
 	LFUN_INSET_DISSOLVE,                 // jspitzm 20060807
+	LFUN_CHANGE_NEXT,
 
 	LFUN_LASTACTION                  // end of the table
 };
diff --git a/src/rowpainter.C b/src/rowpainter.C
index 012cdc4dad..a280defd3f 100644
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -387,7 +387,7 @@ void RowPainter::paintChangeBar()
 		? row_.ascent()
 		: row_.height();
 
-	pain_.fillRectangle(4, yo_ - row_.ascent(), 5, height, LColor::changebar);
+	pain_.fillRectangle(5, yo_ - row_.ascent(), 3, height, LColor::changebar);
 }
 
 
diff --git a/src/rowpainter.h b/src/rowpainter.h
index e15f2d6392..4eca056c39 100644
--- a/src/rowpainter.h
+++ b/src/rowpainter.h
@@ -39,7 +39,7 @@ void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y);
 inline int nestMargin() { return 15; }
 
 /// margin for changebar
-inline int changebarMargin() { return 10; }
+inline int changebarMargin() { return 12; }
 
 /// right margin
 inline int rightMargin() { return 10; }
diff --git a/src/text3.C b/src/text3.C
index 554ccbf706..92d8006f97 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -1706,6 +1706,11 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 		enable = !isMainText() && cur.inset().nargs() == 1;
 		break;
 
+	case LFUN_CHANGE_ACCEPT:
+	case LFUN_CHANGE_REJECT:
+		enable = cur.buffer().params().tracking_changes;
+		break;
+
 	case LFUN_WORD_DELETE_FORWARD:
 	case LFUN_WORD_DELETE_BACKWARD:
 	case LFUN_LINE_DELETE:
@@ -1793,8 +1798,6 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_ACCENT_HUNGARIAN_UMLAUT:
 	case LFUN_ACCENT_CIRCLE:
 	case LFUN_ACCENT_OGONEK:
-	case LFUN_CHANGE_ACCEPT:
-	case LFUN_CHANGE_REJECT:
 	case LFUN_THESAURUS_ENTRY:
 	case LFUN_PARAGRAPH_PARAMS_APPLY:
 	case LFUN_ESCAPE:
-- 
2.39.2