From: dooglus Date: Fri, 15 Feb 2008 22:20:03 +0000 (+0000) Subject: Add a 'show all child layers' button to the layer dialog when a single pastecanvas... X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=6058f1f8af684257c314a78cc0a24ced57bf3168;p=synfig.git Add a 'show all child layers' button to the layer dialog when a single pastecanvas layer is selected. Please, someone, contribute an icon for this to the patch tracker. git-svn-id: http://svn.voria.com/code@1703 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index 88714ba..9816c76 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -2,8 +2,8 @@ SYNFIG=synfig EXT=@imageext@ -EXTRA_DIST=installer_logo.sif installer_logo_osx.sif splash_screen.sif about_icon.sif angle_icon.sif bline_icon.sif blinepoint_icon.sif bool_icon.sif canvas_icon.sif canvas_pointer_icon.sif children_icon.sif circle_icon.sif clear_redo_icon.sif clear_undo_icon.sif color_icon.sif curves_icon.sif draw_icon.sif duplicate_icon.sif encapsulate_icon.sif eyedrop_icon.sif fill_icon.sif gradient_icon.sif group_icon.sif info_icon.sif integer_icon.sif keyframe_icon.sif keyframe_lock_icon.sif layer_icon.sif list_icon.sif logo.sif meta_data_icon.sif mirror_icon.sif navigator_icon.sif normal_icon.sif pastecanvas_icon.sif polygon_icon.sif real_icon.sif rectangle_icon.sif rotate_icon.sif saveall_icon.sif scale_icon.sif segment_icon.sif sif_icon.sif sketch_icon.sif smooth_move_icon.sif string_icon.sif swap_colors_icon.sif synfig_icon.sif time_icon.sif time_track_icon.sif valuenode_icon.sif vector_icon.sif wallpaper.sif width_icon.sif zoom_icon.sif rename_icon.sif -IMAGES=installer_logo.$(EXT) installer_logo_osx.$(EXT) mirror_icon.$(EXT) 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) 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) 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) eyedrop_icon.$(EXT) about_icon.$(EXT) splash_screen.$(EXT) canvas_icon.$(EXT) vector_icon.$(EXT) real_icon.$(EXT) color_icon.$(EXT) valuenode_icon.$(EXT) polygon_icon.$(EXT) bline_icon.$(EXT) layer_icon.$(EXT) duplicate_icon.$(EXT) encapsulate_icon.$(EXT) gradient_icon.$(EXT) keyframe_lock_all.$(EXT) keyframe_lock_past.$(EXT) keyframe_lock_future.$(EXT) keyframe_lock_none.$(EXT) rename_icon.$(EXT) +EXTRA_DIST=installer_logo.sif installer_logo_osx.sif splash_screen.sif about_icon.sif angle_icon.sif bline_icon.sif blinepoint_icon.sif bool_icon.sif canvas_icon.sif canvas_pointer_icon.sif children_icon.sif circle_icon.sif clear_redo_icon.sif clear_undo_icon.sif color_icon.sif curves_icon.sif draw_icon.sif duplicate_icon.sif encapsulate_icon.sif eyedrop_icon.sif fill_icon.sif gradient_icon.sif group_icon.sif info_icon.sif integer_icon.sif keyframe_icon.sif keyframe_lock_icon.sif layer_icon.sif list_icon.sif logo.sif meta_data_icon.sif mirror_icon.sif navigator_icon.sif normal_icon.sif pastecanvas_icon.sif polygon_icon.sif real_icon.sif rectangle_icon.sif rotate_icon.sif saveall_icon.sif scale_icon.sif segment_icon.sif select_all_child_layers_icon.sif sif_icon.sif sketch_icon.sif smooth_move_icon.sif string_icon.sif swap_colors_icon.sif synfig_icon.sif time_icon.sif time_track_icon.sif valuenode_icon.sif vector_icon.sif wallpaper.sif width_icon.sif zoom_icon.sif rename_icon.sif +IMAGES=installer_logo.$(EXT) installer_logo_osx.$(EXT) mirror_icon.$(EXT) 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) 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) 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) eyedrop_icon.$(EXT) about_icon.$(EXT) splash_screen.$(EXT) canvas_icon.$(EXT) vector_icon.$(EXT) real_icon.$(EXT) color_icon.$(EXT) valuenode_icon.$(EXT) polygon_icon.$(EXT) bline_icon.$(EXT) layer_icon.$(EXT) duplicate_icon.$(EXT) encapsulate_icon.$(EXT) gradient_icon.$(EXT) keyframe_lock_all.$(EXT) keyframe_lock_past.$(EXT) keyframe_lock_future.$(EXT) keyframe_lock_none.$(EXT) rename_icon.$(EXT) MAINTAINERCLEANFILES=Makefile.in CLEANFILES=$(IMAGES) images.nsh unimages.nsh installer_logo.bmp sif_icon.ico synfig_icon.ico icons.nsh unicons.nsh diff --git a/synfig-studio/trunk/images/select_all_child_layers_icon.sif b/synfig-studio/trunk/images/select_all_child_layers_icon.sif new file mode 100644 index 0000000..6a4f3a1 --- /dev/null +++ b/synfig-studio/trunk/images/select_all_child_layers_icon.sif @@ -0,0 +1,2768 @@ + + + Untitled1 + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.1000000015 + -0.1000000015 + + + + + + + + + + + + + + + + + + + + + + -0.4000000060 + 0.4000000060 + + + + + -0.4000000060 + -0.4000000060 + + + + + 0.4000000060 + -0.4000000060 + + + + + 0.4000000060 + 0.4000000060 + + + + + + + + + + + + + + + + + + 0.1000000015 + 0.1000000015 + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + -0.4000000060 + 0.4000000060 + + + + + -0.4000000060 + -0.4000000060 + + + + + 0.4000000060 + -0.4000000060 + + + + + 0.4000000060 + 0.4000000060 + + + + + + + + + + + + + + + + + + 1.000000 + 0.900000 + 0.600000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + -0.3000000119 + 0.3000000119 + + + + + -0.3000000119 + -0.3000000119 + + + + + 0.3000000119 + -0.3000000119 + + + + + 0.3000000119 + 0.3000000119 + + + + + + + + Untitled0 + + + + + + + + + + + + + + + + + + + + 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.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.850000 + 0.640000 + 0.200000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.850000 + 0.640000 + 0.200000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.2500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + 0.3589743674 + -0.1217948720 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.850000 + 0.640000 + 0.200000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + 0.6217948794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7500000000 + -0.3782051206 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.850000 + 0.640000 + 0.200000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.2500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.7500000000 + -0.7500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + + + + + + + -0.7500000000 + 0.2500000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -0.7812500000 + 0.7812500000 + + + + + 0.7812500000 + -0.7812500000 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -0.5208333135 + 0.5208333135 + + + + + 0.5208333135 + -0.5208333135 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + -0.2604166567 + 0.2604166567 + + + + + 0.2604166567 + -0.2604166567 + + + + + + + + + + + + + + + + + + + + + + + + + + + + L + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.9765625000 + 0.7324218750 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.5208333135 + -0.5208333135 + + + + + + + + + + + + + + + + + + + + + + + + C + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.9765625000 + 0.7324218750 + + + + + 0.5000000000 + 0.5000000000 + + + + + -0.5208333135 + -0.5208333135 + + + + + + + + + + + + + + + + + + + + + + + + A + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.9765625000 + 0.7324218750 + + + + + 0.5000000000 + 0.5000000000 + + + + + 0.5208333135 + 0.5208333135 + + + + + + + + + + + + + + + + + + + + + + + + S + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + Sans Serif + + + + + + + + + + + + + + + + 0.9765625000 + 0.7324218750 + + + + + 0.5000000000 + 0.5000000000 + + + + + -0.5208333135 + 0.5208333135 + + + + + + + + + + + + + diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 843b064..912487e 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -163,6 +163,7 @@ IconController::IconController(const synfig::String& /*basepath*/) INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap")); INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate")); INIT_STOCK_ICON(encapsulate,"encapsulate_icon."IMAGE_EXT,_("Encapsulate")); + INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers")); INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack")); INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack")); diff --git a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp index e42d4f8..954b858 100644 --- a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp @@ -231,7 +231,7 @@ LayerActionManager::refresh() } - String ui_info; + String ui_info, ui_toolbar_info; action_paste_->set_sensitive(!clipboard_.empty()); action_group_->add(action_paste_); @@ -287,6 +287,7 @@ LayerActionManager::refresh() { action_group_->add(Gtk::Action::create( "select-all-child-layers", + Gtk::StockID("synfig-select_all_child_layers"), _("Select All Child Layers") ), sigc::bind( @@ -298,13 +299,26 @@ LayerActionManager::refresh() ) ); ui_info+=""; + ui_toolbar_info+=""; } handle::cast_static(get_canvas_interface()->get_instance())-> add_actions_to_group(action_group_, ui_info, param_list, synfigapp::Action::CATEGORY_LAYER); } } - ui_info=""+ui_info+""; + ui_info=("" + "" + "" + + ui_info + + "" + "" + "" + "" + "" + "" + "" + + ui_toolbar_info + + ""); popup_id_=get_ui_manager()->add_ui_from_string(ui_info); #ifdef ONE_ACTION_GROUP #else