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 button should not depend on the input field, but on the
> "All Branches" browser.
> - The tabfolder is a bit too small
> - The buttons are too small ("Add" is "Hinzufügen" in german).
...and then they say finnish words are long...
> I have done this (see screenshot). The modified files are attached.
>
> > Perhaps this could do with tooltips still, but I think it's
> > sufficiently intuitive this way now.
>
> Done (the tooltips).
Thanks! Dotting the i's and crossing the t's.
> > > > > Wrt to colours, ...
> > Agreed. That's what I did then. Colour disabled in the dialog, and
> > output of the \branch_color token to the .lyx file suppressed, so
> > we're not committed to any particular solution there yet.
>
> Good.
>
> > I think that thereby I have addressed all reported show stoppers.
>
> I couldn't find any either.
>
> > Can this be committed?
>
> No more complaints from the gui-side ;-)
>
> Regards,
> Juergen
>
> > Martin
Compiled, tested, looks perfect, works perfectly (on my test case).
Updated CVS, tried to compile again, fought with auto_ptr and <memory>
and IndexOld... and it runs again. As good as the first time :-)
Attached the patch. Lars, OK to commit?
(This contains the <memory> patch. I'll separate it out if you
prefer.)
2003-07-15 Martin Vermeer <[EMAIL PROTECTED]>
* lib/ui/stdmenus.ui:
* src/BranchList.[Ch]:
* src/LyXAction.C:
* src/Makefile.am:
* src/bufferparams.[Ch]:
* src/factory.C:
* src/lfuns.h:
* src/lyxfunc.C:
* src/text3.C:
* src/frontends/controllers/ControlBranch.[Ch]:
* src/frontends/controllers/Makefile.am:
* src/frontends/xforms/Dialogs.C:
* src/frontends/xforms/FormBranch.[Ch]:
* src/frontends/xforms/FormDocument.[Ch]:
* src/frontends/xforms/Makefile.am:
* src/frontends/xforms/forms/Makefile.am:
* src/frontends/xforms/forms/form_branch.fd:
* src/frontends/xforms/forms/form_document.fd:
* src/insets/Makefile.am:
* src/insets/inset.h:
* src/insets/insetbase.h:
* src/insets/insetbranch.[Ch]:
* src/insets/insetcollapsable.[Ch]: implements the 'branch inset'
idea. This allows the output of various versions of a document
from a single source version, selectively outputing or suppressing
output of parts of the text.
This implementation contains a 'branch list editor' in a separate
tab of the document settings dialog. Branches are user definable.
Martin
branch_k.diff.gz
Description: application/gunzip
pgp00000.pgp
Description: PGP signature
