X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fimages%2FMakefile.am;h=5711c7287762eb9408766a247560833e36cad3e0;hb=bb8e0ba8c1f78db22f6c8b8ce4e9b4f685749092;hp=0d703f3558203ba56e0e087fecb17cb41b9a48ed;hpb=1478153109643a4c61f209d6cc22ae537d3becde;p=synfig.git

diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index 0d703f3..5711c72 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -6,22 +6,24 @@ EXT = @imageext@
 EXTRA_DIST = \
 	installer_logo.sif \
 	installer_logo_osx.sif \
-	splash_screen.sifz \
-	splash_screen-0.61.09.sif\
+	splash_screen-0.62.01.sif \
+	splash_screen-0.62.01-2.sif \
+	splash_screen-0.62.00.sif \
+	splash_screen-0.61.09.sif \
 	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 \
@@ -29,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 \
@@ -43,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 \
@@ -88,13 +91,65 @@ EXTRA_DIST = \
 	incr_resolution_icon.sif \
 	decr_resolution_icon.sif \
 	render_options_icon.sif \
-	preview_options_icon.sif
+	preview_options_icon.sif \
+	layer_blur_blur_icon.sif \
+	layer_blur_motion_icon.sif \
+	layer_blur_radial_icon.sif \
+	layer_distortion_curvewarp_icon.sif \
+	layer_distortion_insideout_icon.sif \
+	layer_distortion_noise_icon.sif \
+	layer_distortion_spherize_icon.sif \
+	layer_distortion_stretch_icon.sif \
+	layer_distortion_twirl_icon.sif \
+	layer_distortion_warp_icon.sif \
+	layer_example_filledrectangle_icon.sif \
+	layer_example_metaballs_icon.sif \
+	layer_example_simplecircle_icon.sif \
+	layer_filter_clamp_icon.sif \
+	layer_filter_colorcorrect_icon.sif \
+	layer_filter_halftone2_icon.sif \
+	layer_filter_halftone3_icon.sif \
+	layer_filter_lumakey_icon.sif \
+	layer_fractal_julia_icon.sif \
+	layer_fractal_mandelbrot_icon.sif \
+	layer_geometry_checkerboard_icon.sif \
+	layer_geometry_circle_icon.sif \
+	layer_geometry_outline_icon.sif \
+	layer_geometry_polygon_icon.sif \
+	layer_geometry_rectangle_icon.sif \
+	layer_geometry_region_icon.sif \
+	layer_geometry_solidcolor_icon.sif \
+	layer_geometry_star_icon.sif \
+	layer_gradient_conical_icon.sif \
+	layer_gradient_curve_icon.sif \
+	layer_gradient_lineal_icon.sif \
+	layer_gradient_noise_icon.sif \
+	layer_gradient_radial_icon.sif \
+	layer_gradient_spiral_icon.sif \
+	layer_other_duplicate_icon.sif \
+	layer_other_importimage_icon.sif \
+	layer_other_pastecanvas_icon.sif \
+	layer_other_plant_icon.sif \
+	layer_other_supersample_icon.sif \
+	layer_other_text_icon.sif \
+	layer_other_timeloop_icon.sif \
+	layer_other_xorpattern_icon.sif \
+	layer_stylize_bevel_icon.sif \
+	layer_stylize_shade_icon.sif \
+	layer_transform_rotate_icon.sif \
+	layer_transform_translate_icon.sif \
+	layer_transform_zoom_icon.sif \
+	action_set_layer_description_icon.sif \
+	action_add_to_group_icon.sif \
+	action_remove_from_group_icon.sif \
+	action_export_icon.sif \
+	action_unexport_icon.sif
 
 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) \
@@ -123,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) \
@@ -145,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) \
@@ -172,7 +228,59 @@ IMAGES = \
 	incr_resolution_icon.$(EXT) \
 	decr_resolution_icon.$(EXT) \
 	render_options_icon.$(EXT) \
