Re: CVS lyx Document->Settings crash
On Sun, Aug 31, 2003 at 08:01:35PM +0100, John Levon spake thusly: > > On Sun, Aug 31, 2003 at 09:28:50PM +0300, Martin Vermeer wrote: > > > >like "Branch: YourBranchName" instead. > > > > That would be easy to do, but adds (a little) clutter. What say the others on this? > > You should add the label IMHO. > > regards > john OK, if nobody else objects big, I'll just do that. - Martin pgp0.pgp Description: PGP signature
Re: CVS lyx Document->Settings crash
On Sun, Aug 31, 2003 at 09:28:50PM +0300, Martin Vermeer wrote: > >like "Branch: YourBranchName" instead. > > That would be easy to do, but adds (a little) clutter. What say the others on this? You should add the label IMHO. regards john -- Khendon's Law: If the same point is made twice by the same person, the thread is over.
Re: CVS lyx Document->Settings crash
On Fri, Aug 29, 2003 at 08:48:20AM -0700, Kayvan A. Sylvan spake thusly: > > Thanks, Martin. The patch works. > > I'm liking the "branches" idea. With lyx-xforms: > > 1) There should be more visual feedback. Right now a branch shows up with >a generic "Label" inside a gray box. It should probably show something >like "Branch: YourBranchName" instead. That would be easy to do, but adds (a little) clutter. What say the others on this? > 2) The branch background color does not seem to work. I go into the >Document->Settings, Branches tab, then I modify the background color >and Apply, and nothing changes. Weird. Unable to reproduce (xforms version). Could you give me a cookbook recipe for dummies? - Martin pgp0.pgp Description: PGP signature
Re: CVS lyx Document->Settings crash
Thanks, Martin. The patch works. I'm liking the "branches" idea. With lyx-xforms: 1) There should be more visual feedback. Right now a branch shows up with a generic "Label" inside a gray box. It should probably show something like "Branch: YourBranchName" instead. 2) The branch background color does not seem to work. I go into the Document->Settings, Branches tab, then I modify the background color and Apply, and nothing changes. -- Kayvan A. Sylvan | Proud husband of | Father to my kids: Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Re: CVS lyx Document->Settings crash
On Fri, Aug 29, 2003 at 09:47:15AM +0200, Lars Gullik Bjønnes spake thusly: > > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | Index: FormDocument.C > | === > | RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDocument.C,v > | retrieving revision 1.151 > | diff -u -p -r1.151 FormDocument.C > | --- FormDocument.C 23 Aug 2003 00:16:41 - 1.151 > | +++ FormDocument.C 29 Aug 2003 06:53:20 - > | @@ -1319,8 +1319,11 @@ void FormDocument::branch_update(BufferP > | fl_addto_browser(branch_->browser_all_branches, > vec[i].c_str()); > | } > | fl_select_browser_line(branch_->browser_all_branches, 1); > | - current_branch = > | - fl_get_browser_line(branch_->browser_all_branches, 1); > | + if (vec.size() > 0) > > Isn't this just > > if (!vec.empty()) > > -- > Lgb Yes, of course. I was too quick again :-) - Martin pgp0.pgp Description: PGP signature
Re: CVS lyx Document->Settings crash
Martin Vermeer <[EMAIL PROTECTED]> writes: | Index: FormDocument.C | === | RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDocument.C,v | retrieving revision 1.151 | diff -u -p -r1.151 FormDocument.C | --- FormDocument.C23 Aug 2003 00:16:41 - 1.151 | +++ FormDocument.C29 Aug 2003 06:53:20 - | @@ -1319,8 +1319,11 @@ void FormDocument::branch_update(BufferP | fl_addto_browser(branch_->browser_all_branches, vec[i].c_str()); | } | fl_select_browser_line(branch_->browser_all_branches, 1); | - current_branch = | - fl_get_browser_line(branch_->browser_all_branches, 1); | + if (vec.size() > 0) Isn't this just if (!vec.empty()) -- Lgb
Re: CVS lyx Document->Settings crash
On Fri, Aug 29, 2003 at 10:08:36AM +0300, Martin Vermeer spake thusly:
>
> > Latest CVS.
> >
> > 1) lyx somenewfile.lyx
> > 2) Document->Settings
> > 3) crash.
> >
> > Waiting for debug compile to finish so I can give a meaningful backtrace...
> >
> > This is lyx-xforms. Crash happens on Linux, Cygwin, Solaris.
> >
> > --
> > Kayvan A. Sylvan | Proud husband of | Father to my kids:
> > Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89)
> > http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
>
> No need to search. It is in BranchList::getColor(current_branch) in
> FormDocument.C when loading a document that has no branch(es) defined
> (and current_branch likely contains nonsense).
>
> Fix should be straightforward -- I'll look into it later if nobody
> beats me to it.
>
> - Martin
Fix attached. Please check in, I have an old tree.
- Martin
--
Martin Vermeer [EMAIL PROTECTED]
Helsinki University of Technology
Dept. of Surveying, Inst. of Geodesy
P.O. Box 1200, FIN-02015 HUT, Finland
:wq
Index: FormDocument.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDocument.C,v
retrieving revision 1.151
diff -u -p -r1.151 FormDocument.C
--- FormDocument.C 23 Aug 2003 00:16:41 - 1.151
+++ FormDocument.C 29 Aug 2003 06:53:20 -
@@ -1319,8 +1319,11 @@ void FormDocument::branch_update(BufferP
fl_addto_browser(branch_->browser_all_branches,
vec[i].c_str());
}
fl_select_browser_line(branch_->browser_all_branches, 1);
- current_branch =
- fl_get_browser_line(branch_->browser_all_branches, 1);
+ if (vec.size() > 0)
+ current_branch =
+ fl_get_browser_line(branch_->browser_all_branches, 1);
+ else
+ current_branch = "none";
}
// display proper selection...
@@ -1334,7 +1337,11 @@ void FormDocument::branch_update(BufferP
}
// display proper colour...
RGBColor rgb;
- string x11hexname = params.branchlist.getColor(current_branch);
+ string x11hexname;
+ if (current_branch == "none")
+ x11hexname = "none";
+ else
+ x11hexname = params.branchlist.getColor(current_branch);
if (x11hexname[0] == '#') {
rgb = RGBColor(x11hexname);
} else {
pgp0.pgp
Description: PGP signature
Re: CVS lyx Document->Settings crash
On Thu, Aug 28, 2003 at 09:01:38PM -0700, Kayvan A. Sylvan spake thusly: > Latest CVS. > > 1) lyx somenewfile.lyx > 2) Document->Settings > 3) crash. > > Waiting for debug compile to finish so I can give a meaningful backtrace... > > This is lyx-xforms. Crash happens on Linux, Cygwin, Solaris. > > -- > Kayvan A. Sylvan | Proud husband of | Father to my kids: > Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) > http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92) No need to search. It is in BranchList::getColor(current_branch) in FormDocument.C when loading a document that has no branch(es) defined (and current_branch likely contains nonsense). Fix should be straightforward -- I'll look into it later if nobody beats me to it. - Martin -- Martin Vermeer [EMAIL PROTECTED] Helsinki University of Technology Dept. of Surveying, Inst. of Geodesy P.O. Box 1200, FIN-02015 HUT, Finland :wq pgp0.pgp Description: PGP signature
