X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayergrouptreestore.cpp;h=6334c0924ae218c9d7df52fdcb07e9f3be609d91;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=ff0dd279cb63a63aa83f0998e285d26ee14b097f;hpb=c11163f51e342cc35511ed559fd3c0ae5405f840;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp index ff0dd27..6334c09 100644 --- a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 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 @@ -346,7 +347,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co if(new_desc==layer->get_description()) return; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_set_desc")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerSetDesc")); if(!action) return; @@ -391,7 +392,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co } else { - synfigapp::Action::Handle action(synfigapp::Action::create("group_rename")); + synfigapp::Action::Handle action(synfigapp::Action::create("GroupRename")); if(!action) return; @@ -419,7 +420,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co synfig::Layer::Handle layer((*iter)[model.layer]); if(!layer)return; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerActivate")); if(!action) return; @@ -456,7 +457,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co } catch(std::exception x) { - g_warning(x.what()); + g_warning("%s", x.what()); } } @@ -575,7 +576,7 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons if(synfig::String(selection_data.get_data_type())=="LAYER") { - synfigapp::Action::Handle action(synfigapp::Action::create("group_add_layers")); + synfigapp::Action::Handle action(synfigapp::Action::create("GroupAddLayers")); if(!action) return false; @@ -609,7 +610,7 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons group=dest_group+GROUP_NEST_CHAR+group; - synfigapp::Action::Handle action(synfigapp::Action::create("group_rename")); + synfigapp::Action::Handle action(synfigapp::Action::create("GroupRename")); if(!action) return false; @@ -661,7 +662,7 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons if(dest_canvas==src->get_canvas() && dest_layer_depth==src->get_depth()) continue; - synfigapp::Action::Handle action(synfigapp::Action::create("layer_move")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerMove")); action->set_param("canvas",dest_canvas); action->set_param("canvas_interface",canvas_interface()); action->set_param("layer",src); @@ -721,7 +722,7 @@ LayerGroupTreeStore::rebuild() } } - // Go ahead and and add all the layers + // Go ahead and add all the layers /*std::for_each( canvas_interface()->get_canvas()->rbegin(), canvas_interface()->get_canvas()->rend(), sigc::mem_fun(*this, &studio::LayerGroupTreeStore::on_layer_added) @@ -881,7 +882,7 @@ LayerGroupTreeStore::on_activity() // If we aren't rebuilding and the last action // had something to do with groups, then go // a head and present the groups dialog. - if(!rebuilding && canvas_interface()->get_instance()->get_most_recent_action() && canvas_interface()->get_instance()->get_most_recent_action()->get_name().find("group")!=String::npos) + if(!rebuilding && canvas_interface()->get_instance()->get_most_recent_action() && canvas_interface()->get_instance()->get_most_recent_action()->get_name().find("Group")!=String::npos) try { App::dock_manager->find_dockable("groups").present();