Author: schmitt
Date: Mon Jun 5 14:43:17 2006
New Revision: 14005
Log:
add LFUN_CHANGE_NEXT; add user command "change-next" to menus and ct toolbar;
remove warnings for LFUN_ALL_CHANGES_ACCEPT and LFUN_ALL_CHANGES_REJECT
(code seems to work now); remove obsolete call to update() for
LFUN_ALL_CHANGES_ACCEPT
Modified:
lyx-devel/branches/personal/gerz/change-tracking/lib/ui/classic.ui
lyx-devel/branches/personal/gerz/change-tracking/lib/ui/stdmenus.ui
lyx-devel/branches/personal/gerz/change-tracking/lib/ui/stdtoolbars.ui
lyx-devel/branches/personal/gerz/change-tracking/src/BufferView_pimpl.C
lyx-devel/branches/personal/gerz/change-tracking/src/LyXAction.C
lyx-devel/branches/personal/gerz/change-tracking/src/lfuns.h
Hi,
the last patch for today. It introduces LFUN_CHANGE_NEXT which I
consider crucial for a simple CT interface.
Please have a look at the attachment. Comments etc. are welcome.
Michael
Index: src/LyXAction.C
===================================================================
--- src/LyXAction.C (Revision 14002)
+++ src/LyXAction.C (Arbeitskopie)
@@ -316,6 +316,7 @@
{ LFUN_CHANGES_TRACK, "changes-track", Noop },
{ LFUN_CHANGES_OUTPUT, "changes-output", Noop },
{ LFUN_CHANGES_MERGE, "changes-merge", Noop },
+ { LFUN_CHANGE_NEXT, "change-next", ReadOnly },
{ LFUN_CHANGE_ACCEPT, "change-accept", Noop },
{ LFUN_CHANGE_REJECT, "change-reject", Noop },
{ LFUN_ALL_CHANGES_ACCEPT, "all-changes-accept", Noop },
Index: src/BufferView_pimpl.C
===================================================================
--- src/BufferView_pimpl.C (Revision 14002)
+++ src/BufferView_pimpl.C (Arbeitskopie)
@@ -1083,6 +1083,7 @@
}
case LFUN_CHANGES_MERGE:
+ case LFUN_CHANGE_NEXT:
case LFUN_CHANGE_ACCEPT:
case LFUN_CHANGE_REJECT:
case LFUN_ALL_CHANGES_ACCEPT:
@@ -1259,25 +1260,22 @@
case LFUN_ALL_CHANGES_ACCEPT: {
cursor_.reset(buffer_->inset());
-#ifdef WITH_WARNINGS
-#warning FIXME changes
-#endif
while (lyx::find::findNextChange(bv_))
bv_->getLyXText()->acceptChange(cursor_);
- update();
break;
}
case LFUN_ALL_CHANGES_REJECT: {
cursor_.reset(buffer_->inset());
-#ifdef WITH_WARNINGS
-#warning FIXME changes
-#endif
while (lyx::find::findNextChange(bv_))
bv_->getLyXText()->rejectChange(cursor_);
break;
}
+ case LFUN_CHANGE_NEXT:
+ lyx::find::findNextChange(bv_);
+ break;
+
case LFUN_WORD_FIND:
lyx::find::find(bv_, cmd);
break;
Index: src/lfuns.h
===================================================================
--- src/lfuns.h (Revision 14002)
+++ src/lfuns.h (Arbeitskopie)
@@ -367,6 +367,7 @@
// 280
LFUN_BUFFER_TOGGLE_COMPRESSION, // bpeng 20060427
LFUN_MATH_BIGDELIM,
+ LFUN_CHANGE_NEXT,
LFUN_LASTACTION // end of the table
};
Index: lib/ui/stdtoolbars.ui
===================================================================
--- lib/ui/stdtoolbars.ui (Revision 14002)
+++ lib/ui/stdtoolbars.ui (Arbeitskopie)
@@ -148,6 +148,7 @@
Toolbar "change" "Change Tracking"
Item "Track changes" "changes-track"
Item "Show changes in output" "changes-output"
+ Item "Next change" "change-next"
Item "Accept change" "change-accept"
Item "Reject change" "change-reject"
Item "Merge changes..." "changes-merge"
Index: lib/ui/classic.ui
===================================================================
--- lib/ui/classic.ui (Revision 14002)
+++ lib/ui/classic.ui (Arbeitskopie)
@@ -321,11 +321,13 @@
Menu "edit_change"
Item "Track Changes|T" "changes-track"
+ Item "Show Changes in Output|S" "changes-output"
+ Item "Next Change|N" "change-next"
+ Item "Accept Change|A" "change-accept"
+ Item "Reject Change|R" "change-reject"
Item "Merge Changes...|M" "changes-merge"
- Item "Accept All Changes|A" "all-changes-accept"
- Item "Reject All Changes|R" "all-changes-reject"
- Item "Show Changes in Output|S" "changes-output"
-
+ Item "Accept All Changes|c" "all-changes-accept"
+ Item "Reject All Changes|e" "all-changes-reject"
End
#
# LAYOUT MENU
Index: lib/ui/stdmenus.ui
===================================================================
--- lib/ui/stdmenus.ui (Revision 14002)
+++ lib/ui/stdmenus.ui (Arbeitskopie)
@@ -388,6 +388,7 @@
Menu "edit_change"
Item "Track Changes|T" "changes-track"
Item "Show Changes in Output|S" "changes-output"
+ Item "Next Change|N" "change-next"
Item "Accept Change|A" "change-accept"
Item "Reject Change|R" "change-reject"
Item "Merge Changes...|M" "changes-merge"
