Include tooltip on the 'show all child layers' toolbar button.

[synfig.git] / synfig-studio / trunk / src / gtkmm / layeractionmanager.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
index ea27c87..86addd6 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -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,30 +287,38 @@ LayerActionManager::refresh()
                        {
                                action_group_->add(Gtk::Action::create(
                                        "select-all-child-layers",
-                                       _("Select All Child Layers")
-                               ),
-                                       sigc::bind(
-                                               sigc::mem_fun(
-                                                       *layer_tree_,
-                                                       &studio::LayerTree::select_all_children_layers
-                                               ),
-                                               Layer::LooseHandle(layer)
-                                       )
-                               );
+                                       Gtk::StockID("synfig-select_all_child_layers"),
+                                       _("Select All Child Layers"),
+                                       _("Select All Child Layers")),
+                                       sigc::bind(sigc::mem_fun(*layer_tree_,
+                                                                                        &studio::LayerTree::select_all_children_layers),
+                                                          Layer::LooseHandle(layer)));
                                ui_info+="<menuitem action='select-all-child-layers'/>";
+                               ui_toolbar_info+="<toolbar action='toolbar-layer'><toolitem action='select-all-child-layers'/></toolbar>";
                        }
                        handle<studio::Instance>::cast_static(get_canvas_interface()->get_instance())->
                                add_actions_to_group(action_group_, ui_info,   param_list, synfigapp::Action::CATEGORY_LAYER);
                }
        }
 
-       ui_info="<ui><popup action='menu-main'><menu action='menu-layer'>"+ui_info+"<separator/><menuitem action='cut' /><menuitem action='copy' /><menuitem action='paste' /><separator/></menu></popup></ui>";
+       ui_info=("<ui>"
+                          "<popup action='menu-main'>"
+                            "<menu action='menu-layer'>" +
+                                  ui_info +
+                                  "<separator/>"
+                              "<menuitem action='cut' />"
+                                  "<menuitem action='copy' />"
+                                  "<menuitem action='paste' />"
+                                  "<separator/>"
+                            "</menu>"
+                          "</popup>" +
+                        ui_toolbar_info +
+                        "</ui>");
        popup_id_=get_ui_manager()->add_ui_from_string(ui_info);
 #ifdef ONE_ACTION_GROUP
 #else
        get_ui_manager()->insert_action_group(action_group_);
 #endif
-       DEBUGPOINT();
 }
 
 void
@@ -384,7 +392,8 @@ LayerActionManager::paste()
                        return;
                }
 
-               synfig::info("DEPTH=%d",depth);
+               // synfig::info("DEPTH=%d",depth);
+
                // Action to move the layer (if necessary)
                if(depth>0)
                {
@@ -414,6 +423,22 @@ LayerActionManager::paste()
                        }
                }
                depth++;
+
+               // automatically export the Index parameter of Duplicate layers when pasting
+               if (layer->get_name() == "duplicate")
+                       for (int i = 1; ; i++)
+                       {
+                               String name = strprintf(_("Index %d"), i);
+                               try
+                               {
+                                       canvas->find_value_node(name);
+                               }
+                               catch (Exception::IDNotFound x)
+                               {
+                                       get_canvas_interface()->add_value_node(layer->dynamic_param_list().find("index")->second, name);
+                                       break;
+                               }
+                       }
        }
        get_canvas_interface()->get_selection_manager()->clear_selected_layers();
        get_canvas_interface()->get_selection_manager()->set_selected_layers(layer_selection);