-	preview_options_icon.$(EXT)
+	preview_options_icon.$(EXT) \
+	layer_blur_blur_icon.$(EXT) \
+	layer_blur_motion_icon.$(EXT) \
+	layer_blur_radial_icon.$(EXT) \
+	layer_distortion_curvewarp_icon.$(EXT) \
+	layer_distortion_insideout_icon.$(EXT) \
+	layer_distortion_noise_icon.$(EXT) \
+	layer_distortion_spherize_icon.$(EXT) \
+	layer_distortion_stretch_icon.$(EXT) \
+	layer_distortion_twirl_icon.$(EXT) \
+	layer_distortion_warp_icon.$(EXT) \
+	layer_example_filledrectangle_icon.$(EXT) \
+	layer_example_metaballs_icon.$(EXT) \
+	layer_example_simplecircle_icon.$(EXT) \
+	layer_filter_clamp_icon.$(EXT) \
+	layer_filter_colorcorrect_icon.$(EXT) \
+	layer_filter_halftone2_icon.$(EXT) \
+	layer_filter_halftone3_icon.$(EXT) \
+	layer_filter_lumakey_icon.$(EXT) \
+	layer_fractal_julia_icon.$(EXT) \
+	layer_fractal_mandelbrot_icon.$(EXT) \
+	layer_geometry_checkerboard_icon.$(EXT) \
+	layer_geometry_circle_icon.$(EXT) \
+	layer_geometry_outline_icon.$(EXT) \
+	layer_geometry_polygon_icon.$(EXT) \
+	layer_geometry_rectangle_icon.$(EXT) \
+	layer_geometry_region_icon.$(EXT) \
+	layer_geometry_solidcolor_icon.$(EXT) \
+	layer_geometry_star_icon.$(EXT) \
+	layer_gradient_conical_icon.$(EXT) \
+	layer_gradient_curve_icon.$(EXT) \
+	layer_gradient_lineal_icon.$(EXT) \
+	layer_gradient_noise_icon.$(EXT) \
+	layer_gradient_radial_icon.$(EXT) \
+	layer_gradient_spiral_icon.$(EXT) \
+	layer_other_duplicate_icon.$(EXT) \
+	layer_other_importimage_icon.$(EXT) \
+	layer_other_pastecanvas_icon.$(EXT) \
+	layer_other_plant_icon.$(EXT) \
+	layer_other_supersample_icon.$(EXT) \
+	layer_other_text_icon.$(EXT) \
+	layer_other_timeloop_icon.$(EXT) \
+	layer_other_xorpattern_icon.$(EXT) \
+	layer_stylize_bevel_icon.$(EXT) \
+	layer_stylize_shade_icon.$(EXT) \
+	layer_transform_rotate_icon.$(EXT) \
+	layer_transform_translate_icon.$(EXT) \
+	layer_transform_zoom_icon.$(EXT) \
+	action_set_layer_description_icon.$(EXT) \
+	action_add_to_group_icon.$(EXT) \
+	action_remove_from_group_icon.$(EXT) \
+	action_export_icon.$(EXT) \
+	action_unexport_icon.$(EXT)
 
 
 MAINTAINERCLEANFILES = \
@@ -253,6 +361,19 @@ keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
+if DEVELOPMENT_SNAPSHOT
+splash_screen_development.sif: $(srcdir)/splash_screen_development.sif.in
+	export commit_id=`git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -6` && \
+	export commit_date=`git show --pretty=format:%ci HEAD |  head -c 10` && \
+	export branch=`git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//` && \
+	export branch=`echo $$branch | egrep origin/master > /dev/null && echo master || echo $$branch | cut -d ' ' -f 1 | sed -e 's/.*\///'` && \
+	sed "s|%branch%|$$branch|" $< | sed "s|%commit_date%|$$commit_date|" | sed "s|%commit_id%|$$commit_id|" > $@
+splash_screen.$(EXT): $(srcdir)/splash_screen_development.sif
+	$(SYNFIG) -q $< -o $@ --time 0
+else
+splash_screen.$(EXT): $(srcdir)/splash_screen-$(PACKAGE_VERSION).sif
+	$(SYNFIG) -q $< -o $@ --time 0
+endif
 
 if !WIN32_PKG
 if !MACOSX_PKG