Hi djay,
the strategy of merge jcome/single_window into your branch or ask jcome to
rebase his branch onto master is not the right way, I think.
The right way would be to redo jcome/single_window branch onto master by
doing cherry picks of it. You can do that without need to ask to jcome.
Meanwhile if there is any conflict, fix it ammending the commit or adding
extra commits to your branch.
Once you have jcome's branch up to date to master on your repo, you can
unify his strategy with your fixes for menus, so they can join.
IIRC, the single_window strategy was this (Yu, please correct me if I'm
wrong):
1) Turn Toolbox into a panel and make canvas the main window.
2) Make canvas window a tabbed document holder.
2) Dock everything around canvas window (toolbox panel and the other
panels)
Cheers!
2013/9/27 d/j/a/y is free <[email protected]>
> Le 27/09/2013 Carlos a écrit :
> > merge jcome's....
> > https://github.com/jcome/synfig/commits/single_window
> >
> Humm look like it will not be strait to merge.... (ui infos for example)
> I have done a quick look in thge code and detected some outdated duck
> strings, and others little 'problem' (strings without localization
> _("....") )
>
> I agree with you carlos and konstantin, it's not a good idea to work on
> same feature in two branchs... that's was the sense of my first message
> about toolbox conversion. Did i was too quick to implement ? ;-)
>
> Yu, do you think to follow your work on single_branch ?
> Even if not, can you update single_window branch with last master ?
>
> --
> [##___l'urgent est remis a demain, l'impossible est en cours...___##]
>
>
>
> ------------------------------------------------------------------------------
> October Webinars: Code for Performance
> Free Intel webinars can help you accelerate application performance.
> Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most
> from
> the latest Intel processors and coprocessors. See abstracts and register >
> http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
> _______________________________________________
> Synfig-devl mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/synfig-devl
>
--
Carlos
http://synfig.org
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
