> On 2009-03-31 14:46:54.075050, Carlos López González wrote: > > /synfig-studio/trunk/src/synfigapp/actions/colorset.cpp, line 53 > > <http://patches.synfig.org/r/17/diff/2/?file=93#file93line53> > > > > I obtain a rejection when applying the patch. The rejected file output > > looks like this: > > *************** > > *** 50,72 **** > > > > /* === M A C R O S > > ========================================================= */ > > > > - ACTION_INIT(Action::ColorSetFromFG); > > - ACTION_SET_NAME(Action::ColorSetFromFG, "ColorSetFromFG"); > > - ACTION_SET_LOCAL_NAME(Action::ColorSetFromFG, N_("Apply Foreground > > Color")); > > - ACTION_SET_TASK(Action::ColorSetFromFG, "set"); > > - ACTION_SET_CATEGORY(Action::ColorSetFromFG, > > Action::CATEGORY_VALUEDESC); > > - ACTION_SET_PRIORITY(Action::ColorSetFromFG, 0); > > - ACTION_SET_VERSION(Action::ColorSetFromFG, "0.0"); > > - ACTION_SET_CVS_ID(Action::ColorSetFromFG, "$Id$"); > > > > - ACTION_INIT(Action::ColorSetFromBG); > > - ACTION_SET_NAME(Action::ColorSetFromBG, "ColorSetFromBG"); > > - ACTION_SET_LOCAL_NAME(Action::ColorSetFromBG, N_("Apply Background > > Color")); > > - ACTION_SET_TASK(Action::ColorSetFromBG, "set"); > > - ACTION_SET_CATEGORY(Action::ColorSetFromBG, > > Action::CATEGORY_VALUEDESC); > > - ACTION_SET_PRIORITY(Action::ColorSetFromBG, 0); > > - ACTION_SET_VERSION(Action::ColorSetFromBG, "0.0"); > > - ACTION_SET_CVS_ID(Action::ColorSetFromBG, "$Id$"); > > > > /* === G L O B A L S > > ======================================================= */ > > > > --- 50,72 ---- > > > > /* === M A C R O S > > ========================================================= */ > > > > + ACTION_INIT(Action::ColorSetFromOC); > > + ACTION_SET_NAME(Action::ColorSetFromOC, "ColorSetFromOC"); > > + ACTION_SET_LOCAL_NAME(Action::ColorSetFromOC, N_("Apply Outline > > Color")); > > + ACTION_SET_TASK(Action::ColorSetFromOC, "set"); > > + ACTION_SET_CATEGORY(Action::ColorSetFromOC, > > Action::CATEGORY_VALUEDESC); > > + ACTION_SET_PRIORITY(Action::ColorSetFromOC, 0); > > + ACTION_SET_VERSION(Action::ColorSetFromOC, "0.0"); > > + ACTION_SET_CVS_ID(Action::ColorSetFromOC, "$Id$"); > > > > + ACTION_INIT(Action::ColorSetFromFC); > > + ACTION_SET_NAME(Action::ColorSetFromFC, "ColorSetFromFC"); > > + ACTION_SET_LOCAL_NAME(Action::ColorSetFromFC, N_("Apply Fill Color")); > > + ACTION_SET_TASK(Action::ColorSetFromFC, "set"); > > + ACTION_SET_CATEGORY(Action::ColorSetFromFC, > > Action::CATEGORY_VALUEDESC); > > + ACTION_SET_PRIORITY(Action::ColorSetFromFC, 0); > > + ACTION_SET_VERSION(Action::ColorSetFromFC, "0.0"); > > + ACTION_SET_CVS_ID(Action::ColorSetFromFC, "$Id$"); > > > > /* === G L O B A L S > > ======================================================= */ > >
I downloaded the patch and in a fresh svn revision I did: car...@pcnuevo:~/Software/Synfig/synfig-studio$ patch -p0 < /home/carlos/Descargas/filloutline.patch patching file src/gtkmm/dialog_color.h patching file src/gtkmm/dialog_color.cpp patching file src/gtkmm/mod_palette/dock_paledit.cpp patching file src/gtkmm/state_bline.cpp patching file src/gtkmm/state_circle.cpp patching file src/gtkmm/state_draw.cpp patching file src/gtkmm/state_eyedrop.cpp patching file src/gtkmm/state_fill.cpp patching file src/gtkmm/state_polygon.cpp patching file src/gtkmm/state_rectangle.cpp patching file src/gtkmm/state_sketch.cpp patching file src/gtkmm/state_star.cpp patching file src/gtkmm/state_stroke.cpp patching file src/gtkmm/widget_defaults.h patching file src/gtkmm/widget_defaults.cpp patching file src/synfigapp/action.cpp patching file src/synfigapp/actions/colorset.h patching file src/synfigapp/actions/colorset.cpp Hunk #1 FAILED at 50. 1 out of 3 hunks FAILED -- saving rejects to file src/synfigapp/actions/colorset.cpp.rej patching file src/synfigapp/canvasinterface.cpp patching file src/synfigapp/inputdevice.h patching file src/synfigapp/inputdevice.cpp patching file src/synfigapp/main.h patching file src/synfigapp/main.cpp car...@pcnuevo:~/Software/Synfig/synfig-studio$ less src/synfigapp/actions/colorset.cpp.rej The colorset.cpp.rej is shown in the previous comment. - Carlos ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://patches.synfig.org/r/17/#review30 ----------------------------------------------------------- On 2009-03-30 16:04:40.100010, nikitakit wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://patches.synfig.org/r/17/ > ----------------------------------------------------------- > > (Updated 2009-03-30 16:04:40.100010) > > > Review request for Synfig. > > > Summary > ------- > > Suggestion 3 from the forum poll: Outline/Fill color system > * All new layers are shaded with the fill color (except Outlines, which are > shaded with the outline color) > * When an outline and region are created together, this behavior does not > change > * Gradients are in the direction fill->outline > * Counterclockwise curve gradients have the same behavior as regions > > > Diffs > ----- > > /synfig-studio/trunk/src/gtkmm/dialog_color.h 2355 > /synfig-studio/trunk/src/gtkmm/dialog_color.cpp 2355 > /synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_bline.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_circle.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_draw.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_fill.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_polygon.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_rectangle.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_sketch.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_star.cpp 2355 > /synfig-studio/trunk/src/gtkmm/state_stroke.cpp 2355 > /synfig-studio/trunk/src/gtkmm/widget_defaults.h 2355 > /synfig-studio/trunk/src/gtkmm/widget_defaults.cpp 2355 > /synfig-studio/trunk/src/synfigapp/action.cpp 2355 > /synfig-studio/trunk/src/synfigapp/actions/colorset.h 2355 > /synfig-studio/trunk/src/synfigapp/actions/colorset.cpp 2355 > /synfig-studio/trunk/src/synfigapp/canvasinterface.cpp 2355 > /synfig-studio/trunk/src/synfigapp/inputdevice.h 2355 > /synfig-studio/trunk/src/synfigapp/inputdevice.cpp 2355 > /synfig-studio/trunk/src/synfigapp/main.h 2355 > /synfig-studio/trunk/src/synfigapp/main.cpp 2355 > > Diff: http://patches.synfig.org/r/17/diff > > > Testing > ------- > > Compiles & runs. Everything seems to function properly. > > > Thanks, > > nikitakit > > ------------------------------------------------------------------------------ _______________________________________________ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
