Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Jean-Marc Lasgouttes
Michael == Michael Gerz [EMAIL PROTECTED] writes: Michael In other words, you want me to introduce some Michael enum AcceptReject { ACCEPT, REJECT } Michael and pass it as parameter, right? I am sorry that I did not answer in time. To try to compensate, here is a patch showing what I mean.

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Jean-Marc Lasgouttes
Michael == Michael Gerz [EMAIL PROTECTED] writes: And acceptChanges would be more understandable if named acceptAllChanges. Michael What the semantic difference between acceptChanges and Michael acceptAllChanges? If we All here, we have to add it Michael everywhere (which means that we can

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Jean-Marc Lasgouttes
Jean-Marc == Jean-Marc Lasgouttes [EMAIL PROTECTED] writes: Michael == Michael Gerz [EMAIL PROTECTED] writes: Michael In other words, you want me to introduce some Michael enum AcceptReject { ACCEPT, REJECT } Michael and pass it as parameter, right? Jean-Marc I am sorry that I did not answer

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Michael Gerz
Jean-Marc Lasgouttes schrieb: I am sorry that I did not answer in time. To try to compensate, here is a patch showing what I mean. The idea is to use the complete symmetry between accept and reject: - accept: remove DELETED chunks, keep INSERTED chunks - reject: remove INSERTED chunks, keep

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Jean-Marc Lasgouttes
> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: Michael> In other words, you want me to introduce some Michael> enum AcceptReject { ACCEPT, REJECT } Michael> and pass it as parameter, right? I am sorry that I did not answer in time. To try to compensate, here is a patch showing

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Jean-Marc Lasgouttes
> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: >> And acceptChanges would be more understandable if named >> acceptAllChanges. >> Michael> What the semantic difference between acceptChanges and Michael> acceptAllChanges? If we "All" here, we have to add it Michael> everywhere (which

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Jean-Marc Lasgouttes
> "Jean-Marc" == Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: > "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: Michael> In other words, you want me to introduce some Michael> enum AcceptReject { ACCEPT, REJECT } Michael> and pass it as parameter, right? Jean-Marc> I am sorry

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-26 Thread Michael Gerz
Jean-Marc Lasgouttes schrieb: I am sorry that I did not answer in time. To try to compensate, here is a patch showing what I mean. The idea is to use the complete symmetry between accept and reject: - accept: remove DELETED chunks, keep INSERTED chunks - reject: remove INSERTED chunks, keep

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-24 Thread Abdelrazak Younes
Michael Gerz wrote: Hi, this patch should fix most problems related to accept/reject-change. I tested it briefly (given the limited time resources). I don't understand where InsetText::acceptChanges() and InsetText::rejectChanges() are used. I only see that LyXText::acceptOrRejectChange()

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-24 Thread Michael Gerz
Jean-Marc Lasgouttes schrieb: * src/lyxtext.h: * src/BufferView.C: * src/text3.C: * src/text.C: merge methods acceptChange() and rejectChange() to acceptOrRejectChange() because they share a lot of tricky code I think you could have kept acceptChange and rejectChanges as trivial

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-24 Thread Michael Gerz
Abdelrazak Younes schrieb: Michael Gerz wrote: Hi, this patch should fix most problems related to accept/reject-change. I tested it briefly (given the limited time resources). I don't understand where InsetText::acceptChanges() and InsetText::rejectChanges() are used. I only see that

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-24 Thread Abdelrazak Younes
Michael Gerz wrote: Hi, this patch should fix most problems related to accept/reject-change. I tested it briefly (given the limited time resources). I don't understand where InsetText::acceptChanges() and InsetText::rejectChanges() are used. I only see that LyXText::acceptOrRejectChange()

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-24 Thread Michael Gerz
Jean-Marc Lasgouttes schrieb: * src/lyxtext.h: * src/BufferView.C: * src/text3.C: * src/text.C: merge methods acceptChange() and rejectChange() to acceptOrRejectChange() because they share a lot of tricky code I think you could have kept acceptChange and rejectChanges as trivial

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-24 Thread Michael Gerz
Abdelrazak Younes schrieb: Michael Gerz wrote: Hi, this patch should fix most problems related to accept/reject-change. I tested it briefly (given the limited time resources). I don't understand where InsetText::acceptChanges() and InsetText::rejectChanges() are used. I only see that

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-23 Thread Michael Gerz
Hi, this patch should fix most problems related to accept/reject-change. I tested it briefly (given the limited time resources). Remaining items on my agenda: - invoke DEPM after accept/reject-change (high prio, take 1 evening) - implement accept/reject-all-changes as an atomic operation

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-23 Thread Jean-Marc Lasgouttes
Michael == Michael Gerz [EMAIL PROTECTED] writes: * src/lyxtext.h: * src/BufferView.C: * src/text3.C: * src/text.C: merge methods acceptChange() and rejectChange() to acceptOrRejectChange() because they share a lot of tricky code I think you could have kept acceptChange and rejectChanges

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-23 Thread Michael Gerz
Hi, this patch should fix most problems related to accept/reject-change. I tested it briefly (given the limited time resources). Remaining items on my agenda: - invoke DEPM after accept/reject-change (high prio, take 1 evening) - implement accept/reject-all-changes as an atomic operation

Re: [Cvslog] r16830 - in /lyx-devel/trunk/src: BufferView.C insets/ins...

2007-01-23 Thread Jean-Marc Lasgouttes
> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: >> * src/lyxtext.h: >> * src/BufferView.C: * src/text3.C: * src/text.C: merge methods >> acceptChange() and rejectChange() to acceptOrRejectChange() because >> they share a lot of tricky code I think you could have kept acceptChange