Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-29 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: Martin> Seems to work as advertised. Martin> Jean-Marc, can this be committed? Yes. JMarc

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 09:01:48PM +0200, Juergen Spitzmueller spake thusly: > > Martin Vermeer wrote: > > If this is verified to work, could you prepare a patch (including the > > validate -> newenvironment thing I suppose is needed)? I think it's a > > good idea. > > Here is the patch. It works

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Martin Vermeer wrote: > If this is verified to work, could you prepare a patch (including the > validate -> newenvironment thing I suppose is needed)? I think it's a > good idea. Here is the patch. It works as far as I can tell. Perhaps you test a little bit and apply if it's o.k. (I have too muc

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 03:33:35PM +0200, Juergen Spitzmueller spake thusly: > Jean-Marc Lasgouttes wrote: > > Juergen> No, it works very good. Juergen. > > > > I was not sure, because color (which is really a hack) has problems > > with nesting. I guess grfguide.dvi has some documentation on wha

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Jean-Marc Lasgouttes wrote: > Juergen> No, it works very good. Juergen. > > I was not sure, because color (which is really a hack) has problems > with nesting. I guess grfguide.dvi has some documentation on what > works and what does not. The only think that does not work are floats (floats inside

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Jean-Marc Lasgouttes
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: >> If wheat I propose does not work, then what about something like: >> \newenvironment{lyxbranchgrey}{\begin{color}color[gray]{0.8}}{\end{color}} Juergen> No, it works very good. Juergen. I was not sure, because color (which is

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Jean-Marc Lasgouttes wrote: > >> \newenvironment{lyxbranchgrey}{\color[gray]{0.8}}{} Ah, sorry, I did not get it. Yes, you're right, this is indeed more sane than what we have now. > Juergen> I guess you mean > Juergen> \newenvironment{lyxbranchgrey}{\color[gray]{0.8}}{\normalcolor} > > Hmm, wou

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Jean-Marc Lasgouttes
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: Juergen> Jean-Marc Lasgouttes wrote: \color[gray]{0.8} Juergen> \normalcolor >> Sorry to chime in after the battle, but wouldn't it be more >> reasonable to define >> \newenvironment{lyxbranchgrey}{\color[gray]{0.8}}{} Juergen>

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Jean-Marc Lasgouttes wrote: > Juergen> \color[gray]{0.8} \normalcolor > > Sorry to chime in after the battle, but wouldn't it be more reasonable > to define > \newenvironment{lyxbranchgrey}{\color[gray]{0.8}}{} I guess you mean \newenvironment{lyxbranchgrey}{\color[gray]{0.8}}{\normalcolor} > an

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Jean-Marc Lasgouttes
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: Juergen> But the correct way is Juergen> \color[gray]{0.8} \normalcolor Sorry to chime in after the battle, but wouldn't it be more reasonable to define \newenvironment{lyxbranchgrey}{\color[gray]{0.8}}{} and then use \begin{l

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 10:58:46AM +0200, Juergen Spitzmueller spake thusly: > > Martin Vermeer wrote: > > But now I checked in the correct version. > > Call me pedantic, but you still have missed one important detail (have a > cloose look ;-). > > Juergen. The treacherous thing with this

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 10:58:46AM +0200, Juergen Spitzmueller spake thusly: > Martin Vermeer wrote: > > But now I checked in the correct version. > > Call me pedantic, but you still have missed one important detail (have a > cloose look ;-). > > Juergen. Oops. Try again. Martin pgp00

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Martin Vermeer wrote: > which you must admit looks cleaner than the '|'-separated strings! Indeed. And the inset is much more extensible now... > Also a \color line is already foreseen :-) ...e.g. with this ;-) But I's say let's push this in first. Juergen.

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Martin Vermeer wrote: > But now I checked in the correct version. Call me pedantic, but you still have missed one important detail (have a cloose look ;-). Juergen. Index: src/insets/insetnote.C === RCS file: /usr/local/lyx/cvsr

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 10:13:00AM +0300, Martin Vermeer spake thusly: ... > > BTW, did you see my latest corrections on the document dialog/branches tab, > > which disables some buttons when the browsers are empty? > > http://www.mail-archive.com/[EMAIL PROTECTED]/msg59332.html > > Yes, those

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 10:19:42AM +0200, Juergen Spitzmueller spake thusly: > > Martin Vermeer wrote: > > Huh? I believed Angus already checked this in. > [...] > > Those newly married men... > > Angus is innocent. He applied your fix, but the fix is wrong. > http://www.lyx.org/cgi-bin/viewcvs.

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Huh? I believed Angus already checked this in. [...] > Those newly married men... Angus is innocent. He applied your fix, but the fix is wrong. http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/insets/insetnote.C?r1=1.28&r2=1.29 You changed from \textcolor[gray]{0.8}{

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 09:39:38AM +0200, Juergen Spitzmueller spake thusly: > Martin Vermeer wrote: > > Yes, those are the ones I have in my local copy (good work!). I > > simplified FormDocument a little further after that still: replaced > > all_branches_ etc. by a class instantiation branchli

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-28 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Yes, those are the ones I have in my local copy (good work!). I > simplified FormDocument a little further after that still: replaced > all_branches_ etc. by a class instantiation branchlist_. Attached. Good work. From my point of view, this could go in. Juergen. P.S.: can

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Martin Vermeer
On Mon, Jul 28, 2003 at 08:19:55AM +0200, Juergen Spitzmueller spake thusly: > Martin Vermeer wrote: > > > - The "available" browser should be on the left. > > > > ...contrary to the FormCitation practice. > > which is a ui bug IMO (the citation layout), at least wrt left-to-right > reading cul

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Juergen Spitzmueller
Martin Vermeer wrote: > > - The "available" browser should be on the left. > > ...contrary to the FormCitation practice. which is a ui bug IMO (the citation layout), at least wrt left-to-right reading cultures. > > - The buttons are too small ("Add" is "Hinzufügen" in german). > > ...and then th

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Martin Vermeer
On Sun, Jul 27, 2003 at 10:16:46PM +0200, Lars Gullik Bjønnes spake thusly: > > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | Yes... that your InsetOld patch necessitated changes to my Branches > | patch, nothing more. > | > | This Branches patch (biggish) is all I have pending here now, agai

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | Yes... that your InsetOld patch necessitated changes to my Branches | patch, nothing more. | | This Branches patch (biggish) is all I have pending here now, against | cvs of this afternoon. Ok, but let's wait with the brances patch until we get how fr

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Martin Vermeer
On Sun, Jul 27, 2003 at 09:47:53PM +0200, Lars Gullik Bjønnes spake thusly: > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | On Sun, Jul 27, 2003 at 08:50:58PM +0200, Lars Gullik Bjønnes spake thusly: > | > > | > Martin Vermeer <[EMAIL PROTECTED]> writes: > | > > | > | (This contains the pa

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | On Sun, Jul 27, 2003 at 08:50:58PM +0200, Lars Gullik Bjønnes spake thusly: | > | > Martin Vermeer <[EMAIL PROTECTED]> writes: | > | > | (This contains the patch. I'll separate it out if you | > | prefer.) | > | > | > I'd like fixes in a separate p

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Martin Vermeer
On Sun, Jul 27, 2003 at 08:50:58PM +0200, Lars Gullik Bjønnes spake thusly: > > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | (This contains the patch. I'll separate it out if you > | prefer.) > > > I'd like fixes in a separate patch. > > memory and InsetOld fixes. > > -- > Lgb h

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | (This contains the patch. I'll separate it out if you | prefer.) I'd like fixes in a separate patch. memory and InsetOld fixes. -- Lgb

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-27 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 04:26:57PM +0200, Juergen Spitzmueller spake thusly: ... > Almost perfect :-) > A few nitpicks though: > - The color choice should be removed completely. > - The "available" browser should be on the left. ...contrary to the FormCitation practice. > - The remove branch bu

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-23 Thread Juergen Spitzmueller
Juergen Spitzmueller wrote: > The modified files are attached. Please use the attached updated files. It handles enabling/disabling and prevents a crash if the browsers are empty. Sorry, Juergen BTW: Multi selection browsers are possible in xforms with FL_MULTI_BROWSER, but I don't know if thi

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-23 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 11:03:54AM +0200, Juergen Spitzmueller spake thusly: > > Martin Vermeer wrote: ... > > > Much better. The only missing thing in the browser is the ability to > > > select an item in the "selected" browser. This is important if you want > > > to delete a specific item from

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Juergen Spitzmueller
Martin Vermeer wrote: > > That should be: > > if (!color.empty() && color != "none") > > -- > > Angus > > Good observation, thanks. But does it affect the buggy behaviour? No. I will have a look later (real work is calling). Juergen.

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Angus Leeming
On Wednesday 23 July 2003 10:43 am, Martin Vermeer wrote: > On Wed, Jul 23, 2003 at 11:16:45AM +, Angus Leeming spake thusly: > > Martin Vermeer wrote: > > > if (color != "none" && color != string()) > > > > That should be: > > if (!color.empty() && color != "none") > > -- > > Angus

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 11:16:45AM +, Angus Leeming spake thusly: > > Martin Vermeer wrote: > > if (color != "none" && color != string()) > > That should be: > if (!color.empty() && color != "none") > -- > Angus Good observation, thanks. But does it affect the buggy behaviour?

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Angus Leeming
Martin Vermeer wrote: > if (color != "none" && color != string()) That should be: if (!color.empty() && color != "none") -- Angus

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 11:51:50AM +0200, Juergen Spitzmueller spake thusly: > Martin Vermeer wrote: > > How do your saved .lyx files look? Is there a string like > > > > \branch_colors blue|red|none|magenta|none > > Yes. The color (in the color combo) is also correct after reopening a saved > f

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Juergen Spitzmueller
Martin Vermeer wrote: > How do your saved .lyx files look? Is there a string like > > \branch_colors blue|red|none|magenta|none Yes. The color (in the color combo) is also correct after reopening a saved file. There's just nothing visible on screen. Juergen.

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 10:51:16AM +0200, Juergen Spitzmueller spake thusly: > Am Mittwoch, 23. Juli 2003 11:03 schrieb Martin Vermeer: > > But can you produce your own now? > > No. > > Juergen How do your saved .lyx files look? Is there a string like \branch_colors blue|red|none|magenta|none

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-23 Thread Juergen Spitzmueller
Martin Vermeer wrote: > > Much better. The only missing thing in the browser is the ability to > > select an item in the "selected" browser. This is important if you want > > to delete a specific item from that browser. "Deselect" seems to remove > > the last added item? > > No, the 'current branch

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Juergen Spitzmueller
Am Mittwoch, 23. Juli 2003 11:03 schrieb Martin Vermeer: > But can you produce your own now? No. Juergen

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 10:13:45AM +0200, Juergen Spitzmueller spake thusly: > > Martin Vermeer wrote: > > Try to load the attached, containing a number of coloured branch > > insets. > > Thanks, I see it now. > Juergen. But can you produce your own now? Martin pgp0.pgp Description: PGP

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Be careful though with character colours. They are supposed to be > outputtable to LaTeX. (But with validating/requiring the appropriate > preamble stmts even that could be doable.) \usepackage{color} \definecolor{mycolor}{rgb}{14,245,78} should just work. Juergen.

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-23 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 10:20:38AM +0200, Jürgen Spitzmüller spake thusly: > Martin Vermeer wrote: > > The latest version attached. > > > > Improvements: > > - branch menu item greyed out when no branches defined > > - 'two browser' style branchlist panel, with select/deselect buttons > > - some

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Martin Vermeer
On Wed, Jul 23, 2003 at 09:03:49AM +0200, Juergen Spitzmueller spake thusly: > Angus Leeming wrote: > > You are restricting users to some subset of available colours chosen > > by you. (The choice widget in the dialog.) > > Exactly. At least the framework should be there, else we are restricted

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-23 Thread Jürgen Spitzmüller
Martin Vermeer wrote: > The latest version attached. > > Improvements: > - branch menu item greyed out when no branches defined > - 'two browser' style branchlist panel, with select/deselect buttons > - some small bugs fixed, such as ability to have two same name > branches Much better. The only

Re: Patch [Re: BranchList class for comment]

2003-07-23 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Try to load the attached, containing a number of coloured branch > insets. Thanks, I see it now. Juergen.

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Juergen Spitzmueller
Angus Leeming wrote: > You are restricting users to some subset of available colours chosen > by you. (The choice widget in the dialog.) Exactly. At least the framework should be there, else we are restricted with the qt frontend too, and that would be a pity. > I wonder if I could create > a c

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Martin Vermeer
On Tue, Jul 22, 2003 at 03:33:15PM +0200, Juergen Spitzmueller spake thusly: ... > > > - what is color supposed to do? I cannot see any color on screen or dvi. > > > > Save and reload. Or create a new branch inset. Unfortunately I haven't > > managed to make it so that the colour of a pre-existin

Re: Patch [Re: BranchList class for comment^Wtesting]

2003-07-22 Thread Martin Vermeer
The latest version attached. Improvements: - branch menu item greyed out when no branches defined - 'two browser' style branchlist panel, with select/deselect buttons - some small bugs fixed, such as ability to have two same name branches 2003-07-23 Martin Vermeer <[EMAIL PROTECTED]>

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Angus Leeming
Martin Vermeer wrote: >> Maybe. Or maybe the dialog will simply inform the user that this >> newly defined branch will be presented in colour "branch5". If they >> aren't happy with the physical appearance, then they'll pop along >> to the preferences dialog and modify it. > > No, I don't like thi

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Eh, why would you want to nest branches? Now, nesting notes in > branches vv. etc. must work right, and I had to work to make it so. Don't know. Well, maybe I do. Imagine the doc team wants to use branches for different frontend description and the differnences betwenn qt/

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Martin Vermeer
On Tue, Jul 22, 2003 at 01:46:26PM +0100, Angus Leeming spake thusly: > > Martin Vermeer wrote: > > > On Tue, Jul 22, 2003 at 12:24:41PM +0100, Angus Leeming spake > > thusly: > > > >> Martin Vermeer wrote: > >> > >> > > >> > Probably. Why not. But how to save the colour into the doc file? >

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Angus Leeming
Martin Vermeer wrote: > On Tue, Jul 22, 2003 at 12:24:41PM +0100, Angus Leeming spake > thusly: > >> Martin Vermeer wrote: >> >> > >> > Probably. Why not. But how to save the colour into the doc file? >> > Having the colours named has value. What If I extend the list of >> > available colours

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Martin Vermeer
On Tue, Jul 22, 2003 at 12:24:41PM +0100, Angus Leeming spake thusly: > Martin Vermeer wrote: > > > > > Probably. Why not. But how to save the colour into the doc file? > > Having the colours named has value. What If I extend the list of > > available colours to include more rgb.txt entries? No

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Angus Leeming
Martin Vermeer wrote: > > Probably. Why not. But how to save the colour into the doc file? > Having the colours named has value. What If I extend the list of > available colours to include more rgb.txt entries? Note also that > blue and red should probably go as they are too dark for background.

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Martin Vermeer
On Tue, Jul 22, 2003 at 12:07:13PM +0200, Juergen Spitzmueller spake thusly: > > Martin Vermeer wrote: ... > > If you did, I'd like to see the backtrace :-) > > below. The error is in branch_update() and happens if the BranchList is empty. Ah. Just those borderline cases that everybody forgets

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | On Tue, Jul 22, 2003 at 10:24:00AM +0200, Lars Gullik Bjønnes spake thusly: | | > | > I should have said: "What aobut 'it'?" | > | | > | Ah. 'it' counts the colours extracted from the arg string s. The | > | method should find the last colour name a

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Did you configure again (needed to regenerate the Makefiles which have > changed)? You should be able to get away with ./config.status before > make. (I'm not quite sure if you should start from autogen.sh) Yes (make distclean, autogen.sh etc.). No difference. > If you did

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Martin Vermeer
On Tue, Jul 22, 2003 at 10:24:00AM +0200, Lars Gullik Bjønnes spake thusly: > | > I should have said: "What aobut 'it'?" > | > | Ah. 'it' counts the colours extracted from the arg string s. The > | method should find the last colour name and break out of the loop > | before 'it' ever getting st

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | > I should have said: "What aobut 'it'?" | | Ah. 'it' counts the colours extracted from the arg string s. The | method should find the last colour name and break out of the loop | before 'it' ever getting stepped (it++) to the past-the-end value | (As

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Martin Vermeer
On Tue, Jul 22, 2003 at 12:35:15AM +0200, Lars Gullik Bjønnes spake thusly: > Martin Vermeer <[EMAIL PROTECTED]> writes: ... > | > What about it? > | > | That's why. Is there a niftier/clearer way? > > I should have said: "What aobut 'it'?" Ah. 'it' counts the colours extracted from the arg

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Martin Vermeer
On Tue, Jul 22, 2003 at 09:35:07AM +0200, Juergen Spitzmueller spake thusly: > Martin Vermeer wrote: > > Ah, sorry. Attached. > > It did not compile: > > BranchList.C:15: error: `vector' not declared > > Removing "using std::vector;" from Branch.C (15) fixed compiling, but lyx > aborts

Re: Patch [Re: BranchList class for comment]

2003-07-22 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Ah, sorry. Attached. It did not compile: BranchList.C:15: error: `vector' not declared Removing "using std::vector;" from Branch.C (15) fixed compiling, but lyx aborts as soon as I try to open the document dialog: Program received signal SIGABRT, Aborted

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | > | + Branch br; | > | > this too? | | Yes. Move them into the loop then. | > | + for (;;) { | > | > A bit too C-like to me. I prefere while (true), matter of taste I | > guess. | | I had a while there earlier... a wrong one tho :-) w

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Martin Vermeer
On Mon, Jul 21, 2003 at 09:58:28PM +0200, Juergen Spitzmueller spake thusly: > > Juergen Spitzmueller wrote: > > > Someone not me should try this out. > > > > I'll have a go during the next days. > > ControlBranch.[Ch] is missing in the patch. Can you send me those files > separately please? >

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Juergen Spitzmueller
Juergen Spitzmueller wrote: > > Someone not me should try this out. > > I'll have a go during the next days. ControlBranch.[Ch] is missing in the patch. Can you send me those files separately please? Thanks, Juergen.

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Juergen Spitzmueller
Martin Vermeer wrote: > Someone not me should try this out. I'll have a go during the next days. Juergen

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Martin Vermeer
On Mon, Jul 21, 2003 at 06:19:12PM +0200, Lars Gullik Bjønnes spake thusly: > > Angus Leeming <[EMAIL PROTECTED]> writes: > > | This is going to bomb unless you add a return statement > | +void BranchList::setColor(string const & s, string const & val) > | +{ > | + List::iterator it = list.

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Lars Gullik Bjønnes
Angus Leeming <[EMAIL PROTECTED]> writes: | This is going to bomb unless you add a return statement | +void BranchList::setColor(string const & s, string const & val) | +{ | + List::iterator it = list.begin(); | + List::iterator end = list.end(); | + for (; it != end; it++) { Us

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Martin Vermeer
On Mon, Jul 21, 2003 at 03:45:47PM +, Angus Leeming spake thusly: ... > There's a long lead time in getting new stuff into the source tree isn't > there? The code is looking pretty good though... The problem is my 'intermittent' internet access, being at the cottage for a week or so and on

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Angus Leeming
Martin Vermeer wrote: > No, I don't agree with you here. No Assert, no npos problem. I really > want to traverse all branches and set/clear only those in s. Good. I was just askin'. >> Here you should move the (j == string::npos) test to immediately after >> the j = s.find_first_of line, else th

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Martin Vermeer
On Mon, Jul 21, 2003 at 02:48:47PM +, Angus Leeming spake thusly: > Martin Vermeer wrote: > > > On Mon, Jul 21, 2003 at 12:03:13PM +, Angus Leeming spake thusly: ... > This is going to bomb unless you add a return statement > +void BranchList::setColor(string const & s, string const &

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Angus Leeming
Martin Vermeer wrote: > On Mon, Jul 21, 2003 at 12:03:13PM +, Angus Leeming spake thusly: > > ... > >> > > If not you should have a 'break' in >> > > there. Your Assert isn't doing much at the moment ;-) >> > >> > It should catch the 'branch not existing' condition and return an >> > empty s

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Alfredo Braunstein
Martin Vermeer wrote: +void BranchList::setColor(string const & s, string const & val) +{ + List::iterator it = list.begin(); + List::iterator end = list.end(); + for (; it != end; it++) { + if (s.find(it->getBranch(), 0) != string::npos) { + i

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Martin Vermeer
On Mon, Jul 21, 2003 at 12:03:13PM +, Angus Leeming spake thusly: ... > > > If not you should have a 'break' in > > > there. Your Assert isn't doing much at the moment ;-) > > > > It should catch the 'branch not existing' condition and return an > > empty string. I believe Assert(false) will

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Alfredo Braunstein
Angus Leeming wrote: > If 's' can't belong to multiple branches, then once you > s.find(it->getBranch(), 0) != string::npos > and set the color, there's no need to continue the loop. So, break. As you probably want to avoid the Assert, use return instead of break... > Well and good. Nonetheless,

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Angus Leeming
On Monday 21 July 2003 11:14 am, Martin Vermeer wrote: > > Can 's' belong to multiple branches? > > No. > > > If not you should have a 'break' in > > there. Your Assert isn't doing much at the moment ;-) > > It should catch the 'branch not existing' condition and return an > empty string. I believe

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Martin Vermeer
On Mon, Jul 21, 2003 at 10:42:53AM +, Angus Leeming spake thusly: > > Martin Vermeer wrote: > > Does this look ready to go in? ... > You mean 'Assert(false)' here I think. Yes... assert always. > +string BranchList::getColor(string const & s) const > ... > + Assert(true); > +

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Angus Leeming
Martin Vermeer wrote: > Does this look ready to go in? Don't use +/* This file is part of + * == + * + * LyX, The Document Processor + * + * Copyright 1995 Matthias Ettrich + * Copyright 1995-2001 The LyX Team. + *

Re: Patch [Re: BranchList class for comment]

2003-07-21 Thread Martin Vermeer
On Wed, Jul 16, 2003 at 02:04:11AM +0200, Lars Gullik Bjønnes spake thusly: > > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | As I will be off to the country again tomorrow, someone else may check > | this in if it can go like this. Otherwise until next week :-) > > I'd like next week then.

Re: BranchList class for comment

2003-07-16 Thread Michael Schmitt
Attached a screenshot from the branch list editor I am building, with a separate branches tab. Lars, was this about what you had in mind? Not yet working, but getting there The current dialog makes it difficult to get an overview of all currently selected branches. You have to browse through

Re: BranchList class for comment

2003-07-16 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | On Wed, Jul 16, 2003 at 02:02:54AM +0200, Lars Gullik Bjønnes spake thusly: | > | > Martin Vermeer <[EMAIL PROTECTED]> writes: | > | > | Attached a screenshot from the branch list editor I am building, with | > | a separate branches tab. Lars, was thi

Re: BranchList class for comment

2003-07-15 Thread Martin Vermeer
On Wed, Jul 16, 2003 at 02:02:54AM +0200, Lars Gullik Bjønnes spake thusly: > > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | Attached a screenshot from the branch list editor I am building, with > | a separate branches tab. Lars, was this about what you had in mind? > | > | Not yet working,

Re: Patch [Re: BranchList class for comment]

2003-07-15 Thread Andre Poenitz
On Wed, Jul 16, 2003 at 10:12:26AM +0300, Martin Vermeer wrote: > I *had* a vector there... but the remove_if seemed to require a list > (is that correct? gcc 2.95.2.) Grr. Yes. list::remove_if uses a list, the 'global' one not. Sorry for confusing you. > > Likewise the global helper 'class match

Re: Patch [Re: BranchList class for comment]

2003-07-15 Thread Martin Vermeer
On Wed, Jul 16, 2003 at 08:15:53AM +0200, Andre Poenitz spake thusly: > On Wed, Jul 16, 2003 at 02:04:11AM +0200, Lars Gullik Bjxnnes wrote: > > Martin Vermeer <[EMAIL PROTECTED]> writes: > > > > | As I will be off to the country again tomorrow, someone else may check > > | this in if it can go

Re: Patch [Re: BranchList class for comment]

2003-07-15 Thread Andre Poenitz
On Wed, Jul 16, 2003 at 02:04:11AM +0200, Lars Gullik Bjønnes wrote: > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | As I will be off to the country again tomorrow, someone else may check > | this in if it can go like this. Otherwise until next week :-) > > I'd like next week then. Just so th

Re: BranchList class for comment

2003-07-15 Thread Juergen Spitzmueller
Lars Gullik Bjønnes wrote: > | Not yet working, but getting there :-) > > yes, getting there... > > I wonder ... could this be one of those dialogs that could benefit > from a > > --- --- > | | | | > | | add-> | | > | | <-remove|

Re: BranchList class for comment

2003-07-15 Thread John Levon
On Wed, Jul 16, 2003 at 02:02:54AM +0200, Lars Gullik Bj?nnes wrote: > I wonder ... could this be one of those dialogs that could benefit > from a > > --- --- > | | | | > | | add-> | | > | | <-remove| | > | |

Re: Patch [Re: BranchList class for comment]

2003-07-15 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | As I will be off to the country again tomorrow, someone else may check | this in if it can go like this. Otherwise until next week :-) I'd like next week then. Just so that we can decide a bit on further refinements and requirements before we add the

Re: BranchList class for comment

2003-07-15 Thread Lars Gullik Bjønnes
Martin Vermeer <[EMAIL PROTECTED]> writes: | Attached a screenshot from the branch list editor I am building, with | a separate branches tab. Lars, was this about what you had in mind? | | Not yet working, but getting there :-) yes, getting there... I wonder ... could this be one of those dial

Patch [Re: BranchList class for comment]

2003-07-15 Thread Martin Vermeer
On Tue, Jul 15, 2003 at 08:05:15PM +0300, Martin Vermeer spake thusly: > > Attached a screenshot from the branch list editor I am building, with > a separate branches tab. Lars, was this about what you had in mind? > > Not yet working, but getting there :-) > > Martin Here is the 'branch' code

Re: BranchList class for comment

2003-07-15 Thread Martin Vermeer
Attached a screenshot from the branch list editor I am building, with a separate branches tab. Lars, was this about what you had in mind? Not yet working, but getting there :-) Martin <> pgp0.pgp Description: PGP signature

Re: BranchList class for comment

2003-07-15 Thread Andre Poenitz
On Tue, Jul 15, 2003 at 03:48:41PM +0300, Martin Vermeer wrote: > using std::vector; > using std::bind2nd; > using std::remove_if; You want list::remove_if, not the general one. > void BranchList::remove(string const & s) > { > remove_if(list.begin(), list.end(), bind2nd(pfn(), s)); > } v

Re: BranchList class for comment

2003-07-15 Thread Martin Vermeer
On Tue, Jul 15, 2003 at 09:18:47AM +0200, Andre Poenitz spake thusly: ... > Theoretically, I'd expect this to be undefined behaviour as 'it' is > invalid after its 'pointee' is erased. > > Practically, there is a std::list<>::remove_if(Pred) somewhere. > > Andre' Thanks! Ok, see attached, whi

Re: BranchList class for comment

2003-07-15 Thread Lars Gullik Bjønnes
Andre Poenitz <[EMAIL PROTECTED]> writes: | On Mon, Jul 14, 2003 at 10:05:51PM +0300, Martin Vermeer wrote: | > void BranchList::remove(string const & s) | > { | > List::iterator it = list.begin(); | > List::iterator end = list.end(); | > for (; it != end; it++) { | > if (i

Re: BranchList class for comment

2003-07-15 Thread Andre Poenitz
On Mon, Jul 14, 2003 at 10:05:51PM +0300, Martin Vermeer wrote: > void BranchList::remove(string const & s) > { > List::iterator it = list.begin(); > List::iterator end = list.end(); > for (; it != end; it++) { > if (it->getBranch() == s) list.erase(it); > } >