From: Carlos Lopez Date: Tue, 12 Oct 2010 16:09:50 +0000 (+0200) Subject: Merge branch 'zelgadis_master'. Resolved conflicts manually X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=commitdiff_plain;h=25328bfe03255756921ee3a8aba2a6e37a7955fe;hp=-c Merge branch 'zelgadis_master'. Resolved conflicts manually --- 25328bfe03255756921ee3a8aba2a6e37a7955fe diff --combined synfig-studio/images/Makefile.am index 4c014ff,5711c72..46eb1e6 --- a/synfig-studio/images/Makefile.am +++ b/synfig-studio/images/Makefile.am @@@ -6,32 -6,73 +6,32 @@@ EXT = @imageext EXTRA_DIST = \ installer_logo.sif \ installer_logo_osx.sif \ - splash_screen1.sif \ - splash_screen2.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 \ - type_angle_icon.sif \ - bline_icon.sif \ - type_blinepoint_icon.sif \ - type_bool_icon.sif \ - canvas_icon.sif \ - type_canvas_icon.sif \ - children_icon.sif \ - circle_icon.sif \ clear_redo_icon.sif \ clear_undo_icon.sif \ - type_color_icon.sif \ curves_icon.sif \ - draw_icon.sif \ duplicate_icon.sif \ encapsulate_icon.sif \ - eyedrop_icon.sif \ - fill_icon.sif \ - gradient_icon.sif \ - type_gradient_icon.sif \ - group_icon.sif \ - info_icon.sif \ - type_integer_icon.sif \ - keyframe_icon.sif \ keyframe_lock_icon.sif \ - layer_icon.sif \ - type_list_icon.sif \ logo.sif \ - meta_data_icon.sif \ - mirror_icon.sif \ - navigator_icon.sif \ - normal_icon.sif \ pastecanvas_icon.sif \ - polygon_icon.sif \ - type_real_icon.sif \ - rectangle_icon.sif \ - rotate_icon.sif \ saveall_icon.sif \ - scale_icon.sif \ - type_segment_icon.sif \ select_all_child_layers_icon.sif \ sif_icon.sif \ - sketch_icon.sif \ - smooth_move_icon.sif \ - type_string_icon.sif \ reset_colors_icon.sif \ swap_colors_icon.sif \ synfig_icon.sif \ synfig_icon.svg \ - type_time_icon.sif \ - time_track_icon.sif \ valuenode_icon.sif \ - type_vector_icon.sif \ wallpaper.sif \ - width_icon.sif \ - zoom_icon.sif \ rename_icon.sif \ plant_icon.sif \ - text_icon.sif \ - polyline_icon.sif \ - star_icon.sif \ set_fill_color.sif \ set_outline_color.sif \ seek_begin.sif \ @@@ -51,12 -92,6 +51,12 @@@ decr_resolution_icon.sif \ render_options_icon.sif \ preview_options_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 + \ layer_blur_blur_icon.sif \ layer_blur_motion_icon.sif \ layer_blur_radial_icon.sif \ @@@ -104,78 -139,77 +104,77 @@@ 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 + \ + tool_bline_icon.sif \ + tool_circle_icon.sif \ + tool_draw_icon.sif \ + tool_eyedrop_icon.sif \ + tool_fill_icon.sif \ + tool_gradient_icon.sif \ + tool_mirror_icon.sif \ + tool_normal_icon.sif \ + tool_polyline_icon.sif \ + tool_rectangle_icon.sif \ + tool_rotate_icon.sif \ + tool_scale_icon.sif \ + tool_sketch_icon.sif \ + tool_smooth_move_icon.sif \ + tool_star_icon.sif \ + tool_text_icon.sif \ + tool_width_icon.sif \ + tool_zoom_icon.sif \ + \ + type_angle_icon.sif \ + type_blinepoint_icon.sif \ + type_bool_icon.sif \ + type_canvas_icon.sif \ + type_color_icon.sif \ + type_gradient_icon.sif \ + type_integer_icon.sif \ + type_list_icon.sif \ + type_real_icon.sif \ + type_segment_icon.sif \ + type_string_icon.sif \ + type_time_icon.sif \ + type_vector_icon.sif \ + \ + canvas_icon.sif \ + children_icon.sif \ + curves_icon.sif \ + group_icon.sif \ + history_icon.sif \ + info_icon.sif \ + keyframe_icon.sif \ + layer_icon.sif \ + meta_data_icon.sif \ + navigator_icon.sif \ + palette_icon.sif \ + params_icon.sif \ + time_track_icon.sif IMAGES = \ installer_logo.$(EXT) \ installer_logo_osx.$(EXT) \ - mirror_icon.$(EXT) \ - type_time_icon.$(EXT) \ - time_track_icon.$(EXT) \ - curves_icon.$(EXT) \ pastecanvas_icon.$(EXT) \ - group_icon.$(EXT) \ clear_redo_icon.$(EXT) \ clear_undo_icon.$(EXT) \ - navigator_icon.$(EXT) \ - info_icon.$(EXT) \ - zoom_icon.$(EXT) \ - meta_data_icon.$(EXT) \ - children_icon.$(EXT) \ - keyframe_icon.$(EXT) \ reset_colors_icon.$(EXT) \ swap_colors_icon.$(EXT) \ - rotate_icon.$(EXT) \ - scale_icon.$(EXT) \ - smooth_move_icon.$(EXT) \ - width_icon.$(EXT) \ - rectangle_icon.$(EXT) \ - circle_icon.$(EXT) \ - draw_icon.$(EXT) \ - sketch_icon.$(EXT) \ - fill_icon.$(EXT) \ - normal_icon.$(EXT) \ select_all_child_layers_icon.$(EXT) \ sif_icon.$(EXT) \ synfig_icon.$(EXT) \ saveall_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_screen1.$(EXT) \ - splash_screen2.$(EXT) \ + splash_screen.$(EXT) \ - canvas_icon.$(EXT) \ - type_vector_icon.$(EXT) \ - type_real_icon.$(EXT) \ - type_color_icon.$(EXT) \ valuenode_icon.$(EXT) \ - polygon_icon.$(EXT) \ - bline_icon.$(EXT) \ - layer_icon.$(EXT) \ 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) \ keyframe_lock_none.$(EXT) \ rename_icon.$(EXT) \ plant_icon.$(EXT) \ - text_icon.$(EXT) \ - polyline_icon.$(EXT) \ - star_icon.$(EXT) \ set_fill_color.$(EXT) \ set_outline_color.$(EXT) \ seek_begin.$(EXT) \ @@@ -195,12 -229,6 +194,12 @@@ decr_resolution_icon.$(EXT) \ render_options_icon.$(EXT) \ preview_options_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) \ + \ layer_blur_blur_icon.$(EXT) \ layer_blur_motion_icon.$(EXT) \ layer_blur_radial_icon.$(EXT) \ @@@ -248,53 -276,12 +247,53 @@@ 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) - + \ + tool_bline_icon.$(EXT) \ + tool_circle_icon.$(EXT) \ + tool_draw_icon.$(EXT) \ + tool_eyedrop_icon.$(EXT) \ + tool_fill_icon.$(EXT) \ + tool_gradient_icon.$(EXT) \ + tool_mirror_icon.$(EXT) \ + tool_normal_icon.$(EXT) \ + tool_polyline_icon.$(EXT) \ + tool_rectangle_icon.$(EXT) \ + tool_rotate_icon.$(EXT) \ + tool_scale_icon.$(EXT) \ + tool_sketch_icon.$(EXT) \ + tool_smooth_move_icon.$(EXT) \ + tool_star_icon.$(EXT) \ + tool_text_icon.$(EXT) \ + tool_width_icon.$(EXT) \ + tool_zoom_icon.$(EXT) \ + \ + type_angle_icon.$(EXT) \ + type_blinepoint_icon.$(EXT) \ + type_bool_icon.$(EXT) \ + type_canvas_icon.$(EXT) \ + type_color_icon.$(EXT) \ + type_gradient_icon.$(EXT) \ + type_integer_icon.$(EXT) \ + type_list_icon.$(EXT) \ + type_real_icon.$(EXT) \ + type_segment_icon.$(EXT) \ + type_string_icon.$(EXT) \ + type_time_icon.$(EXT) \ + type_vector_icon.$(EXT) \ + \ + canvas_icon.$(EXT) \ + children_icon.$(EXT) \ + curves_icon.$(EXT) \ + group_icon.$(EXT) \ + history_icon.$(EXT) \ + info_icon.$(EXT) \ + keyframe_icon.$(EXT) \ + layer_icon.$(EXT) \ + meta_data_icon.$(EXT) \ + navigator_icon.$(EXT) \ + palette_icon.$(EXT) \ + params_icon.$(EXT) \ + time_track_icon.$(EXT) MAINTAINERCLEANFILES = \ Makefile.in @@@ -374,6 -361,19 +373,19 @@@ keyframe_lock_none.$(EXT): $(srcdir)/ke 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