From: Konstantin Dmitriev Date: Mon, 4 Oct 2010 11:58:27 +0000 (+0700) Subject: Merge commit 'origin/master' into zelgadis_master X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=commitdiff_plain;h=bb8e0ba8c1f78db22f6c8b8ce4e9b4f685749092;hp=0359346f781b070b6e24d3a65c57a504e4a6ddf8 Merge commit 'origin/master' into zelgadis_master --- diff --git a/synfig-core/src/synfig/canvas.cpp b/synfig-core/src/synfig/canvas.cpp index eeecdb0..417a1b5 100644 --- a/synfig-core/src/synfig/canvas.cpp +++ b/synfig-core/src/synfig/canvas.cpp @@ -774,7 +774,7 @@ Canvas::clone(const GUID& deriv_guid)const { synfig::String name; if(is_inline()) - name="inline"; + name=_("in line"); else { name=get_id()+"_CLONE"; @@ -839,7 +839,7 @@ Canvas::set_inline(LooseHandle parent) } - id_="inline"; + id_=_("in line"); is_inline_=true; parent_=parent; @@ -862,7 +862,7 @@ Canvas::create_inline(Handle parent) //if(parent->is_inline()) // return create_inline(parent->parent()); - Handle canvas(new Canvas("inline")); + Handle canvas(new Canvas(_("in line"))); canvas->set_inline(parent); return canvas; } diff --git a/synfig-core/src/synfig/valuenode_range.cpp b/synfig-core/src/synfig/valuenode_range.cpp index 2714d4e..4c62b02 100644 --- a/synfig-core/src/synfig/valuenode_range.cpp +++ b/synfig-core/src/synfig/valuenode_range.cpp @@ -202,11 +202,9 @@ synfig::ValueNode_Range::get_inverse(Time t, const synfig::Angle &target_value) switch (get_type()) { default: - // Notice that target_value is the rotation between the current - // 'link' value and the target angle in the canvas, so we need - // to add it to 'link' - if(Angle::rad(maximum).get()>=Angle::rad(link+target_value).get() && Angle::rad(link+target_value).get()>=Angle::rad(minimum).get()) - return link + target_value; + + if(Angle::rad(maximum).get()>=Angle::rad(target_value).get() && Angle::rad(target_value).get()>=Angle::rad(minimum).get()) + return target_value; else if (Angle::rad(minimum).get()>Angle::rad(target_value).get()) return minimum; else diff --git a/synfig-core/src/synfig/valuenode_scale.cpp b/synfig-core/src/synfig/valuenode_scale.cpp index b272d7d..4cfbb92 100644 --- a/synfig-core/src/synfig/valuenode_scale.cpp +++ b/synfig-core/src/synfig/valuenode_scale.cpp @@ -173,7 +173,7 @@ synfig::ValueNode_Scale::get_inverse(Time t, const synfig::Angle &target_value) switch (get_type()) { default: - return (*value_node)(t).get(Angle()) + target_value / scalar_value; + return target_value / scalar_value; } } return ValueBase(); diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am index 01e3c26..5711c72 100644 --- a/synfig-studio/images/Makefile.am +++ b/synfig-studio/images/Makefile.am @@ -13,17 +13,17 @@ EXTRA_DIST = \ splash_screen-0.61.08.sif \ splash_screen-0.61.07.sif \ about_icon.sif \ - angle_icon.sif \ + type_angle_icon.sif \ bline_icon.sif \ - blinepoint_icon.sif \ - bool_icon.sif \ + type_blinepoint_icon.sif \ + type_bool_icon.sif \ canvas_icon.sif \ - canvas_pointer_icon.sif \ + type_canvas_icon.sif \ children_icon.sif \ circle_icon.sif \ clear_redo_icon.sif \ clear_undo_icon.sif \ - color_icon.sif \ + type_color_icon.sif \ curves_icon.sif \ draw_icon.sif \ duplicate_icon.sif \ @@ -31,13 +31,14 @@ EXTRA_DIST = \ eyedrop_icon.sif \ fill_icon.sif \ gradient_icon.sif \ + type_gradient_icon.sif \ group_icon.sif \ info_icon.sif \ - integer_icon.sif \ + type_integer_icon.sif \ keyframe_icon.sif \ keyframe_lock_icon.sif \ layer_icon.sif \ - list_icon.sif \ + type_list_icon.sif \ logo.sif \ meta_data_icon.sif \ mirror_icon.sif \ @@ -45,25 +46,25 @@ EXTRA_DIST = \ normal_icon.sif \ pastecanvas_icon.sif \ polygon_icon.sif \ - real_icon.sif \ + type_real_icon.sif \ rectangle_icon.sif \ rotate_icon.sif \ saveall_icon.sif \ scale_icon.sif \ - segment_icon.sif \ + type_segment_icon.sif \ select_all_child_layers_icon.sif \ sif_icon.sif \ sketch_icon.sif \ smooth_move_icon.sif \ - string_icon.sif \ + type_string_icon.sif \ reset_colors_icon.sif \ swap_colors_icon.sif \ synfig_icon.sif \ synfig_icon.svg \ - time_icon.sif \ + type_time_icon.sif \ time_track_icon.sif \ valuenode_icon.sif \ - vector_icon.sif \ + type_vector_icon.sif \ wallpaper.sif \ width_icon.sif \ zoom_icon.sif \ @@ -148,7 +149,7 @@ IMAGES = \ installer_logo.$(EXT) \ installer_logo_osx.$(EXT) \ mirror_icon.$(EXT) \ - time_icon.$(EXT) \ + type_time_icon.$(EXT) \ time_track_icon.$(EXT) \ curves_icon.$(EXT) \ pastecanvas_icon.$(EXT) \ @@ -177,21 +178,21 @@ IMAGES = \ sif_icon.$(EXT) \ synfig_icon.$(EXT) \ saveall_icon.$(EXT) \ - bool_icon.$(EXT) \ - integer_icon.$(EXT) \ - angle_icon.$(EXT) \ - segment_icon.$(EXT) \ - blinepoint_icon.$(EXT) \ - list_icon.$(EXT) \ - canvas_pointer_icon.$(EXT) \ - string_icon.$(EXT) \ + type_bool_icon.$(EXT) \ + type_integer_icon.$(EXT) \ + type_angle_icon.$(EXT) \ + type_segment_icon.$(EXT) \ + type_blinepoint_icon.$(EXT) \ + type_list_icon.$(EXT) \ + type_canvas_icon.$(EXT) \ + type_string_icon.$(EXT) \ eyedrop_icon.$(EXT) \ about_icon.$(EXT) \ splash_screen.$(EXT) \ canvas_icon.$(EXT) \ - vector_icon.$(EXT) \ - real_icon.$(EXT) \ - color_icon.$(EXT) \ + type_vector_icon.$(EXT) \ + type_real_icon.$(EXT) \ + type_color_icon.$(EXT) \ valuenode_icon.$(EXT) \ polygon_icon.$(EXT) \ bline_icon.$(EXT) \ @@ -199,6 +200,7 @@ IMAGES = \ duplicate_icon.$(EXT) \ encapsulate_icon.$(EXT) \ gradient_icon.$(EXT) \ + type_gradient_icon.$(EXT) \ keyframe_lock_all.$(EXT) \ keyframe_lock_past.$(EXT) \ keyframe_lock_future.$(EXT) \ diff --git a/synfig-studio/images/angle_icon.sif b/synfig-studio/images/angle_icon.sif deleted file mode 100644 index 759cf09..0000000 --- a/synfig-studio/images/angle_icon.sif +++ /dev/null @@ -1,1008 +0,0 @@ - - - Synfig Studio Angle Icon - Placed in the Public Domain in 2009 by David Rylander (rylleman) - - - - - - - - - - - - - -0.1120000035 - 0.4799999893 - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 0.8799999952 - 0.6240000129 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1.8719999790 - -1.6319999695 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6480000019 - -1.4880000353 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.027421 - 0.129412 - 0.372549 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - -0.7360000014 - -1.6959999800 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.007782 - 0.062745 - 0.247059 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 1.6875000000 - -1.4687500000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1.6250000000 - -1.5000000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.9279999733 - 0.6560000181 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.007843 - 0.062745 - 0.247059 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 0.8799999952 - 0.6240000129 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1.8719999790 - -1.6319999695 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6480000019 - -1.4880000353 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.007843 - 0.062745 - 0.247059 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 0.1920000017 - 0.0320000015 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.8000000119 - -1.4720000029 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.007843 - 0.062745 - 0.247059 - 1.000000 - - - - - 1.5039999485 - 0.1120000035 - - - - - - - - - - - - - - - - - - - - - - - - 0.3073499501 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0.0000000134 - 0.3073499501 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0.3073499501 - -0.0000000269 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000037 - -0.3073499501 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/synfig-studio/images/blinepoint_icon.sif b/synfig-studio/images/blinepoint_icon.sif deleted file mode 100644 index badbf3a..0000000 --- a/synfig-studio/images/blinepoint_icon.sif +++ /dev/null @@ -1,66 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - BLINE -POINT - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - Arial - - - - - - - - - - - - - - - - 0.6250000000 - 1.2500000000 - - - - - 0.5000000000 - 0.5000000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - diff --git a/synfig-studio/images/bool_icon.sif b/synfig-studio/images/bool_icon.sif deleted file mode 100644 index 2f1a95e..0000000 --- a/synfig-studio/images/bool_icon.sif +++ /dev/null @@ -1,266 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - ON -OFF - - - - 0.531049 - 0.000000 - 0.000000 - 1.000000 - - - - Sans Serif - - - - - - - - - - - - - - - - 0.6250000000 - 0.7500000000 - - - - - 0.5000000000 - 0.5000000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - -0.000000 - 0.217638 - -0.000000 - 1.000000 - - - - - -1.2500000000 - 0.1250000000 - - - - - 1.3750000000 - 1.3750000000 - - - - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0.000000 - -0.000000 - -0.000000 - 1.000000 - - - - - -1.5000000000 - -0.1250000000 - - - - - 1.5000000000 - 0.1250000000 - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.1000000015 - -0.1000000015 - - - - - 0.1000000015 - 0.1000000015 - - - - - - - - - - - - - 0.0000000000 - 0.1250000000 - - - - - - - - - - - - - - - - - - diff --git a/synfig-studio/images/canvas_pointer_icon.sif b/synfig-studio/images/canvas_pointer_icon.sif deleted file mode 100644 index 99a4c06..0000000 --- a/synfig-studio/images/canvas_pointer_icon.sif +++ /dev/null @@ -1,193 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - - 0.985195 - 0.174900 - -0.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - -0.6000000238 - 0.2000000030 - - - - - 0.8000000119 - 0.2000000030 - - - - - 0.8000000119 - -0.2000000030 - - - - - 1.6000000238 - 0.6000000238 - - - - - 0.8000000119 - 1.3999999762 - - - - - 0.8000000119 - 1.0000000000 - - - - - -0.6000000238 - 1.0000000000 - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.0000000000 - -0.0000000000 - - - - - 0.3499999940 - 0.3499999940 - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - diff --git a/synfig-studio/images/circle_icon.sif b/synfig-studio/images/circle_icon.sif index fcfb2d5..314193b 100644 --- a/synfig-studio/images/circle_icon.sif +++ b/synfig-studio/images/circle_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Circle Icon - Placed in the Public Domain in 2007 by Chris Norman (pixelgeek) + Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome) - + - + @@ -18,89 +18,95 @@ - - - - 0.012910 - 0.012910 - 0.012910 - 1.000000 - - - 0.012910 - 0.012910 - 0.012910 - 0.731343 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - 0.1808688790 - -0.3216028810 - - - - - - - - - - - - - - + - -1.8803261518 - 2.0255250931 + 0.0000000000 + 0.0000000000 - - - 1.9384056330 - -1.9093658924 - + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.700000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.1364002228 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + - - - -2.7515196800 - -1.2269309759 - + + - - - 2.7515196800 - -1.2269309759 - + + - + @@ -118,172 +124,129 @@ 1.000000 - - - - - - - - + + 0.0000000000 - 0.0000000000 + 0.2596159875 - - + + - - - + - - + + - + - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - + + + + + + + 2.6559059620 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.6559059620 + -0.0000002322 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 0.0000000000 - 0.0000000000 - + + - - + + - - - - - - - + + - + - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - 1.6642030478 - -1.9762411118 - - - - - -0.6339452267 - 0.8150724769 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - - diff --git a/synfig-studio/images/color_icon.sif b/synfig-studio/images/color_icon.sif deleted file mode 100644 index d3883d9..0000000 --- a/synfig-studio/images/color_icon.sif +++ /dev/null @@ -1,391 +0,0 @@ - - - Synfig Studio Color Icon - - - ColorDisc - - - - 1.000000 - 0.000000 - 0.000000 - 1.000000 - - - 1.000000 - 1.000000 - 0.000000 - 1.000000 - - - 0.000000 - 1.000000 - 0.000000 - 1.000000 - - - 0.000000 - 1.000000 - 1.000000 - 1.000000 - - - 0.000000 - 0.000000 - 1.000000 - 1.000000 - - - 1.000000 - 0.000000 - 1.000000 - 1.000000 - - - 1.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - 0.2000000030 - 0.2000000030 - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - 0.0625000000 - 0.1093750000 - - - - - - - - - - - - - - - - - - - - - - 0.333252 - 0.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -0.1093750000 - -0.1406250000 - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - 0.1151999980 - 0.1151999980 - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.1000000015 - -0.1000000015 - - - - - 0.1000000015 - 0.1000000015 - - - - - - - - - - diff --git a/synfig-studio/images/gradient_icon.sif b/synfig-studio/images/gradient_icon.sif index 09c8956..f3bb405 100644 --- a/synfig-studio/images/gradient_icon.sif +++ b/synfig-studio/images/gradient_icon.sif @@ -4,18 +4,11 @@ Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome) - + - - - -1.7043024302 - 1.6898298264 - - - - + @@ -25,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - + - -1.5576940775 - -3.1153881550 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - + - 2.0769255161 - 2.0769255161 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -191,11 +146,11 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 - + @@ -216,14 +171,14 @@ - -1.8173098564 - -1.8173098564 + -2.5961599350 + 2.4484515190 - 1.8173098564 - 1.8173098564 + 2.5961599350 + -2.7376513481 @@ -233,7 +188,7 @@ - + @@ -241,80 +196,117 @@ - + - + - -1.6974871159 - 1.7141292095 + 0.0000000000 + 0.0000000000 - - - 1.7973393202 - -1.7640552521 - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + -2.5414354801 + 0.0909172446 + + + + + 2.5787625313 + 0.0909172446 + + + + + + 0.047366 + 0.047366 + 0.047366 + 1.000000 + + + 0.793110 + 0.793110 + 0.793110 + 1.000000 + + + + + + + + + + + - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - 0.893289 - 0.893289 - 0.893289 - 1.000000 - - + + - - + + - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - + @@ -335,7 +327,7 @@ 0.0000000000 - 0.0000000000 + -0.1014123783 @@ -354,13 +346,13 @@ - + - -1.6475610733 - 1.6142770052 + -2.5961599350 + -2.5961599350 @@ -370,22 +362,22 @@ - + - + - + - + @@ -398,8 +390,8 @@ - 1.6309189796 - -1.6309189796 + 2.5961599350 + -2.5961599350 @@ -409,12 +401,12 @@ - + - + @@ -424,86 +416,21 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.973842 - 1.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - -1.6475610733 - 1.6142770052 + 2.5961599350 + 2.5961599350 @@ -513,25 +440,25 @@ - + - + - + - + - + @@ -541,8 +468,8 @@ - 1.6309189796 - -1.6309189796 + -2.5961599350 + 2.5961599350 @@ -552,25 +479,25 @@ - + - + - + - + - + @@ -579,7 +506,7 @@ - + @@ -600,212 +527,6 @@ - - - - - - - - - - - - - 3.5780365467 - -3.5613946915 - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - -2.0532853603 - 2.0602900982 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 1.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -2.0532853603 - 2.0602900982 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.1595997959 - -0.1728997827 - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 1.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/synfig-studio/images/integer_icon.sif b/synfig-studio/images/integer_icon.sif deleted file mode 100644 index 48fe158..0000000 --- a/synfig-studio/images/integer_icon.sif +++ /dev/null @@ -1,66 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - 123 -456 - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - Sans Serif - - - - - - - - - - - - - - - - 1.2656250000 - 1.2968750000 - - - - - 0.5000000000 - 0.5000000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - diff --git a/synfig-studio/images/layer_distortion_curvewarp_icon.sif b/synfig-studio/images/layer_distortion_curvewarp_icon.sif index 22a0391..1efe6e7 100644 --- a/synfig-studio/images/layer_distortion_curvewarp_icon.sif +++ b/synfig-studio/images/layer_distortion_curvewarp_icon.sif @@ -1,7 +1,7 @@ - + Synfig Studio Curve Wrap Icon - Placed in the Public Domain in 2010 by Bertrand Grégoire (berteh) + Placed in the Public Domain in 2010 by Bertrand Grégoire (berteh), in 2010 by Yu Chen (jcome) @@ -19,7 +19,7 @@ - + @@ -31,13 +31,111 @@ - 1.9941018820 - -0.2567747533 + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.700000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.1364002228 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 - + @@ -49,16 +147,16 @@ - 0.000000 - 0.000000 - 0.000000 + 0.013061 + 0.013061 + 0.013061 1.000000 - 0.0000000000 - 0.0000000000 + -1.2980784178 + -0.1298078448 @@ -77,52 +175,13 @@ - - - - - - -2.0193657875 - -0.0235736556 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - -2.5931022167 - 2.2713716030 + -1.3156199455 + 2.8812077045 @@ -137,59 +196,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - -1.2663369179 - 1.0163234472 - - - - - - - - - - - - - - - + - + - + - + @@ -199,8 +219,8 @@ - 0.0962867662 - -0.0235736556 + 3.9249331951 + -2.1488459110 @@ -215,20 +235,20 @@ - + - + - + - + @@ -237,13 +257,13 @@ - + - + @@ -258,7 +278,7 @@ - + @@ -268,212 +288,469 @@ - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - 0.302085 - 0.302085 - 0.302086 - 1.000000 - - - - - - - - - - - - 0.0000000000 - 0.0000000000 + 1.9941018820 + -0.2567747533 - - - - - + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.0842697620 + -0.0235736556 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.6106891632 + 2.6582198143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.2663369179 + 1.0812274218 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.6020548940 + -0.1326487660 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + 0.302085 + 0.302085 + 0.302086 + 1.000000 + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.0842697620 + -0.0235736556 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.6106891632 + 2.6582198143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.2663369179 + 1.0812274218 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.6020548940 + -0.1326487660 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -494,347 +771,4 @@ - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.0000000000 - -2.5847954750 - - - - - - - - - - - - - - - - - - - - - - - - 2.2337062359 - 0.0139259165 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0.0175705366 - 0.4894979596 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1.7015790939 - 0.0713365972 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0.0175703783 - -0.5416163802 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.013061 - 0.013061 - 0.013061 - 1.000000 - - - - - -0.6139559746 - -0.0877079964 - - - - - - - - - - - - - - - - - - - - - - - - -1.3156199455 - 2.7189478874 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3.1136341095 - -2.1488459110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/synfig-studio/images/layer_example_filledrectangle_icon.sif b/synfig-studio/images/layer_example_filledrectangle_icon.sif index 68d4f85..83c894a 100644 --- a/synfig-studio/images/layer_example_filledrectangle_icon.sif +++ b/synfig-studio/images/layer_example_filledrectangle_icon.sif @@ -8,7 +8,7 @@ - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.4988009930 - -2.0120215416 - - - - - 2.4988009930 - -2.0120215416 - - - - - 3.2776479721 - -2.7908685207 - - - + - -1.7199538946 - -2.7908685207 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7481141090 + -2.5207901001 + + + + + 2.7473614216 + -2.5212490559 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.2972397804 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.4988009930 - -2.0120215416 - - - - - 2.4988009930 - 2.1499423981 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.2391853333 - -1.7524058819 - - - + - 2.2391853333 - 1.8903266191 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,12 +146,12 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 - - + + @@ -209,14 +171,14 @@ - -1.9795696735 - -1.4927902222 + -2.7475929260 + 2.6462929249 - 1.9795696735 - 1.6307109594 + 2.7471959591 + -2.8485701084 @@ -226,7 +188,7 @@ - + @@ -234,42 +196,336 @@ - + - + - 3.1478400230 - -2.7908685207 + 0.0000000000 + 0.0000000000 - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1379981041 + 2.0366981030 + + + + + 2.1196720600 + -2.2031168938 + + + + + + + + + + + + + + + + + + + + + + -2.2052989006 + -0.9588571191 + + + + + 2.2052989006 + -0.9588571191 + + + + + + 0.793110 + 0.793110 + 1.000000 + 1.000000 + + + 0.612066 + 0.612066 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + -0.1014123783 + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/layer_example_simplecircle_icon.sif b/synfig-studio/images/layer_example_simplecircle_icon.sif index fcfb2d5..14471bc 100644 --- a/synfig-studio/images/layer_example_simplecircle_icon.sif +++ b/synfig-studio/images/layer_example_simplecircle_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Circle Icon - Placed in the Public Domain in 2007 by Chris Norman (pixelgeek) + Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome) - + - + @@ -18,163 +18,95 @@ - - - - 0.012910 - 0.012910 - 0.012910 - 1.000000 - - - 0.012910 - 0.012910 - 0.012910 - 0.731343 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - 0.1808688790 - -0.3216028810 - - - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.7515196800 - -1.2269309759 - - - - - 2.7515196800 - -1.2269309759 - - - - - 2.7515196800 - -2.7224798203 - - - - - -2.7515196800 - -2.7079598904 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - + 0.0000000000 0.0000000000 - - - - - + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.700000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.1364002228 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + - - - + - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - + + - + @@ -192,7 +124,7 @@ - + @@ -211,15 +143,15 @@ - + - + 0.0000000000 - 0.0000000000 + 0.2596159875 @@ -229,7 +161,7 @@ - + @@ -237,41 +169,139 @@ - + - - - 1.6642030478 - -1.9762411118 - + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + - + - -0.6339452267 - 0.8150724769 + 0.0000000000 + 0.2596159875 - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - + - - + + + + + + + + + + + + + + + + + + + 2.6559059620 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.6559059620 + -0.0000002322 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -285,5 +315,11 @@ + + + 0.0000000000 + 0.0000000000 + + diff --git a/synfig-studio/images/layer_geometry_checkerboard_icon.sif b/synfig-studio/images/layer_geometry_checkerboard_icon.sif index c3cf5ad..98d8ea4 100644 --- a/synfig-studio/images/layer_geometry_checkerboard_icon.sif +++ b/synfig-studio/images/layer_geometry_checkerboard_icon.sif @@ -1,140 +1,14 @@ - + Synfig Studio Checkerboard Layer Icon - Placed in the Public Domain in 2010 by Carlos López (genete) + Placed in the Public Domain in 2010 by Carlos López (genete), in 2010 by Yu Chen (jcome) - + - - - - - - - - - - - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - - - -1.5576940775 - -3.1153881550 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - - - - - - - + @@ -147,12 +21,12 @@ 0.0000000000 - 0.0000000000 + -0.0507061891 - - + + @@ -162,53 +36,16 @@ - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - - - 2.0769255161 - 2.0769255161 - - - - - - - - - - - - - - - - - - - - 2.1013975143 - -2.0880973339 + -0.6323263645 + 7.7884917259 - -1.7954977751 - 1.7954977751 + -0.3517891169 + -2.5961844921 @@ -223,7 +60,7 @@ 1.000000 1.000000 1.000000 - 1.000000 + 0.000000 @@ -234,6 +71,50 @@ + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + @@ -252,7 +133,7 @@ - + @@ -269,8 +150,8 @@ - - + + @@ -280,34 +161,219 @@ - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.5637049675 + -2.3365411758 + + + + + 2.5312528610 + 2.7259647846 + + + + + + + + + + + + + + + + + + + + + + 2.5312528610 + -2.3365411758 + + + + + -2.5961568356 + 2.6610608101 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 1.8152815104 - 1.7963591814 + 0.0000000000 + 0.2596159875 - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1738083363 + -2.2583372593 + + + + + 2.1705572605 + 2.0811810493 + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + -0.0106399870 + -0.0893761963 + + + + + 1.0895347595 + 1.0895347595 + + + + + + - + + - + @@ -315,7 +381,7 @@ - + @@ -328,14 +394,204 @@ 0.0000000000 - 0.0000000000 + 0.1315760463 - - - 0.9086549282 - 0.9086549282 - + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/layer_geometry_circle_icon.sif b/synfig-studio/images/layer_geometry_circle_icon.sif index fcfb2d5..d8578d3 100644 --- a/synfig-studio/images/layer_geometry_circle_icon.sif +++ b/synfig-studio/images/layer_geometry_circle_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Circle Icon - Placed in the Public Domain in 2007 by Chris Norman (pixelgeek) + Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome) - + - + @@ -18,163 +18,95 @@ - - - - 0.012910 - 0.012910 - 0.012910 - 1.000000 - - - 0.012910 - 0.012910 - 0.012910 - 0.731343 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - 0.1808688790 - -0.3216028810 - - - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.7515196800 - -1.2269309759 - - - - - 2.7515196800 - -1.2269309759 - - - - - 2.7515196800 - -2.7224798203 - - - - - -2.7515196800 - -2.7079598904 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - + 0.0000000000 0.0000000000 - - - - - + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.700000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.1364002228 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + - - - + - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - + + - + @@ -192,7 +124,7 @@ - + @@ -211,15 +143,15 @@ - + - + 0.0000000000 - 0.0000000000 + 0.2596159875 @@ -229,7 +161,7 @@ - + @@ -237,42 +169,258 @@ - + - + - 1.6642030478 - -1.9762411118 + 0.0000000000 + 0.0000000000 - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + 0.0000000000 + 0.2596159875 + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 0.1521185637 + + + + + -2.5961599350 + 0.1521185637 + + + + + + 0.612066 + 0.612066 + 1.000000 + 1.000000 + + + 0.793110 + 0.793110 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.2596159875 + + + + + + + + + + + + + + + + + + + + + + 2.6559059620 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.6559059620 + -0.0000002322 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -285,5 +433,11 @@ + + + 0.0000000000 + 0.0000000000 + + diff --git a/synfig-studio/images/layer_geometry_outline_icon.sif b/synfig-studio/images/layer_geometry_outline_icon.sif index 7e2c382..b072944 100644 --- a/synfig-studio/images/layer_geometry_outline_icon.sif +++ b/synfig-studio/images/layer_geometry_outline_icon.sif @@ -1,7 +1,112 @@ - - Untitled0 - + + Synfig Studio Outline Icon + Placed in the Public Domain in 2010 by Yu Chen (jcome) + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.700000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.1364002228 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + + + + + + + + @@ -32,7 +137,7 @@ - + @@ -46,12 +151,12 @@ - -0.8906250000 - 0.7656250000 + -0.6774355769 + 3.0547001362 - + @@ -60,16 +165,24 @@ - - 1.0937500000 - 1.0000000000 - + + + + + + + + - - 1.0937500000 - 1.0000000000 - + + + + + + + + @@ -77,30 +190,38 @@ - -0.0000000000 - 0.0000000000 + -2.4764924049 + -1.0056726933 - + - + - - 0.2197851539 - -0.9105731249 - + + + + + + + + - - 0.2197851539 - -0.9105731249 - + + + + + + + + @@ -108,37 +229,45 @@ - 0.8906250000 - -0.8125000000 + 2.5393686295 + 0.0000000000 - + - + - - 1.6562500000 - 0.7656250000 - + + + + + + + + - - 1.6562500000 - 0.7656250000 - + + + + + + + + - + diff --git a/synfig-studio/images/layer_geometry_polygon_icon.sif b/synfig-studio/images/layer_geometry_polygon_icon.sif index 03f2411..ee4f4a6 100644 --- a/synfig-studio/images/layer_geometry_polygon_icon.sif +++ b/synfig-studio/images/layer_geometry_polygon_icon.sif @@ -1,106 +1,252 @@ - - Synfig Studio Polygon Icon - Placed in the Public Domain in 2007 by Chris Norman (pixelgeek) + + Synfig Studio Polyline Icon + Placed in the Public Domain in 2008 by Carlos López (Genete), in 2010 by Yu Chen (jcome) - - + + - - - - - - - - - - - - - - 0.012910 - 0.012910 - 0.012910 - 1.000000 - - - 0.012910 - 0.012910 - 0.012910 - 0.731343 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - 0.1808688790 - -0.3216028810 - - - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.7515196800 - -1.2269309759 - - - - - 2.7515196800 - -1.2269309759 - - - - - 2.7515196800 - -2.7224798203 - - - - - -2.7515196800 - -2.7079598904 - - - - - - - - - - + + + + + + + -3.1153917313 + 0.3894239664 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.5192319751 + 2.9855837822 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.1153917313 + -0.7788479328 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6875039339 + -2.3365437984 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.5192319751 + -0.1298079938 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.6875039339 + -1.2980799675 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -110,469 +256,95 @@ - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - + 0.0000000000 0.0000000000 - - - - - - - - - - - - - - - - - - - 0.0000000000 - 2.5961568356 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -2.3407971859 - 0.4787994027 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1.3033983707 - -2.2077972889 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.4895981550 - -2.2077972889 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.3008971214 - 0.4920994043 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.800000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.1364002228 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + - - - + - - - - - + + - + @@ -589,8 +361,8 @@ - - + + @@ -602,13 +374,13 @@ - 0.428529 - 0.428529 - 0.428529 + 1.000000 + 1.000000 + 1.000000 1.000000 - + 0.0000000000 0.0000000000 @@ -626,207 +398,270 @@ + + + - + - 0.0000000000 - 2.0215976238 + -0.3882599771 + 0.1446780860 - - + + - - + + - - + + - - + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - + - + - -1.8619977236 - 0.3989995122 + 1.5862575769 + -1.8290388584 - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - -0.9708988070 - -1.7821978331 + 2.7473807335 + -0.6132830977 - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - 1.1836985350 - -1.7821978331 + -0.6219982505 + 2.7464330196 - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - 1.8619977236 - 0.3457995653 + -2.7577657700 + 0.6465590596 - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - + + + + + + + + -1.3464418650 + -0.8009691834 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -834,42 +669,954 @@ - + - + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + - 2.5355694294 - -3.3529567719 + 0.0000000000 + 0.0000000000 - + + + + + + + + + + + + + + + + + + + + + + -3.0328524113 + 0.6490399837 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.6215841770 + 3.0211579800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.0195577145 + -0.6100772619 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.5893906355 + -2.1072096825 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.3894239664 + -0.1298079938 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.3487370014 + -1.0772391558 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -0.6339452267 - 0.8150724769 + 0.0000000000 + 0.0000000000 - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - + + + + + + + + + + + + + + + 0.000000 + 0.333333 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.3882599771 + 0.1446780860 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.5862575769 + -1.8290388584 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7473807335 + -0.6132830977 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.6219982505 + 2.7464330196 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.7577657700 + 0.6465590596 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.3464418650 + -0.8009691834 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.9775413275 + 0.3549433053 + + + + + 2.0282475948 + 0.3549433053 + + + + + + 0.793110 + 0.793110 + 1.000000 + 1.000000 + + + 0.612066 + 0.612066 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.3882599771 + 0.1446780860 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.5862575769 + -1.8290388584 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7473807335 + -0.6132830977 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.6219982505 + 2.7464330196 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.7577657700 + 0.6465590596 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.3464418650 + -0.8009691834 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + @@ -882,5 +1629,11 @@ + + + 0.0000000000 + 0.0000000000 + + diff --git a/synfig-studio/images/layer_geometry_rectangle_icon.sif b/synfig-studio/images/layer_geometry_rectangle_icon.sif index 68d4f85..54e793a 100644 --- a/synfig-studio/images/layer_geometry_rectangle_icon.sif +++ b/synfig-studio/images/layer_geometry_rectangle_icon.sif @@ -8,7 +8,7 @@ - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.4988009930 - -2.0120215416 - - - - - 2.4988009930 - -2.0120215416 - - - - - 3.2776479721 - -2.7908685207 - - - + - -1.7199538946 - -2.7908685207 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7481141090 + -2.5207901001 + + + + + 2.7473614216 + -2.5212490559 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.2972397804 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.4988009930 - -2.0120215416 - - - - - 2.4988009930 - 2.1499423981 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.2391853333 - -1.7524058819 - - - + - 2.2391853333 - 1.8903266191 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,12 +146,12 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 - - + + @@ -209,14 +171,14 @@ - -1.9795696735 - -1.4927902222 + -2.7475929260 + 2.6462929249 - 1.9795696735 - 1.6307109594 + 2.7471959591 + -2.8485701084 @@ -226,7 +188,7 @@ - + @@ -234,41 +196,217 @@ - + - - - 3.1478400230 - -2.7908685207 - + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + - + - -2.7908685207 - 2.5312528610 + 0.0000000000 + -0.1014123783 - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - + - - + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/layer_geometry_region_icon.sif b/synfig-studio/images/layer_geometry_region_icon.sif index ceb7b63..1b30d4b 100644 --- a/synfig-studio/images/layer_geometry_region_icon.sif +++ b/synfig-studio/images/layer_geometry_region_icon.sif @@ -1,14 +1,14 @@ - - Synfig Studio B-Line Icon - Placed in the Public Domain in 2007 by Chris Norman (pixelgeek) + + Synfig Studio Gradient Icon + Placed in the Public Domain in 2010 by Yu Chen (jcome) - + - + @@ -18,1292 +18,15 @@ - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.0377842039 - -0.1834019721 - - - - - - - - - - - - - - - - - - - - - -2.9584641457 - -1.9259779453 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1.9849041700 - 0.3456619680 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.4225540161 - 1.8059999943 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.2716398239 - -2.7584199905 - - - - - -1.4603400230 - 2.9206800461 - - - - - - - - - - - - - - - - - - - - - - 0.039242 - 0.733975 - 0.703853 - 1.000000 - - - - - -2.1093800068 - -2.5961599350 - - - - - -1.6225999594 - 2.7584199905 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -1.8659877777 - 2.4338970184 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -1.8659877777 - 0.0811299011 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -1.8659877777 - -2.3527672291 - - - - - - - - - - - - - - - - - - - - - - 0.537454 - 0.563494 - 0.016721 - 1.000000 - - - - - - - - - - - -1.8659877777 - -2.3527672291 - - - - - - - - - - - - - - - - - - - - - - 0.428529 - 0.100841 - 0.016721 - 1.000000 - - - - - - - - - - - -1.8659877777 - 0.0811299011 - - - - - - - - - - - - - - - - - - - - - - 0.233646 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -1.8659877777 - 2.4338970184 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.844853 - 0.828491 - 0.118994 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - 0.3245196044 - -0.3245196044 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.9735588431 - 1.1358186007 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.9735588431 - 1.6225980520 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6225980520 - 1.6225980520 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6225980520 - 1.1358186007 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.2716372013 - -0.3245196044 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.7848578691 - -1.2980784178 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.8112990260 - -1.2980784178 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.9471199512 - -1.2980799675 - - - - - 0.4867799878 - 1.4603400230 - - - - - - 1.000000 - 0.537059 - 0.001616 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - 0.828491 - 0.537454 - 0.003862 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - 0.3245196044 - -0.3245196044 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.9735588431 - 1.1358186007 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.9735588431 - 1.6225980520 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6225980520 - 1.6225980520 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6225980520 - 1.1358186007 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.2716372013 - -0.3245196044 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.7848578691 - -1.2980784178 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.8112990260 - -1.2980784178 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 0.0000000000 + 0.0000000000 + + + + + @@ -1313,171 +36,56 @@ - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - + + + + 0.036113 + 0.036189 + 0.036189 + 0.700000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + - + 0.0000000000 - 0.0000000000 + -1.1364002228 - - - - - - - - - - - - - - - - - - - 1.2980784178 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.2980784178 - 1.7848578691 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - + - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - 1.2980784178 - -0.1622598022 + 1.6070324183 + 0.2128458172 - - - - - + + + 0.0000000000 + -3.1892864704 + @@ -1491,8 +99,14 @@ + + + 0.0000000000 + 0.0000000000 + + - + @@ -1510,7 +124,7 @@ - + @@ -1522,66 +136,153 @@ - 0.011238 - 0.065656 - 0.247404 + 0.531049 + 0.531049 + 0.531049 1.000000 - - - 0.6490392089 - -1.4603382349 - - - + - 1.9471176863 - -3.0829362869 + 0.0000000000 + 0.0000000000 - - - - - - + + + + - - + + - + - - - 0.172611 - 0.349351 - 0.629024 - 1.000000 - - - - - 0.9735588431 - -1.7848578691 - - - - - 1.6225980520 - -3.0829362869 - - - - - - - + + + + + + + -0.9317516685 + 3.1153917313 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.3365437984 + -2.1337192059 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.1153917313 + 0.5440223813 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1592,17 +293,17 @@ - + - 0.011238 - 0.065656 - 0.247404 + 0.325037 + 0.325037 + 0.325037 1.000000 - + 0.0000000000 0.0000000000 @@ -1615,95 +316,137 @@ - + + + + - - - 1.3067390919 - -3.0541522503 + + + -0.9317516685 + 3.1153917313 - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - 1.3275415897 - -2.1596431732 + + + -2.3365437984 + -2.1337192059 - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.1153917313 + 0.5440223813 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -1712,7 +455,7 @@ - + @@ -1735,79 +478,11 @@ - - - - - - - - - - - - - - 0.111449 - 0.112213 - 0.111449 - 0.111111 - - - - - 0.2000000030 - -0.2000000030 - - - - - 0.1649046391 - 0.1649046391 - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - 0.4867794216 - -3.0829362869 - - - + - 2.5961568356 - -3.2451961040 + 0.0000000000 + 0.0000000000 - - - - - - diff --git a/synfig-studio/images/layer_geometry_solidcolor_icon.sif b/synfig-studio/images/layer_geometry_solidcolor_icon.sif index 73c8b73..b6b5bb8 100644 --- a/synfig-studio/images/layer_geometry_solidcolor_icon.sif +++ b/synfig-studio/images/layer_geometry_solidcolor_icon.sif @@ -1,226 +1,24 @@ - - Untitled0 + + Synfig Studio SolidColor Icon + Placed in the Public Domain in 2010 by Yu Chen (jcome) + + + + + + - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.1000000015 - -0.1000000015 - - - - - - - - - - - - - - - - - - - -0.8000000119 - 0.8000000119 - - - - - -0.8000000119 - -0.2000000030 - - - - - 0.2000000030 - -0.2000000030 - - - - - 0.2000000030 - 0.8000000119 - - - - - - - - - - - - - - - - - - 0.2000000030 - 0.2000000030 - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - -0.8000000119 - 0.8000000119 - - - - - -0.8000000119 - -0.2000000030 - - - - - 0.2000000030 - -0.2000000030 - - - - - 0.2000000030 - 0.8000000119 - - - - - - - - - - - - - - - - - - 1.000000 - 0.900000 - 0.600000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - -0.6999999881 - 0.6999999881 - - - - - -0.6999999881 - -0.1000000015 - - - - - 0.1000000015 - -0.1000000015 - - - - - 0.1000000015 - 0.6999999881 - - - - - - + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + - + @@ -230,103 +28,13 @@ - - - 0.5000000000 - -0.5000000000 - - - - - - - - - - - - - - - - - - - - - 0.2000000030 - -0.2000000030 - - - - - - - - - - - - - - - - - - - - - -0.1000000015 - 0.1000000015 - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 + 0.456263 + 0.456263 + 0.456263 1.000000 - - - - - - - - - -0.6999999881 - 0.6999999881 - - - - - - - - diff --git a/synfig-studio/images/layer_geometry_star_icon.sif b/synfig-studio/images/layer_geometry_star_icon.sif index b933e42..f2f4830 100644 --- a/synfig-studio/images/layer_geometry_star_icon.sif +++ b/synfig-studio/images/layer_geometry_star_icon.sif @@ -1,7 +1,7 @@ - + Synfig Studio Star Icon - Placed in the Public Domain in 2008 by Carlos López (Genete) + Placed in the Public Domain in 2008 by Carlos López (Genete), in 2010 by Yu Chen (jcome) @@ -246,7 +246,7 @@ - + @@ -256,169 +256,95 @@ - - - - 0.036189 - 0.036189 - 0.036189 - 1.000000 - - - 0.012910 - 0.012910 - 0.012910 - 0.731343 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - 1.6070324183 - 0.3102017045 - - - - - 0.0000000000 - -3.4489021301 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - + 0.0000000000 0.0000000000 - - - - - + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.500000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.3727831841 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + - + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - + 0.0000000000 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -436,7 +362,7 @@ - + @@ -454,10 +380,10 @@ 1.000000 - - + + 0.0000000000 - 0.0000000000 + -0.1658886075 @@ -476,10 +402,10 @@ - + - + @@ -491,7 +417,7 @@ - + @@ -499,42 +425,188 @@ - + - - - 2.4688332081 - -3.3694140911 + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + -0.1658886075 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -0.5900356174 - 0.8074172139 + 0.0000000000 + 0.0000000000 - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - + + + + + + + + + + + + + + + 0.893289 + 0.893289 + 0.893289 + 1.000000 + + + + + 0.0000000000 + -0.1658886075 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.9775413275 + 0.3549433053 + + + + + 2.0282475948 + 0.3549433053 + + + + + + 0.793110 + 0.793110 + 1.000000 + 1.000000 + + + 0.612066 + 0.612066 + 1.000000 + 1.000000 + + + + + + + + + + + - - + + - + + @@ -547,5 +619,11 @@ + + + 0.0000000000 + 0.0000000000 + + diff --git a/synfig-studio/images/layer_gradient_conical_icon.sif b/synfig-studio/images/layer_gradient_conical_icon.sif index 3e02ddc..1ec62c9 100644 --- a/synfig-studio/images/layer_gradient_conical_icon.sif +++ b/synfig-studio/images/layer_gradient_conical_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Conical Gradient Icon - Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman + Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome) - + - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - + - -1.5576940775 - -3.1153881550 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - + - 2.0769255161 - 2.0769255161 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,7 +146,7 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 @@ -209,14 +171,14 @@ - -1.8173098564 - -1.8173098564 + -2.5961599350 + 2.4484515190 - 1.8173098564 - 1.8173098564 + 2.5961599350 + -2.7376513481 @@ -226,7 +188,7 @@ - + @@ -234,36 +196,330 @@ - + - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + + 0.893289 + 0.893289 + 0.893289 + 1.000000 + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + -0.1014123783 + - + + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/layer_gradient_curve_icon.sif b/synfig-studio/images/layer_gradient_curve_icon.sif index b7f7323..ed69c8d 100644 --- a/synfig-studio/images/layer_gradient_curve_icon.sif +++ b/synfig-studio/images/layer_gradient_curve_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Curve Gradient Icon - Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman + Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome) - + - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - + - -1.5576940775 - -3.1153881550 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - + - 2.0769255161 - 2.0769255161 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,7 +146,7 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 @@ -209,14 +171,14 @@ - -1.8173098564 - -1.8173098564 + -2.5961599350 + 2.4484515190 - 1.8173098564 - 1.8173098564 + 2.5961599350 + -2.7376513481 @@ -226,7 +188,7 @@ - + @@ -234,7 +196,7 @@ - + @@ -242,45 +204,346 @@ 0.0000000000 - - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + -0.4803912044 + 2.8805587292 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.1140987873 + -0.3411288857 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.9168317318 + -0.0733363181 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0827908292 + -3.3328418732 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.893289 + 0.893289 + 0.893289 + 1.000000 + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + -0.1014123783 + + + + + + + + + + + + + + + + - + - -0.4803912044 - 2.8805587292 + -2.5961599350 + -2.5961599350 - + - + - + - + - + - + @@ -290,36 +553,36 @@ - -1.1140987873 - -0.3411288857 + 2.5961599350 + -2.5961599350 - + - + - + - + - + - + - + @@ -329,36 +592,36 @@ - 0.9168317318 - -0.0733363181 + 2.5961599350 + 2.5961599350 - + - + - + - + - + - + @@ -368,36 +631,36 @@ - 0.0827908292 - -3.3328418732 + -2.5961599350 + 2.5961599350 - + - + - + - + - + - + @@ -405,32 +668,25 @@ - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - + + - - + + - - + + - - + + + + + + + + - + diff --git a/synfig-studio/images/layer_gradient_lineal_icon.sif b/synfig-studio/images/layer_gradient_lineal_icon.sif index e5e8ab6..4335dfa 100644 --- a/synfig-studio/images/layer_gradient_lineal_icon.sif +++ b/synfig-studio/images/layer_gradient_lineal_icon.sif @@ -1,21 +1,14 @@ - Synfig Studio Gradient Icon + Synfig Studio Linear Gradient Icon Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome) - + - - - -1.6735321283 - 1.6797120571 - - - - + @@ -25,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - + - -1.5576940775 - -3.1153881550 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - + - 2.0769255161 - 2.0769255161 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -191,11 +146,11 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 - + @@ -216,14 +171,14 @@ - -1.8173098564 - -1.8173098564 + -2.5961599350 + 2.4484515190 - 1.8173098564 - 1.8173098564 + 2.5961599350 + -2.7376513481 @@ -233,7 +188,7 @@ - + @@ -241,80 +196,117 @@ - + - + - -1.6974871159 - 1.7141292095 + 0.0000000000 + 0.0000000000 - - - 1.7973393202 - -1.7640552521 - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + -2.5414354801 + 0.0909172446 + + + + + 2.5787625313 + 0.0909172446 + + + + + + 0.047366 + 0.047366 + 0.047366 + 1.000000 + + + 0.793110 + 0.793110 + 0.793110 + 1.000000 + + + + + + + + + + + - - - - 0.000000 - 0.793110 - 1.000000 - 1.000000 - - - 1.000000 - 0.010309 - 0.000000 - 1.000000 - - + + - - + + - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - + @@ -335,7 +327,7 @@ 0.0000000000 - 0.0000000000 + -0.1014123783 @@ -354,13 +346,13 @@ - + - -1.6475610733 - 1.6142770052 + -2.5961599350 + -2.5961599350 @@ -370,22 +362,22 @@ - + - + - + - + @@ -398,8 +390,8 @@ - 1.6309189796 - -1.6309189796 + 2.5961599350 + -2.5961599350 @@ -409,12 +401,12 @@ - + - + @@ -424,86 +416,21 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.973842 - 1.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - -1.6475610733 - 1.6142770052 + 2.5961599350 + 2.5961599350 @@ -513,25 +440,25 @@ - + - + - + - + - + @@ -541,8 +468,8 @@ - 1.6309189796 - -1.6309189796 + -2.5961599350 + 2.5961599350 @@ -552,25 +479,25 @@ - + - + - + - + - + @@ -579,7 +506,7 @@ - + @@ -600,212 +527,6 @@ - - - - - - - - - - - - - 3.5780365467 - -3.5613946915 - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - -2.0767474174 - 2.0529854298 - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 1.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -2.0767474174 - 2.0529854298 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.1595997959 - -0.1728997827 - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 1.000000 - 0.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/synfig-studio/images/layer_gradient_noise_icon.sif b/synfig-studio/images/layer_gradient_noise_icon.sif index 53b6b96..fe08fbb 100644 --- a/synfig-studio/images/layer_gradient_noise_icon.sif +++ b/synfig-studio/images/layer_gradient_noise_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Noise Gradient Icon - Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman + Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome) - + - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - + - -1.5576940775 - -3.1153881550 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - + - 2.0769255161 - 2.0769255161 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,7 +146,7 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 @@ -209,14 +171,14 @@ - -1.8173098564 - -1.8173098564 + -2.5961599350 + 2.4484515190 - 1.8173098564 - 1.8173098564 + 2.5961599350 + -2.7376513481 @@ -226,7 +188,7 @@ - + @@ -234,51 +196,345 @@ - + - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - + + + 0.0000000000 + 0.0000000000 + - - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + + 0.893289 + 0.893289 + 0.893289 + 1.000000 + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + -0.5785136819 + 0.5432509184 + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + - - + + - - + + - - + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + - - + + + 0.0000000000 + -0.1014123783 + - + + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/layer_gradient_radial_icon.sif b/synfig-studio/images/layer_gradient_radial_icon.sif index 3bb21b2..ef16880 100644 --- a/synfig-studio/images/layer_gradient_radial_icon.sif +++ b/synfig-studio/images/layer_gradient_radial_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Radial Gradient Icon - Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman + Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome) - + - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - + - -1.5576940775 - -3.1153881550 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - + - 2.0769255161 - 2.0769255161 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,7 +146,7 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 @@ -209,14 +171,14 @@ - -1.8173098564 - -1.8173098564 + -2.5961599350 + 2.4484515190 - 1.8173098564 - 1.8173098564 + 2.5961599350 + -2.7376513481 @@ -226,7 +188,7 @@ - + @@ -234,39 +196,333 @@ - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - + - + 0.0000000000 0.0000000000 - - + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + -0.1014123783 + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/layer_gradient_spiral_icon.sif b/synfig-studio/images/layer_gradient_spiral_icon.sif index d94f407..3c3833d 100644 --- a/synfig-studio/images/layer_gradient_spiral_icon.sif +++ b/synfig-studio/images/layer_gradient_spiral_icon.sif @@ -1,14 +1,14 @@ - + Synfig Studio Spiral Gradient Icon - Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman + Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome) - + - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - -2.3365411758 - - - - - 3.1153881550 - -3.1153881550 - - - + - -1.5576940775 - -3.1153881550 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.3365411758 - -2.3365411758 - - - - - 2.3365411758 - 2.3365411758 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.0769255161 - -2.0769255161 - - - + - 2.0769255161 - 2.0769255161 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,7 +146,7 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 @@ -209,14 +171,14 @@ - -1.8173098564 - -1.8173098564 + -2.5961599350 + 2.4484515190 - 1.8173098564 - 1.8173098564 + 2.5961599350 + -2.7376513481 @@ -226,7 +188,7 @@ - + @@ -234,39 +196,333 @@ - + - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + + 0.893289 + 0.893289 + 0.893289 + 1.000000 + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + - - + + + 0.0000000000 + -0.1014123783 + - + + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/layer_other_importimage_icon.sif b/synfig-studio/images/layer_other_importimage_icon.sif index 73c8b73..5be7fa2 100644 --- a/synfig-studio/images/layer_other_importimage_icon.sif +++ b/synfig-studio/images/layer_other_importimage_icon.sif @@ -1,226 +1,24 @@ - - Untitled0 + + Synfig Studio Import Image Icon + Placed in the Public Domain in 2010 by Yu Chen (jcome) + + + + + + - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.1000000015 - -0.1000000015 - - - - - - - - - - - - - - - - - - - -0.8000000119 - 0.8000000119 - - - - - -0.8000000119 - -0.2000000030 - - - - - 0.2000000030 - -0.2000000030 - - - - - 0.2000000030 - 0.8000000119 - - - - - - - - - - - - - - - - - - 0.2000000030 - 0.2000000030 - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - -0.8000000119 - 0.8000000119 - - - - - -0.8000000119 - -0.2000000030 - - - - - 0.2000000030 - -0.2000000030 - - - - - 0.2000000030 - 0.8000000119 - - - - - - - - - - - - - - - - - - 1.000000 - 0.900000 - 0.600000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - -0.6999999881 - 0.6999999881 - - - - - -0.6999999881 - -0.1000000015 - - - - - 0.1000000015 - -0.1000000015 - - - - - 0.1000000015 - 0.6999999881 - - - - - - + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + - + @@ -232,43 +30,93 @@ - 0.5000000000 - -0.5000000000 + 0.0000000000 + 0.0000000000 - + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.700000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.1364002228 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + + - - - - + - + @@ -280,53 +128,2831 @@ - -0.1000000015 - 0.1000000015 + 0.0000000000 + 0.3042364717 - + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.3807091713 + 1.9864042997 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.4081976414 + 1.9864042997 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.4081976414 + -0.4474872351 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0655186176 + -1.7208422422 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.3664343357 + -1.7373532057 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.3672661781 + -1.7393362522 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.9380773306 + -1.7393362522 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.1744242907 + -0.7615970373 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.4024064541 + -0.4137853384 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.4024064541 + 1.9793536663 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.3672661781 + 1.9793536663 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.9216941595 + -1.3407168388 + + + + + -2.3909449577 + 2.0110752583 + + + + + + 0.268410 + 0.268410 + 0.268410 + 1.000000 + + + 0.428075 + 0.414347 + 0.400864 + 1.000000 + + + 1.000000 + 0.956527 + 0.717623 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.0313861370 + 1.1595760584 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.9711728096 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.9039406180 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.8247123957 + 1.1660419703 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.9039406180 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.9711728096 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.7932230830 + 1.1595760584 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8534365296 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.9206687212 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.9998968840 + 1.1660419703 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.9206687212 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8534365296 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.3753311634 + 1.1614180803 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.4165869951 + 1.1614180803 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.0313861370 + 1.1595760584 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.9711728096 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.9039406180 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.8247123957 + 1.1660419703 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.9039406180 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.9711728096 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.7932230830 + 1.1595760584 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8534365296 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.9206687212 + 0.8057304621 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.9998968840 + 1.1660419703 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.9206687212 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8534365296 + 1.5070955753 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.3753311634 + 1.1614180803 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.4165869951 + 1.1614180803 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.3730041981 + -1.0495742559 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.4102540016 + 0.7526010871 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.4081976414 + -0.4474872351 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0673037767 + -1.7207731009 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.3587293625 + -1.7373532057 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.0159785748 + 1.6624671221 + + + + + 0.7348399758 + -1.6617667675 + + + + + + 1.000000 + 1.000000 + 0.000000 + 1.000000 + + + 0.000000 + 0.000013 + 0.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.0655186176 + -1.7208422422 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.1744242907 + -0.7615970373 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5019521713 + -0.4387928247 + + + + + + + + + + + + + + 0.4637465179 + 0.7907865047 + + + + + -0.6123811007 + -1.2812807560 + + + + + + + + + + + + + + + + + + + + + 1.000000 + 0.978132 + 0.699394 + 1.000000 + + + 0.428075 + 0.414347 + 0.400864 + 1.000000 + + + 0.268410 + 0.268410 + 0.268410 + 1.000000 + + + + + + 1.3925434351 + -0.7023499608 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 2.5019521713 + -0.4387928247 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.1744242907 + -0.7615970373 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0655186176 + -1.8199018240 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + - - - - + diff --git a/synfig-studio/images/list_icon.sif b/synfig-studio/images/list_icon.sif deleted file mode 100644 index 07c99dc..0000000 --- a/synfig-studio/images/list_icon.sif +++ /dev/null @@ -1,65 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - LIST - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - Sans Serif - - - - - - - - - - - - - - - - 0.9375000000 - 1.0781250000 - - - - - 0.5000000000 - 0.5000000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - diff --git a/synfig-studio/images/polyline_icon.sif b/synfig-studio/images/polyline_icon.sif index 8b5e593..2b6f793 100644 --- a/synfig-studio/images/polyline_icon.sif +++ b/synfig-studio/images/polyline_icon.sif @@ -1,21 +1,21 @@ - + Synfig Studio Polyline Icon - Placed in the Public Domain in 2008 by Carlos López (Genete) + Placed in the Public Domain in 2008 by Carlos López (Genete), in 2010 by Yu Chen (jcome) - + - + - -2.3637278080 - 0.2062759846 + -3.1153917313 + 0.3894239664 @@ -53,8 +53,8 @@ - -0.5688224435 - 2.1194937229 + -0.5192319751 + 2.9855837822 @@ -92,8 +92,8 @@ - 2.4810948372 - -0.9839330316 + 3.1153917313 + -0.7788479328 @@ -131,8 +131,8 @@ - 1.5429599285 - -2.0844035149 + 1.6875039339 + -2.3365437984 @@ -170,8 +170,8 @@ - -0.6772783995 - 0.3616140485 + -0.5192319751 + -0.1298079938 @@ -209,8 +209,8 @@ - -1.6594920158 - -0.6549533606 + -1.6875039339 + -1.2980799675 @@ -246,69 +246,7 @@ - - - - - - - - - - - - - - 0.036189 - 0.036189 - 0.036189 - 1.000000 - - - 0.012910 - 0.012910 - 0.012910 - 0.731343 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - 1.6070324183 - 0.3102017045 - - - - - 0.0000000000 - -3.4489021301 - - - - + @@ -326,7 +264,7 @@ - + @@ -336,75 +274,37 @@ - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.9432895184 - -3.7802658081 - - - - - -1.0177584887 - 0.9443578720 - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 + + 0.036113 + 0.036189 + 0.036189 + 0.800000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 1.000000 1.000000 1.000000 - 1.000000 + 0.000000 + + + 0.0000000000 + -1.1364002228 + + + + + @@ -412,68 +312,56 @@ - - - - + - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - + + 1.6070324183 + 0.2128458172 + - + 0.0000000000 - 0.0000000000 + -3.1892864704 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + @@ -492,7 +380,7 @@ 1.000000 - + 0.0000000000 0.0000000000 @@ -519,8 +407,8 @@ - -2.6194977760 - 0.2062759846 + -3.0328524113 + 0.6490399837 @@ -558,8 +446,8 @@ - -0.5688224435 - 2.3933870792 + -0.6215841770 + 3.0211579800 @@ -597,8 +485,8 @@ - 2.7468631268 - -0.9839330316 + 3.0195577145 + -0.6100772619 @@ -636,8 +524,8 @@ - 1.5429599285 - -2.3679156303 + 1.5893906355 + -2.1072096825 @@ -675,8 +563,8 @@ - -0.6772783995 - 0.1130477637 + -0.3894239664 + -0.1298079938 @@ -714,8 +602,8 @@ - -1.6594920158 - -0.9259382486 + -1.3487370014 + -1.0772391558 @@ -784,5 +672,11 @@ + + + 0.0000000000 + 0.0000000000 + + diff --git a/synfig-studio/images/real_icon.sif b/synfig-studio/images/real_icon.sif deleted file mode 100644 index 783619c..0000000 --- a/synfig-studio/images/real_icon.sif +++ /dev/null @@ -1,281 +0,0 @@ - - - Synfig Studio Canvas Icon - - - Untitled - - - - - - - - - - - - - 1.000000 - 0.300000 - 0.100000 - 1.000000 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -0.2187500000 - -0.2812500000 - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - -0.2031250000 - -0.2656250000 - - - - - - - - - - - - - - - - - - - - - - 0.2000000030 - 0.2000000030 - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - 0.4215 - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - Sans Serif - - - - - - - - - - - - - - - - 0.3281250000 - 0.3828125000 - - - - - 0.5000000000 - 0.5000000000 - - - - - 0.2624999881 - -0.8750000000 - - - - - - - - - - - - - - - - - - - - - 3.1415 - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - Sans Serif - - - - - - - - - - - - - - - - 0.4046874940 - 0.6234375238 - - - - - 0.5000000000 - 0.5000000000 - - - - - -0.1312499940 - 0.2843750119 - - - - - - - - - - diff --git a/synfig-studio/images/rectangle_icon.sif b/synfig-studio/images/rectangle_icon.sif index 68d4f85..3e2e271 100644 --- a/synfig-studio/images/rectangle_icon.sif +++ b/synfig-studio/images/rectangle_icon.sif @@ -8,7 +8,7 @@ - + @@ -18,160 +18,122 @@ - - - -0.6717824340 - 8.4043684006 - - - - - -0.4427109957 - -1.6098945141 - - - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - - - - - - - - - -1.8803261518 - 2.0255250931 - - - - - 1.9384056330 - -1.9093658924 - - - - - -2.4988009930 - -2.0120215416 - - - - - 2.4988009930 - -2.0120215416 - - - - - 3.2776479721 - -2.7908685207 - - - + - -1.7199538946 - -2.7908685207 + 0.0000000000 + -0.0507061891 - - - - - + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7481141090 + -2.5207901001 + + + + + 2.7473614216 + -2.5212490559 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.2972397804 + -3.1153917313 + + + + + + + + + + - - - + - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - -2.4988009930 - -2.0120215416 - - - - - 2.4988009930 - 2.1499423981 - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - -2.2391853333 - -1.7524058819 - - - + - 2.2391853333 - 1.8903266191 + 0.0000000000 + 0.0000000000 - - - - - - - + @@ -184,12 +146,12 @@ 0.0000000000 - 0.0000000000 + 0.2596159875 - - + + @@ -201,74 +163,213 @@ - 1.000000 - 1.000000 - 1.000000 + 0.000000 + 0.000000 + 0.000000 1.000000 - + - -1.9795696735 - -1.4927902222 + 0.0000000000 + -0.1014123783 - - - 1.9795696735 - 1.6307109594 - - - - - - - - + + + + - - + + - - + + - - - 3.1478400230 - -2.7908685207 - + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - -2.7908685207 - 2.5312528610 - + + - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - + + - - + + - - + + + + + + + + + + + diff --git a/synfig-studio/images/segment_icon.sif b/synfig-studio/images/segment_icon.sif deleted file mode 100644 index 9ec6a04..0000000 --- a/synfig-studio/images/segment_icon.sif +++ /dev/null @@ -1,65 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - SEG - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - Sans Serif - - - - - - - - - - - - - - - - 1.0000000000 - 1.2500000000 - - - - - 0.5000000000 - 0.5000000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - diff --git a/synfig-studio/images/star_icon.sif b/synfig-studio/images/star_icon.sif index b933e42..fced919 100644 --- a/synfig-studio/images/star_icon.sif +++ b/synfig-studio/images/star_icon.sif @@ -1,7 +1,7 @@ - + Synfig Studio Star Icon - Placed in the Public Domain in 2008 by Carlos López (Genete) + Placed in the Public Domain in 2008 by Carlos López (Genete), in 2010 by Yu Chen (jcome) @@ -246,7 +246,7 @@ - + @@ -256,169 +256,95 @@ - - - - 0.036189 - 0.036189 - 0.036189 - 1.000000 - - - 0.012910 - 0.012910 - 0.012910 - 0.731343 - - - 1.000000 - 1.000000 - 1.000000 - 0.000000 - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - 1.6070324183 - 0.3102017045 - - - - - 0.0000000000 - -3.4489021301 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - + 0.0000000000 0.0000000000 - - - - - + + + + + + + + + + + + + + + + 0.036113 + 0.036189 + 0.036189 + 0.500000 + + + 0.012815 + 0.012910 + 0.012910 + 0.300000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.0000000000 + -1.3727831841 + + + + + + + + + + + + + + + + 1.6070324183 + 0.2128458172 + + + + + 0.0000000000 + -3.1892864704 + + + + - + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - + 0.0000000000 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -436,7 +362,7 @@ - + @@ -454,10 +380,10 @@ 1.000000 - - + + 0.0000000000 - 0.0000000000 + -0.1658886075 @@ -476,10 +402,10 @@ - + - + @@ -491,7 +417,7 @@ - + @@ -499,40 +425,50 @@ - + - - - 2.4688332081 - -3.3694140911 - + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + - - - -0.5900356174 - 0.8074172139 + + + 0.0000000000 + -0.1658886075 - - - - 0.064115 - 0.064115 - 0.064115 - 1.000000 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -547,5 +483,11 @@ + + + 0.0000000000 + 0.0000000000 + + diff --git a/synfig-studio/images/string_icon.sif b/synfig-studio/images/string_icon.sif deleted file mode 100644 index 04f81d5..0000000 --- a/synfig-studio/images/string_icon.sif +++ /dev/null @@ -1,65 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - STR - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - Sans Serif - - - - - - - - - - - - - - - - 1.0000000000 - 1.1250000000 - - - - - 0.5000000000 - 0.5000000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - diff --git a/synfig-studio/images/time_icon.sif b/synfig-studio/images/time_icon.sif deleted file mode 100644 index 04c7bf4..0000000 --- a/synfig-studio/images/time_icon.sif +++ /dev/null @@ -1,1198 +0,0 @@ - - - Synfig Studio Time Icon - Placed in the Public Domain in 2008 by Carlos López (Genete) - - - - - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 0.302831 - - - - - - - - - - - 0.0000000000 - -4.1999998093 - - - - - - - - - - - - - 1.0609271526 - 0.4160498679 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.116374 - 0.093697 - 0.173189 - 0.998120 - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.284698 - 0.292440 - 0.430366 - 1.000000 - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - 1.8662887812 - -2.0927865505 - - - - - -1.6451721191 - 2.3339841366 - - - - - - 0.000000 - 0.000000 - 0.000000 - 0.998689 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.116308 - 0.093644 - 0.173090 - 0.998689 - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - 0.6514231563 - -0.6562495232 - - - - - -2.6456887722 - 3.5754768848 - - - - - - 0.000000 - 0.000000 - 0.000000 - 0.998689 - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 0.998689 - - - - - - - - - - - 0.0000000000 - 0.2496299297 - - - - - - - - - - - - - - - - - - - - - - -1.4121842384 - 2.0011441708 - - - - - 1.5667328835 - -1.4603906870 - - - - - - 0.302631 - 0.302631 - 0.309557 - 0.998689 - - - 0.956527 - 0.956527 - 0.956527 - 1.000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 0.998689 - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - - 0.956527 - 0.956527 - 0.956527 - 0.000000 - - - 0.361867 - 0.361867 - 0.361867 - 0.801471 - - - - - - -0.7488897443 - 1.1025321484 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.476177 - 0.493616 - 0.447871 - 1.000000 - - - - - - - - - - - 0.0000000000 - -1.5211824179 - - - - - - - - - - - - - - - - - - - - - - 0.476177 - 0.493616 - 0.447871 - 1.000000 - - - - - - - - - - - 0.0000000000 - 2.0282433033 - - - - - - - - - - - - - - - - - - - - - - 0.476177 - 0.493616 - 0.447871 - 1.000000 - - - - - - - - - - - 1.7747128010 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - 0.476177 - 0.493616 - 0.447871 - 1.000000 - - - - - - - - - - - -1.7747128010 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6402822733 - 1.5116592646 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0.9831250906 - 1.0006059408 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - 0.0000000000 - 0.2535304129 - - - - - - - - - - - - - - - - - diff --git a/synfig-studio/images/type_angle_icon.sif b/synfig-studio/images/type_angle_icon.sif new file mode 100644 index 0000000..759cf09 --- /dev/null +++ b/synfig-studio/images/type_angle_icon.sif @@ -0,0 +1,1008 @@ + + + Synfig Studio Angle Icon + Placed in the Public Domain in 2009 by David Rylander (rylleman) + + + + + + + + + + + + + -0.1120000035 + 0.4799999893 + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.8799999952 + 0.6240000129 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.8719999790 + -1.6319999695 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6480000019 + -1.4880000353 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.027421 + 0.129412 + 0.372549 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + -0.7360000014 + -1.6959999800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.007782 + 0.062745 + 0.247059 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.6875000000 + -1.4687500000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.6250000000 + -1.5000000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.9279999733 + 0.6560000181 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.007843 + 0.062745 + 0.247059 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.8799999952 + 0.6240000129 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.8719999790 + -1.6319999695 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6480000019 + -1.4880000353 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.007843 + 0.062745 + 0.247059 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.1920000017 + 0.0320000015 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8000000119 + -1.4720000029 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.007843 + 0.062745 + 0.247059 + 1.000000 + + + + + 1.5039999485 + 0.1120000035 + + + + + + + + + + + + + + + + + + + + + + + + 0.3073499501 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000134 + 0.3073499501 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.3073499501 + -0.0000000269 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000037 + -0.3073499501 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/type_blinepoint_icon.sif b/synfig-studio/images/type_blinepoint_icon.sif new file mode 100644 index 0000000..badbf3a --- /dev/null +++ b/synfig-studio/images/type_blinepoint_icon.sif @@ -0,0 +1,66 @@ + + + Untitled0 + + + + + + + + + + + + BLINE +POINT + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Arial + + + + + + + + + + + + + + + + 0.6250000000 + 1.2500000000 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + diff --git a/synfig-studio/images/type_bool_icon.sif b/synfig-studio/images/type_bool_icon.sif new file mode 100644 index 0000000..2f1a95e --- /dev/null +++ b/synfig-studio/images/type_bool_icon.sif @@ -0,0 +1,266 @@ + + + Untitled0 + + + + + + + + + + + + ON +OFF + + + + 0.531049 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.6250000000 + 0.7500000000 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + -0.000000 + 0.217638 + -0.000000 + 1.000000 + + + + + -1.2500000000 + 0.1250000000 + + + + + 1.3750000000 + 1.3750000000 + + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.000000 + -0.000000 + -0.000000 + 1.000000 + + + + + -1.5000000000 + -0.1250000000 + + + + + 1.5000000000 + 0.1250000000 + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.1000000015 + -0.1000000015 + + + + + 0.1000000015 + 0.1000000015 + + + + + + + + + + + + + 0.0000000000 + 0.1250000000 + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/type_canvas_icon.sif b/synfig-studio/images/type_canvas_icon.sif new file mode 100644 index 0000000..99a4c06 --- /dev/null +++ b/synfig-studio/images/type_canvas_icon.sif @@ -0,0 +1,193 @@ + + + Untitled0 + + + + + + + + + + + + + 0.985195 + 0.174900 + -0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + -0.6000000238 + 0.2000000030 + + + + + 0.8000000119 + 0.2000000030 + + + + + 0.8000000119 + -0.2000000030 + + + + + 1.6000000238 + 0.6000000238 + + + + + 0.8000000119 + 1.3999999762 + + + + + 0.8000000119 + 1.0000000000 + + + + + -0.6000000238 + 1.0000000000 + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + -0.0000000000 + + + + + 0.3499999940 + 0.3499999940 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + diff --git a/synfig-studio/images/type_color_icon.sif b/synfig-studio/images/type_color_icon.sif new file mode 100644 index 0000000..d3883d9 --- /dev/null +++ b/synfig-studio/images/type_color_icon.sif @@ -0,0 +1,391 @@ + + + Synfig Studio Color Icon + + + ColorDisc + + + + 1.000000 + 0.000000 + 0.000000 + 1.000000 + + + 1.000000 + 1.000000 + 0.000000 + 1.000000 + + + 0.000000 + 1.000000 + 0.000000 + 1.000000 + + + 0.000000 + 1.000000 + 1.000000 + 1.000000 + + + 0.000000 + 0.000000 + 1.000000 + 1.000000 + + + 1.000000 + 0.000000 + 1.000000 + 1.000000 + + + 1.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + 0.2000000030 + 0.2000000030 + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + 0.0625000000 + 0.1093750000 + + + + + + + + + + + + + + + + + + + + + + 0.333252 + 0.000000 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + -0.1093750000 + -0.1406250000 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + 0.1151999980 + 0.1151999980 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.1000000015 + -0.1000000015 + + + + + 0.1000000015 + 0.1000000015 + + + + + + + + + + diff --git a/synfig-studio/images/type_gradient_icon.sif b/synfig-studio/images/type_gradient_icon.sif new file mode 100644 index 0000000..f3bb405 --- /dev/null +++ b/synfig-studio/images/type_gradient_icon.sif @@ -0,0 +1,548 @@ + + + Synfig Studio Gradient Icon + Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome) + + + + + + + + + + + + + + + + + + + 0.0000000000 + -0.0507061891 + + + + + + + + + + + + + + + + + -0.6323263645 + 7.7884917259 + + + + + -0.3517891169 + -2.5961844921 + + + + + + 0.064115 + 0.064115 + 0.064115 + 1.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + + + + -2.6927909851 + 2.8879861832 + + + + + 2.6927909851 + -2.3365437984 + + + + + -2.7088961601 + -2.5454537868 + + + + + 2.6927909851 + -2.5454537868 + + + + + 3.2120192051 + -3.1153881550 + + + + + -2.1896641254 + -3.1153917313 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.2596159875 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.5961599350 + 2.4484515190 + + + + + 2.5961599350 + -2.7376513481 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -2.1126711369 + -2.2395110130 + + + + + 2.1019213200 + 1.9798951149 + + + + + + + + + + + + + + + + + + + + + + -2.5414354801 + 0.0909172446 + + + + + 2.5787625313 + 0.0909172446 + + + + + + 0.047366 + 0.047366 + 0.047366 + 1.000000 + + + 0.793110 + 0.793110 + 0.793110 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + -0.1014123783 + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + -2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -2.5961599350 + 2.5961599350 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/type_integer_icon.sif b/synfig-studio/images/type_integer_icon.sif new file mode 100644 index 0000000..48fe158 --- /dev/null +++ b/synfig-studio/images/type_integer_icon.sif @@ -0,0 +1,66 @@ + + + Untitled0 + + + + + + + + + + + + 123 +456 + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 1.2656250000 + 1.2968750000 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + diff --git a/synfig-studio/images/type_list_icon.sif b/synfig-studio/images/type_list_icon.sif new file mode 100644 index 0000000..07c99dc --- /dev/null +++ b/synfig-studio/images/type_list_icon.sif @@ -0,0 +1,65 @@ + + + Untitled0 + + + + + + + + + + + + LIST + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.9375000000 + 1.0781250000 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + diff --git a/synfig-studio/images/type_real_icon.sif b/synfig-studio/images/type_real_icon.sif new file mode 100644 index 0000000..783619c --- /dev/null +++ b/synfig-studio/images/type_real_icon.sif @@ -0,0 +1,281 @@ + + + Synfig Studio Canvas Icon + + + Untitled + + + + + + + + + + + + + 1.000000 + 0.300000 + 0.100000 + 1.000000 + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + -0.2187500000 + -0.2812500000 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + -0.2031250000 + -0.2656250000 + + + + + + + + + + + + + + + + + + + + + + 0.2000000030 + 0.2000000030 + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + 0.4215 + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.3281250000 + 0.3828125000 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.2624999881 + -0.8750000000 + + + + + + + + + + + + + + + + + + + + + 3.1415 + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.4046874940 + 0.6234375238 + + + + + 0.5000000000 + 0.5000000000 + + + + + -0.1312499940 + 0.2843750119 + + + + + + + + + + diff --git a/synfig-studio/images/type_segment_icon.sif b/synfig-studio/images/type_segment_icon.sif new file mode 100644 index 0000000..9ec6a04 --- /dev/null +++ b/synfig-studio/images/type_segment_icon.sif @@ -0,0 +1,65 @@ + + + Untitled0 + + + + + + + + + + + + SEG + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 1.0000000000 + 1.2500000000 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + diff --git a/synfig-studio/images/type_string_icon.sif b/synfig-studio/images/type_string_icon.sif new file mode 100644 index 0000000..04f81d5 --- /dev/null +++ b/synfig-studio/images/type_string_icon.sif @@ -0,0 +1,65 @@ + + + Untitled0 + + + + + + + + + + + + STR + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 1.0000000000 + 1.1250000000 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + diff --git a/synfig-studio/images/type_time_icon.sif b/synfig-studio/images/type_time_icon.sif new file mode 100644 index 0000000..04c7bf4 --- /dev/null +++ b/synfig-studio/images/type_time_icon.sif @@ -0,0 +1,1198 @@ + + + Synfig Studio Time Icon + Placed in the Public Domain in 2008 by Carlos López (Genete) + + + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 0.302831 + + + + + + + + + + + 0.0000000000 + -4.1999998093 + + + + + + + + + + + + + 1.0609271526 + 0.4160498679 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.116374 + 0.093697 + 0.173189 + 0.998120 + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.284698 + 0.292440 + 0.430366 + 1.000000 + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + 1.8662887812 + -2.0927865505 + + + + + -1.6451721191 + 2.3339841366 + + + + + + 0.000000 + 0.000000 + 0.000000 + 0.998689 + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.116308 + 0.093644 + 0.173090 + 0.998689 + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + 0.6514231563 + -0.6562495232 + + + + + -2.6456887722 + 3.5754768848 + + + + + + 0.000000 + 0.000000 + 0.000000 + 0.998689 + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 0.998689 + + + + + + + + + + + 0.0000000000 + 0.2496299297 + + + + + + + + + + + + + + + + + + + + + + -1.4121842384 + 2.0011441708 + + + + + 1.5667328835 + -1.4603906870 + + + + + + 0.302631 + 0.302631 + 0.309557 + 0.998689 + + + 0.956527 + 0.956527 + 0.956527 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 0.998689 + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + + 0.956527 + 0.956527 + 0.956527 + 0.000000 + + + 0.361867 + 0.361867 + 0.361867 + 0.801471 + + + + + + -0.7488897443 + 1.1025321484 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.476177 + 0.493616 + 0.447871 + 1.000000 + + + + + + + + + + + 0.0000000000 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + 0.476177 + 0.493616 + 0.447871 + 1.000000 + + + + + + + + + + + 0.0000000000 + 2.0282433033 + + + + + + + + + + + + + + + + + + + + + + 0.476177 + 0.493616 + 0.447871 + 1.000000 + + + + + + + + + + + 1.7747128010 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + 0.476177 + 0.493616 + 0.447871 + 1.000000 + + + + + + + + + + + -1.7747128010 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6402822733 + 1.5116592646 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.9831250906 + 1.0006059408 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + 0.0000000000 + 0.2535304129 + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/images/type_vector_icon.sif b/synfig-studio/images/type_vector_icon.sif new file mode 100644 index 0000000..38030f3 --- /dev/null +++ b/synfig-studio/images/type_vector_icon.sif @@ -0,0 +1,250 @@ + + + Synfig Studio Vector Icon + + + Sphere + + + + + + + + + + + + + 0.898889 + 0.100146 + 0.001630 + 0.986486 + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + -0.2187500000 + -0.2812500000 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + -0.2031250000 + -0.2656250000 + + + + + + + + + + + + + + + + + + + + + + 0.4375000000 + 0.4218750000 + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + 0.1000000015 + 0.1000000015 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + 0.5749999881 + 0.5500000119 + + + + diff --git a/synfig-studio/images/vector_icon.sif b/synfig-studio/images/vector_icon.sif deleted file mode 100644 index 38030f3..0000000 --- a/synfig-studio/images/vector_icon.sif +++ /dev/null @@ -1,250 +0,0 @@ - - - Synfig Studio Vector Icon - - - Sphere - - - - - - - - - - - - - 0.898889 - 0.100146 - 0.001630 - 0.986486 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - -0.2187500000 - -0.2812500000 - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - -0.2031250000 - -0.2656250000 - - - - - - - - - - - - - - - - - - - - - - 0.4375000000 - 0.4218750000 - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - - - - - - - - - - 1.000000 - 1.000000 - 1.000000 - 1.000000 - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - - - - - - - 0.1000000015 - 0.1000000015 - - - - - - - - - - - - - - - - - - - - - - 0.0000000000 - 0.0000000000 - - - - - - - - - - - - - - - 0.5749999881 - 0.5500000119 - - - - diff --git a/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp b/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp index 25345ea..553a517 100644 --- a/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp +++ b/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp @@ -356,7 +356,7 @@ CellRenderer_ValueBase::render_vfunc( property_text()=(Glib::ustring)data.get(Time()).get_string(get_canvas()->rend_desc().get_frame_rate(),App::get_time_format()); break; case ValueBase::TYPE_ANGLE: - property_text()=(Glib::ustring)strprintf("%.2f DEG",(Real)Angle::deg(data.get(Angle())).get()); + property_text()=(Glib::ustring)strprintf("%.2fᵒ",(Real)Angle::deg(data.get(Angle())).get()); break; case ValueBase::TYPE_INTEGER: if(((synfig::ParamDesc)property_param_desc_).get_hint()!="enum") @@ -413,7 +413,7 @@ CellRenderer_ValueBase::render_vfunc( property_text()=(Glib::ustring)data.get(etl::handle())->get_id(); } else - property_text()=""; + property_text()=_(""); break; case ValueBase::TYPE_COLOR: { diff --git a/synfig-studio/src/gui/duck.cpp b/synfig-studio/src/gui/duck.cpp index da571f6..ad6d7f2 100644 --- a/synfig-studio/src/gui/duck.cpp +++ b/synfig-studio/src/gui/duck.cpp @@ -238,7 +238,7 @@ Duck::set_sub_trans_point(const synfig::Point &x, const synfig::Time &time) { synfig::Point closest_point = get_point(); synfig::Real radius = 0.0; - ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline"))); + ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link("bline")); synfig::find_closest_point( (*bline)(time), get_point(), diff --git a/synfig-studio/src/gui/duckmatic.cpp b/synfig-studio/src/gui/duckmatic.cpp index fe2d6a3..adf95f6 100644 --- a/synfig-studio/src/gui/duckmatic.cpp +++ b/synfig-studio/src/gui/duckmatic.cpp @@ -475,17 +475,16 @@ Duckmatic::update_ducks() if ( (*iter)->get_origin_duck()==duck /*&& !duck_is_selected(*iter)*/ ) { synfig::Real radius = 0.0; - ValueNode_BLine::Handle bline(ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")))); + ValueNode_BLine::Handle bline(ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link("bline"))); Real amount = synfig::find_closest_point((*bline)(time), duck->get_point(), radius, bline->get_loop()); - int vertex_amount_index(bline_vertex->get_link_index_from_name("amount")); - ValueNode::Handle vertex_amount_value_node(bline_vertex->get_link(vertex_amount_index)); + ValueNode::Handle vertex_amount_value_node(bline_vertex->get_link("amount")); ValueNode::Handle duck_value_node((*iter)->get_value_desc().get_value_node()); if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(duck_value_node)) { - if (bline_tangent->get_link(bline_tangent->get_link_index_from_name("amount")) == vertex_amount_value_node) + if (bline_tangent->get_link("amount") == vertex_amount_value_node) { switch (bline_tangent->get_type()) { @@ -509,7 +508,7 @@ Duckmatic::update_ducks() } else if (ValueNode_BLineCalcWidth::Handle bline_width = ValueNode_BLineCalcWidth::Handle::cast_dynamic(duck_value_node)) { - if (bline_width->get_link(bline_width->get_link_index_from_name("amount")) == vertex_amount_value_node) + if (bline_width->get_link("amount") == vertex_amount_value_node) (*iter)->set_point(Point((*bline_width)(time, amount).get(Real()), 0)); } } @@ -716,104 +715,6 @@ Duckmatic::signal_edited_selected_ducks() bool Duckmatic::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc) { - if (ValueNode_BLineCalcWidth::Handle bline_width = ValueNode_BLineCalcWidth::Handle::cast_dynamic(value_desc.get_value_node())) - { - Real old_width((*bline_width)(get_time()).get(Real())); - Real new_width(value.mag()); - int scale_index(bline_width->get_link_index_from_name("scale")); - Real scale((*(bline_width->get_link(scale_index)))(get_time()).get(Real())); - return canvas_interface->change_value(synfigapp::ValueDesc(bline_width,scale_index), new_width * scale / old_width); - } - - if (ValueNode_BLineCalcVertex::Handle bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_desc.get_value_node())) - { - ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link("bline")); - Real radius = 0.0; - if (((*(bline_vertex->get_link("loop")))(get_time()).get(bool()))){ - Real amount_old((*(bline_vertex->get_link("amount")))(get_time()).get(Real())); - Real amount_new = synfig::find_closest_point((*bline)(get_time()), value, radius, bline->get_loop()); - Real difference = fmod( fmod(amount_new - amount_old, 1.0) + 1.0 , 1.0); - //fmod is called twice to avoid negative values - if (difference > 0.5) difference=difference-1.0; - return canvas_interface->change_value(synfigapp::ValueDesc(bline_vertex,bline_vertex->get_link_index_from_name("amount")), amount_old+difference); - - } else { - Real amount = synfig::find_closest_point((*bline)(get_time()), value, radius, bline->get_loop()); - return canvas_interface->change_value(synfigapp::ValueDesc(bline_vertex,bline_vertex->get_link_index_from_name("amount")), amount); - } - } - - if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(value_desc.get_value_node())) - { - switch(value_desc.get_value_type()) - { - case ValueBase::TYPE_REAL: - { - Real old_length = (*bline_tangent)(get_time()).get(Real()); - Real new_length = value.mag(); - int scale_index(bline_tangent->get_link_index_from_name("scale")); - int fixed_length_index(bline_tangent->get_link_index_from_name("fixed_length")); - Real scale((*(bline_tangent->get_link(scale_index)))(get_time()).get(Real())); - bool fixed_length((*(bline_tangent->get_link(fixed_length_index)))(get_time()).get(bool())); - if (fixed_length) - return canvas_interface->change_value(synfigapp::ValueDesc(bline_tangent,scale_index), new_length); - if (old_length == 0) - return true; - return canvas_interface->change_value(synfigapp::ValueDesc(bline_tangent,scale_index), new_length * scale / old_length); - } - - case ValueBase::TYPE_ANGLE: - assert(0); // doesn't happen? - break; - - case ValueBase::TYPE_VECTOR: - { - Vector old_tangent = (*bline_tangent)(get_time()).get(Vector()); - Angle old_angle = old_tangent.angle(); - Real old_length = old_tangent.mag(); - Angle new_angle = value.angle(); - Real new_length = value.mag(); - int offset_index(bline_tangent->get_link_index_from_name("offset")); - int scale_index(bline_tangent->get_link_index_from_name("scale")); - int fixed_length_index(bline_tangent->get_link_index_from_name("fixed_length")); - Angle old_offset((*(bline_tangent->get_link(offset_index)))(get_time()).get(Angle())); - Real scale((*(bline_tangent->get_link(scale_index)))(get_time()).get(Real())); - bool fixed_length((*(bline_tangent->get_link(fixed_length_index)))(get_time()).get(bool())); - if (fixed_length) - { - if (!(canvas_interface->change_value(synfigapp::ValueDesc(bline_tangent,scale_index), new_length))) - return false; - } - else if (old_length != 0 && !(canvas_interface->change_value(synfigapp::ValueDesc(bline_tangent,scale_index), new_length * scale / old_length))) - return false; - return canvas_interface->change_value(synfigapp::ValueDesc(bline_tangent,offset_index), old_offset + new_angle - old_angle); - } - default: - break; - } - } - - if (ValueNode_Scale::Handle scale_value_node = ValueNode_Scale::Handle::cast_dynamic(value_desc.get_value_node())) - { - int link_index(scale_value_node->get_link_index_from_name("link")); - if(scale_value_node->is_invertible(get_time())) - return canvas_interface->change_value( - synfigapp::ValueDesc(scale_value_node,link_index), - scale_value_node->get_inverse(get_time(), value) - ); - else - return false; - } - - if (ValueNode_Range::Handle range_value_node = ValueNode_Range::Handle::cast_dynamic(value_desc.get_value_node())) - { - int link_index(range_value_node->get_link_index_from_name("link")); - return canvas_interface->change_value( - synfigapp::ValueDesc(range_value_node,link_index), - range_value_node->get_inverse(get_time(), value) - ); - } - switch(value_desc.get_value_type()) { case ValueBase::TYPE_REAL: @@ -828,33 +729,6 @@ Duckmatic::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc bool Duckmatic::on_duck_angle_changed(const synfig::Angle &rotation,const synfigapp::ValueDesc& value_desc) { - if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(value_desc.get_value_node())) - { - int offset_index(bline_tangent->get_link_index_from_name("offset")); - Angle old_offset((*(bline_tangent->get_link(offset_index)))(get_time()).get(Angle())); - return canvas_interface->change_value(synfigapp::ValueDesc(bline_tangent,offset_index), old_offset + rotation); - } - - if (ValueNode_Scale::Handle scale_value_node = ValueNode_Scale::Handle::cast_dynamic(value_desc.get_value_node())) - { - int link_index(scale_value_node->get_link_index_from_name("link")); - if(scale_value_node->is_invertible(get_time())) - return canvas_interface->change_value( - synfigapp::ValueDesc(scale_value_node,link_index), - scale_value_node->get_inverse(get_time(), rotation) - ); - else - return false; - - } - if (ValueNode_Range::Handle range_value_node = ValueNode_Range::Handle::cast_dynamic(value_desc.get_value_node())) - { - int link_index(range_value_node->get_link_index_from_name("link")); - return canvas_interface->change_value( - synfigapp::ValueDesc(range_value_node,link_index), - range_value_node->get_inverse(get_time(), rotation) - ); - } // \todo will this really always be the case? assert(value_desc.get_value_type() == ValueBase::TYPE_ANGLE); return canvas_interface->change_value(value_desc, value_desc.get_value(get_time()).get(Angle()) + rotation); @@ -1614,7 +1488,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle vertex_duck(last_duck()); vertex_duck->set_type(Duck::TYPE_VERTEX); - if(!add_to_ducks(synfigapp::ValueDesc(value_node,4),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,4,-TANGENT_HANDLE_SCALE),canvas_view,transform_stack)) return false; etl::handle t1_duck(last_duck()); @@ -1627,7 +1501,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_link("split"))(get_time()).get(bool())) { - if(!add_to_ducks(synfigapp::ValueDesc(value_node,5),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,5,TANGENT_HANDLE_SCALE),canvas_view,transform_stack)) return false; t2_duck=last_duck(); t2_duck->set_origin(vertex_duck); @@ -1636,7 +1510,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_origin(vertex_duck); @@ -1791,7 +1665,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_editable()) screen_duck.color=(DUCK_COLOR_NOT_EDITABLE); else if((*iter)->get_tangent()) - screen_duck.color=((*iter)->get_scalar()<0 ? DUCK_COLOR_TANGENT_1 : DUCK_COLOR_TANGENT_2); + { + // Check if we can reach the canvas and set the time to + // evaluate the split value accordingly + synfig::Canvas::Handle canvas_h(get_work_area()->get_canvas()); + synfig::Time time(canvas_h?canvas_h->get_time():synfig::Time(0)); + // Retrieve the split value of the bline point. + synfigapp::ValueDesc& v_d((*iter)->get_value_desc()); + synfig::LinkableValueNode::Handle parent; + if(v_d.parent_is_linkable_value_node()) + { + parent=v_d.get_parent_value_node(); + bool split; + synfig::ValueNode::Handle child(parent->get_link("split")); + if(synfig::ValueNode_Animated::Handle::cast_dynamic(child)) + { + synfig::ValueNode_Animated::Handle animated_child(synfig::ValueNode_Animated::Handle::cast_dynamic(child)); + split=animated_child->new_waypoint_at_time(time).get_value(time).get(split); + } + else if(synfig::ValueNode_Const::Handle::cast_dynamic(child)) + { + synfig::ValueNode_Const::Handle const_child(synfig::ValueNode_Const::Handle::cast_dynamic(child)); + split=(const_child->get_value()).get(split); + } + screen_duck.color=(split? DUCK_COLOR_TANGENT_2 : DUCK_COLOR_TANGENT_1); + } + else + screen_duck.color=DUCK_COLOR_TANGENT_1; + } else if((*iter)->get_type()&Duck::TYPE_VERTEX) screen_duck.color=DUCK_COLOR_VERTEX; else if((*iter)->get_type()&Duck::TYPE_RADIUS) diff --git a/synfig-studio/src/synfigapp/action.cpp b/synfig-studio/src/synfigapp/action.cpp index 21d5f0c..4b89c3e 100644 --- a/synfig-studio/src/synfigapp/action.cpp +++ b/synfig-studio/src/synfigapp/action.cpp @@ -196,6 +196,7 @@ Action::Main::Main() ADD_ACTION(Action::ValueDescConnect); ADD_ACTION(Action::ValueDescDisconnect); ADD_ACTION(Action::ValueDescLink); + ADD_ACTION(Action::ValueDescLinkOpposite); ADD_ACTION(Action::ValueDescBLineLink); ADD_ACTION(Action::WaypointAdd); diff --git a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp index 66c736e..6afde69 100644 --- a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp +++ b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp @@ -7,6 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2007, 2008 Chris Moore +** Copyright (c) 2010 Carlos López ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -34,6 +35,7 @@ #include #include +#include #include @@ -56,13 +58,23 @@ ACTION_SET_PRIORITY(Action::ValueDescLink,0); ACTION_SET_VERSION(Action::ValueDescLink,"0.0"); ACTION_SET_CVS_ID(Action::ValueDescLink,"$Id$"); +ACTION_INIT(Action::ValueDescLinkOpposite); +ACTION_SET_NAME(Action::ValueDescLinkOpposite,"ValueDescLinkOpposite"); +ACTION_SET_LOCAL_NAME(Action::ValueDescLinkOpposite,N_("Link Opposite")); +ACTION_SET_TASK(Action::ValueDescLinkOpposite,"connect"); +ACTION_SET_CATEGORY(Action::ValueDescLinkOpposite,Action::CATEGORY_VALUEDESC); +ACTION_SET_PRIORITY(Action::ValueDescLinkOpposite,0); +ACTION_SET_VERSION(Action::ValueDescLinkOpposite,"0.0"); +ACTION_SET_CVS_ID(Action::ValueDescLinkOpposite,"$Id$"); + /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ /* === M E T H O D S ======================================================= */ -Action::ValueDescLink::ValueDescLink(): poison(false), status_level(0) +Action::ValueDescLink::ValueDescLink(): +poison(false), status_level(0), link_scalar(0.0), link_opposite(false) { } @@ -72,7 +84,7 @@ Action::ValueDescLink::get_param_vocab() ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) - .set_local_name(_("ValueDesc to link")) + .set_local_name(_("ValueDesc to smart link")) .set_requires_multiple() ); @@ -116,6 +128,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param } link_value_node=value_desc.get_value_node(); + link_scalar=value_desc.get_scalar(); status_message = _("Used exported ValueNode ('") + link_value_node->get_id() + _("')."); } else if(value_desc.is_value_node()) @@ -125,6 +138,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param status_level = 1; status_message = _("Using the only available ValueNode."); link_value_node=value_desc.get_value_node(); + link_scalar=value_desc.get_scalar(); } else if(link_value_node->is_exported()) { @@ -138,6 +152,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param status_level = 2; status_message = _("Using the most referenced ValueNode."); link_value_node=value_desc.get_value_node(); + link_scalar=value_desc.get_scalar(); } else if (status_level <= 2) { @@ -152,6 +167,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param status_level = 3; status_message = _("There's a tie for most referenced; using the animated ValueNode."); link_value_node=value_desc.get_value_node(); + link_scalar=value_desc.get_scalar(); } else if(ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()) && !ValueNode_Const::Handle::cast_dynamic(link_value_node)) { @@ -173,6 +189,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param status_level = 4; status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints."); link_value_node=value_desc.get_value_node(); + link_scalar=value_desc.get_scalar(); } else if (status_level <= 4) { @@ -180,6 +197,26 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints."); } } + // If both are Linkable Value Nodes and has waypoint in its children, use the one with more waypoints + else if(LinkableValueNode::Handle::cast_dynamic(link_value_node) && + LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node()) && + LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() != + LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size()) + { + if(LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() < + LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size()) + { + status_level = 4; + status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints."); + link_value_node=value_desc.get_value_node(); + link_scalar=value_desc.get_scalar(); + } + else if (status_level <= 4) + { + status_level = 4; + status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints."); + } + } // Use the one that was least recently changed else if(link_value_node->get_time_last_changed()!=value_desc.get_value_node()->get_time_last_changed()) { @@ -188,6 +225,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param status_level = 5; status_message = _("Everything is tied; using the least recently modified value."); link_value_node=value_desc.get_value_node(); + link_scalar=value_desc.get_scalar(); } else if (status_level <= 5) { @@ -262,25 +300,57 @@ Action::ValueDescLink::prepare() add_action_front(action); } - /* - if(!link_value_node->is_exported()) - { - Action::Handle action(Action::create("ValueNodeAdd")); - - action->set_param("canvas",get_canvas()); - action->set_param("canvas_interface",get_canvas_interface()); - action->set_param("new",link_value_node); - action->set_param("name",strprintf(_("Unnamed%08d"),synfig::UniqueID().get_uid())); - - assert(action->is_ready()); - if(!action->is_ready()) - throw Error(Error::TYPE_NOTREADY); - - add_action_front(action); - } - */ + // Check if the selected link value node is already a scale -1.0 Linkable Value Node + bool link_is_scaled(false); + if(synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)) + { + synfig::ValueNode_Const::Handle scale_vn( + synfig::ValueNode_Const::Handle::cast_dynamic( + synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)->get_link(1) + ) + ); + if(scale_vn) + if((*scale_vn)(synfig::Time(0))==synfig::ValueBase(Real(-1.0))) + link_is_scaled=true; + } std::list::iterator iter; + // Gets the scalar value of the current value node + Real current_scalar(value_desc_list.begin()->get_scalar()); + bool found_inverse(false); + // Check if we are dealing the case of linking differnt types of tangents + for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter) + { + ValueDesc& v_desc(*iter); + // If parent is linkable value node + if(v_desc.parent_is_linkable_value_node()) + { + // if the link describe to any tangent (index 4 or 5), continue + if(v_desc.get_index() == 4 || v_desc.get_index() == 5) + { + synfig::Real iter_scalar=v_desc.get_scalar(); + // Let's compare the sign of scalar of the value node witht the current one + // and remember if a change of sign is seen. + if(iter_scalar*current_scalar < 0) // if they have different signs + { + found_inverse=true; + current_scalar=iter_scalar; + } + } + else // link doesn't describe a tangent + { + found_inverse=false; + break; + } + } + else // parent is not a linkable value node + { + found_inverse=false; + break; + } + } + // found_inverse = true only if all they are tangents and some are inversed tangents + //Noe let's loop throug all the value desc for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter) { ValueDesc& value_desc(*iter); @@ -289,20 +359,182 @@ Action::ValueDescLink::prepare() // don't link it to itself if (value_desc.is_exported()) continue; + // Don't link the selected to itself (maybe it is redundant with the previous check) + if(value_desc.get_value_node() == link_value_node) + continue; + // found_inverse xor link_opposite + // If found_inverse and not link_opposite then scale by -1 first (smart link) + // If found inverse and link_opposite then do a direct link instead + // If not found_inverse and not link_opposite then do a direct link instead + // If not found_inverse and link_opposite then scale by -1 first (smart link) + if((found_inverse && !link_opposite) || (!found_inverse && link_opposite)) + { + //Check if the current value node has opposite scalar than the link + // value node to convert to scale -1.0 before connect. + // Check also if the link value node is NOT also a scale -1 + // And check also if we are linking opposite + if( (value_desc.get_scalar()*link_scalar<0 || link_opposite) && (link_is_scaled==false)) + { + //Let's create a Scale Value Node + synfig::ValueNode::Handle scale_value_node=synfig::LinkableValueNode::create("scale",iter->get_value(time)); + if(!scale_value_node) + throw Error(Error::TYPE_BUG); + scale_value_node->set_parent_canvas(get_canvas()); + //Let's connect the new Scale Value Node to the value node + Action::Handle action1(Action::create("ValueDescConnect")); + if(!action1) + throw Error(Error::TYPE_CRITICAL); + action1->set_param("canvas",get_canvas()); + action1->set_param("canvas_interface",get_canvas_interface()); + action1->set_param("dest",value_desc); + action1->set_param("src",scale_value_node); + assert(action1->is_ready()); + if(!action1->is_ready()) + throw Error(Error::TYPE_NOTREADY); + add_action_front(action1); + + //Let's Connect the link value node to the scale value node link subparam + Action::Handle action2(Action::create("ValueNodeLinkConnect")); + if(!action2) + throw Error(Error::TYPE_CRITICAL); + + action2->set_param("canvas",get_canvas()); + action2->set_param("canvas_interface",get_canvas_interface()); + action2->set_param("parent_value_node",scale_value_node); + action2->set_param("index",0); + action2->set_param("value_node",link_value_node); + assert(action2->is_ready()); + if(!action2->is_ready()) + throw Error(Error::TYPE_NOTREADY); + add_action_front(action2); + + //Let's Set the scale to -1 + Action::Handle action3(Action::create("ValueNodeConstSet")); + if(!action3) + throw Error(Error::TYPE_CRITICAL); + + action3->set_param("canvas",get_canvas()); + action3->set_param("canvas_interface",get_canvas_interface()); + action3->set_param("value_node",synfig::LinkableValueNode::Handle::cast_dynamic(scale_value_node)->get_link(1)); + action3->set_param("new_value",synfig::ValueBase(Real(-1.0))); + assert(action3->is_ready()); + if(!action3->is_ready()) + throw Error(Error::TYPE_NOTREADY); + add_action_front(action3); + } + else if((iter->get_scalar()*link_scalar<0 || link_opposite) && (link_is_scaled==true)) + { + //Let's connect the link value node -> link to the value node + // There is not needed conversion to scale of the value node + // because the link value node is already a scale -1 + Action::Handle action4(Action::create("ValueDescConnect")); + if(!action4) + throw Error(Error::TYPE_CRITICAL); + action4->set_param("canvas",get_canvas()); + action4->set_param("canvas_interface",get_canvas_interface()); + action4->set_param("dest",value_desc); + action4->set_param("src",synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)->get_link(0)); + assert(action4->is_ready()); + if(!action4->is_ready()) + throw Error(Error::TYPE_NOTREADY); + add_action_front(action4); + } + else + { + //Let's connect the link value node to the value node + Action::Handle action(Action::create("ValueDescConnect")); - Action::Handle action(Action::create("ValueDescConnect")); + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("src",link_value_node); + action->set_param("dest",value_desc); - action->set_param("canvas",get_canvas()); - action->set_param("canvas_interface",get_canvas_interface()); - action->set_param("src",link_value_node); - action->set_param("dest",value_desc); + assert(action->is_ready()); + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); - assert(action->is_ready()); - if(!action->is_ready()) - throw Error(Error::TYPE_NOTREADY); + add_action_front(action); + } + } // found inverse + else // Not found inverse so do a regualr link + { + //Let's connect the link value node to the value node + Action::Handle action(Action::create("ValueDescConnect")); - add_action_front(action); + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("src",link_value_node); + action->set_param("dest",value_desc); + + assert(action->is_ready()); + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action_front(action); + } } synfig::info("http://synfig.org/Linking#Tier_%d : %s", status_level, status_message.c_str()); } + + +Action::ValueDescLinkOpposite::ValueDescLinkOpposite() +{ +} + +Action::ParamVocab +Action::ValueDescLinkOpposite::get_param_vocab() +{ + return Action::ValueDescLink::get_param_vocab(); +} + +bool +Action::ValueDescLinkOpposite::is_candidate(const ParamList &x) +{ + // If action parameters are not Value Desc + if(!candidate_check(get_param_vocab(),x)) + return false; + + int total_tangents=0; + ParamList::const_iterator iter; + //Search thru all the Param and pick up the value descriptions + for(iter=x.begin(); iter!=x.end(); iter++) + { + if(iter->first == "value_desc") + { + ValueDesc v_desc(iter->second.get_value_desc()); + // if the value description parent is linkable value node, continue + if(!v_desc.parent_is_linkable_value_node()) + return false; + // if the link describe to any tangent (index 4 or 5), continue + if(v_desc.get_index() != 4 && v_desc.get_index() != 5) + return false; + total_tangents++; + } + } + // If we found two tangents then continue + if(total_tangents!=2) + return false; + // We have reached exactly two tangents + return true; +} + +bool +Action::ValueDescLinkOpposite::set_param(const synfig::String& name, const Action::Param ¶m) +{ + return Action::ValueDescLink::set_param(name,param); +} + +bool +Action::ValueDescLinkOpposite::is_ready()const +{ + return Action::ValueDescLink::is_ready(); +} + +void +Action::ValueDescLinkOpposite::prepare() +{ + // prepare to do a opposite link and reuse the code from ValueDescLink + link_opposite=true; + ValueDescLink::prepare(); +} diff --git a/synfig-studio/src/synfigapp/actions/valuedesclink.h b/synfig-studio/src/synfigapp/actions/valuedesclink.h index a72e78f..e7c4ba6 100644 --- a/synfig-studio/src/synfigapp/actions/valuedesclink.h +++ b/synfig-studio/src/synfigapp/actions/valuedesclink.h @@ -7,6 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2007 Chris Moore +** Copyright (c) 2010 Carlos López ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -46,13 +47,27 @@ class ValueDescLink : public Super { private: - + friend class ValueDescLinkOpposite; + //! List of Value Descriptions retrieved from the action Parameters list + //! to be linked std::list value_desc_list; + //! Selected value node from the Value Descriptions (maybe none) + //! to which the others would link synfig::ValueNode::Handle link_value_node; + //! If poison is true then Link is not possible (two exported value nodes found) bool poison; + //! Used to monitorize the tie decision when selecting the link value node int status_level; + //! Message to inform the status of the tie decision when selecting the link value node synfig::String status_message; + //! Time where the value nodes are evaluated synfig::Time time; + //! Scalar value of the link value node. It is used for linking tangents. + //! In the synfig::ParamDesc list there is a value used to draw the tangents on the + //! canvas that is called scalar + synfig::Real link_scalar; + //! If true then link opposite is being called. + bool link_opposite; public: ValueDescLink(); @@ -68,6 +83,24 @@ public: ACTION_MODULE_EXT }; +class ValueDescLinkOpposite : + public ValueDescLink +{ +public: + + ValueDescLinkOpposite(); + + static ParamVocab get_param_vocab(); + static bool is_candidate(const ParamList &x); + + virtual bool set_param(const synfig::String& name, const Param &); + virtual bool is_ready()const; + + virtual void prepare(); + + ACTION_MODULE_EXT +}; + }; // END of namespace action }; // END of namespace studio diff --git a/synfig-studio/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/src/synfigapp/actions/valuedescset.cpp index 35f6d26..90264c8 100644 --- a/synfig-studio/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/src/synfigapp/actions/valuedescset.cpp @@ -37,9 +37,15 @@ #include "valuedescset.h" #include +#include +#include +#include +#include #include #include +#include #include +#include #include #include @@ -347,6 +353,263 @@ Action::ValueDescSet::prepare() return; } + // Perform reverse manipulations + + // If we are a scale value node, then edit the link + // such that it will scale to our target value + if (ValueNode_Scale::Handle scale_value_node = ValueNode_Scale::Handle::cast_dynamic(value_desc.get_value_node())) + { + if(! scale_value_node->is_invertible(time)) + { + synfig::warning(_("Attempt to edit scale ValueNode with a scale factor of zero.")); + return; + } + + ValueBase new_value; + + if (value.get_type() == ValueBase::TYPE_ANGLE) + new_value = scale_value_node->get_inverse(time, value.get(Angle())); + else if (value.get_type() == ValueBase::TYPE_REAL) + throw Error(_("Inverse manipulation of real scale values not implemented in core.")); + else + new_value = scale_value_node->get_inverse(time, value.get(Vector())); + + Action::Handle action(Action::create("ValueDescSet")); + + if(!action) + throw Error(_("Unable to find action ValueDescSet (bug)")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("new_value",new_value); + action->set_param("value_desc",ValueDesc(scale_value_node, scale_value_node->get_link_index_from_name("link"))); + + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + return; + } + + // Range: disallow values outside the range + if (ValueNode_Range::Handle range_value_node = ValueNode_Range::Handle::cast_dynamic(value_desc.get_value_node())) + { + ValueBase new_value; + + if (value.get_type() == ValueBase::TYPE_ANGLE) + new_value = range_value_node->get_inverse(time, value.get(Angle())); + else if (value.get_type() == ValueBase::TYPE_REAL) + throw Error(_("Inverse manipulation of real range values not implemented in core.")); + else + new_value = range_value_node->get_inverse(time, value.get(Vector())); + + Action::Handle action(Action::create("ValueDescSet")); + + if(!action) + throw Error(_("Unable to find action ValueDescSet (bug)")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("new_value",new_value); + action->set_param("value_desc",ValueDesc(range_value_node,range_value_node->get_link_index_from_name("link"))); + + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + return; + } + + // BlineCalcWidth: modify the scale value node + // so that the target width is achieved + if (ValueNode_BLineCalcWidth::Handle bline_width = ValueNode_BLineCalcWidth::Handle::cast_dynamic(value_desc.get_value_node())) + { + Real old_width((*bline_width)(time).get(Real())); + Real scale((*(bline_width->get_link("scale")))(time).get(Real())); + + ValueBase new_width(value.get(Real()) * scale / old_width); + + Action::Handle action(Action::create("ValueDescSet")); + + if(!action) + throw Error(_("Unable to find action ValueDescSet (bug)")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("new_value",new_width); + action->set_param("value_desc",ValueDesc(bline_width, bline_width->get_link_index_from_name("scale"))); + + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + return; + } + + // BLineCalcVertex: snap the point to the nearest + // allowed position. + if (ValueNode_BLineCalcVertex::Handle bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_desc.get_value_node())) + { + ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link("bline")); + Real radius = 0.0; + ValueBase new_amount; + if (((*(bline_vertex->get_link("loop")))(time).get(bool()))){ + // The bline is looped. Animation may require an amount parameter + // outside the range of 0-1, so make sure that the amount does + // not change drastically. + Real amount_old((*(bline_vertex->get_link("amount")))(time).get(Real())); + Real amount_new = synfig::find_closest_point((*bline)(time), value, radius, bline->get_loop()); + Real difference = fmod( fmod(amount_new - amount_old, 1.0) + 1.0 , 1.0); + //fmod is called twice to avoid negative values + if (difference > 0.5) difference=difference-1.0; + + new_amount = amount_old+difference; + } else { + new_amount = synfig::find_closest_point((*bline)(time), value, radius, bline->get_loop()); + } + + Action::Handle action(Action::create("ValueDescSet")); + + if(!action) + throw Error(_("Unable to find action ValueDescSet (bug)")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("new_value",new_amount); + action->set_param("value_desc",ValueDesc(bline_vertex, bline_vertex->get_link_index_from_name("amount"))); + + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + return; + } + + + // BLineCalcTangent: adjust scale and offset + // to achieve the desired tangent + if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(value_desc.get_value_node())) + { + ValueBase new_scale; + ValueDesc scale_value_desc(bline_tangent,bline_tangent->get_link_index_from_name("scale")); + ValueDesc offset_value_desc(bline_tangent,bline_tangent->get_link_index_from_name("offset")); + + switch(value_desc.get_value_type()) + { + case ValueBase::TYPE_REAL: + { + Real old_length = (*bline_tangent)(time).get(Real()); + Real new_length = value.get(Vector()).mag(); + Real scale((*(bline_tangent->get_link("scale")))(time).get(Real())); + bool fixed_length((*(bline_tangent->get_link("fixed_length")))(time).get(bool())); + + if (fixed_length) + { + new_scale = new_length; + break; + } + if (old_length == 0) + return; + new_scale = new_length * scale / old_length; + } + + case ValueBase::TYPE_VECTOR: + { + Vector old_tangent = (*bline_tangent)(time).get(Vector()); + Angle old_angle = old_tangent.angle(); + Real old_length = old_tangent.mag(); + Angle new_angle = value.get(Vector()).angle(); + Real new_length = value.get(Vector()).mag(); + Angle old_offset((*(bline_tangent->get_link("offset")))(time).get(Angle())); + Real scale((*(bline_tangent->get_link("scale")))(time).get(Real())); + bool fixed_length((*(bline_tangent->get_link("fixed_length")))(time).get(bool())); + if (fixed_length) + { + new_scale = new_length; + break; + } + if (old_length != 0) + { + new_scale = new_length * scale / old_length; + + + Action::Handle action(Action::create("ValueDescSet")); + + if(!action) + throw Error(_("Unable to find action ValueDescSet (bug)")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("new_value", ValueBase(old_offset + new_angle - old_angle)); + action->set_param("value_desc",offset_value_desc); + + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + } + } + break; + + case ValueBase::TYPE_ANGLE: + { + Angle old_angle = (*bline_tangent)(time).get(Angle()); + Angle new_angle = value.get(Vector()).angle(); + Angle old_offset((*(bline_tangent->get_link("offset")))(time).get(Angle())); + + + Action::Handle action(Action::create("ValueDescSet")); + + if(!action) + throw Error(_("Unable to find action ValueDescSet (bug)")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("new_value", ValueBase(old_offset + new_angle - old_angle)); + action->set_param("value_desc",offset_value_desc); + + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + return; + } + + default: + break; + } + + if (new_scale) + { + Action::Handle action(Action::create("ValueDescSet")); + + if(!action) + throw Error(_("Unable to find action ValueDescSet (bug)")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("new_value",new_scale); + action->set_param("value_desc",scale_value_desc); + + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + } + return; + } + + // end reverse manipulations + + + // If we are merging the tangents of a BLinePoint, // we must also set the second tangent for things // to interpolate properly diff --git a/synfig-studio/src/synfigapp/value_desc.h b/synfig-studio/src/synfigapp/value_desc.h index 99b4604..56501a2 100644 --- a/synfig-studio/src/synfigapp/value_desc.h +++ b/synfig-studio/src/synfigapp/value_desc.h @@ -59,6 +59,9 @@ class ValueDesc // Info for exported ValueNode synfig::Canvas::Handle canvas; + // Info for visual editon + synfig::Real scalar; + public: bool operator==(const ValueDesc &rhs)const { @@ -70,7 +73,9 @@ public: return true; if((canvas||rhs.canvas) && canvas!=rhs.canvas) return false; - if((parent_value_node||rhs.parent_value_node) && parent_value_node!=rhs.parent_value_node) + if((parent_value_node||rhs.parent_value_node) && (parent_value_node!=rhs.parent_value_node)) + return false; + if(scalar!=rhs.scalar) return false; if(index!=rhs.index) return false; @@ -90,9 +95,10 @@ public: layer(layer), name(param_name) { } - ValueDesc(synfig::LinkableValueNode::Handle parent_value_node,int index): + ValueDesc(synfig::LinkableValueNode::Handle parent_value_node,int index, synfig::Real s=1.0): parent_value_node(parent_value_node), - index(index) { } + index(index), + scalar(s) { } // ValueDesc(synfig::LinkableValueNode::Handle parent_value_node,const synfig::String& param_name): // parent_value_node(parent_value_node), @@ -131,6 +137,7 @@ public: synfig::ValueNode::Handle get_parent_value_node()const { assert(parent_is_value_node()); return parent_value_node; } int get_index()const { assert(parent_is_linkable_value_node()); return index; } + synfig::Real get_scalar()const { assert(parent_is_linkable_value_node()); return scalar; } synfig::String get_name()const { assert(parent_is_linkable_value_node()); return (synfig::LinkableValueNode::Handle::cast_reinterpret(parent_value_node))->link_name(index); } synfig::Time get_waypoint_time()const { assert(parent_is_waypoint()); return waypoint_time; } @@ -194,6 +201,7 @@ public: synfig::String get_description(bool show_exported_name = true)const; + }; // END of class ValueDesc }; // END of namespace synfigapp_instance