X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayergrouptreestore.cpp;h=6334c0924ae218c9d7df52fdcb07e9f3be609d91;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=3145b1a37a87622260276bd5db1a58d74524cd59;hpb=449972484abe4b99beef5ac1ed918814e76041c6;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp index 3145b1a..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 @@ -43,6 +44,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -93,7 +96,9 @@ LayerGroupTreeStore::LayerGroupTreeStore(etl::loose_handle x; g_value_init(x.gobj(),x.value_type()); - - if(!layer->get_description().empty()) - x.set(layer->get_description()); - else - x.set(layer->get_local_name()); + x.set(layer->get_non_empty_description()); g_value_init(value.gobj(),x.value_type()); //g_value_copy(x.gobj(),value.gobj()); @@ -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); @@ -669,12 +670,10 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons action->set_param("dest_canvas",dest_canvas); if(canvas_interface()->get_instance()->perform_action(action)) { - DEBUGPOINT(); ret=true; } else { - DEBUGPOINT(); passive_grouper.cancel(); return false; } @@ -682,7 +681,7 @@ LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons } } } - synfig::info("I suposidly moved %d layers",i); + synfig::info("I supposedly moved %d layers",i); // Reselect the previously selected layers canvas_interface()->get_selection_manager()->set_selected_layers(selected_layer_list); @@ -702,7 +701,7 @@ void LayerGroupTreeStore::rebuild() { rebuilding=true; - etl::clock timer;timer.reset(); + // etl::clock timer;timer.reset(); try { // Clear out the current list @@ -723,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) @@ -735,7 +734,7 @@ LayerGroupTreeStore::rebuild() throw; } rebuilding=false; - synfig::info("LayerGroupTreeStore::rebuild() took %f seconds",float(timer())); + // synfig::info("LayerGroupTreeStore::rebuild() took %f seconds",float(timer())); } void @@ -829,8 +828,6 @@ LayerGroupTreeStore::on_group_added(synfig::String group) bool LayerGroupTreeStore::on_group_removed(synfig::String group) { - //DEBUGPOINT(); - Gtk::TreeModel::Children::iterator iter; if(find_group_row(group,iter) && iter->children().size()==0) erase(iter); @@ -843,16 +840,14 @@ LayerGroupTreeStore::on_group_removed(synfig::String group) bool LayerGroupTreeStore::on_group_changed(synfig::String /*group*/) { - //DEBUGPOINT(); return true; } void -LayerGroupTreeStore::on_group_pair_added(String group, etl::handle layer) +LayerGroupTreeStore::on_group_pair_added(synfig::String group, etl::handle layer) { if(!layer->get_canvas()) return; - //DEBUGPOINT(); Gtk::TreeModel::Children::iterator iter; if(!find_group_row(group, iter)) iter=on_group_added(group); @@ -863,11 +858,10 @@ LayerGroupTreeStore::on_group_pair_added(String group, etl::handle layer) } void -LayerGroupTreeStore::on_group_pair_removed(String group, etl::handle layer) +LayerGroupTreeStore::on_group_pair_removed(synfig::String group, etl::handle layer) { if(!layer->get_canvas()) return; - //DEBUGPOINT(); Gtk::TreeModel::Children::iterator iter; if(!find_group_row(group, iter)) return; @@ -888,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(); @@ -950,7 +944,6 @@ LayerGroupTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig: } iter=children().end(); - //DEBUGPOINT(); //return false; } @@ -985,7 +978,7 @@ LayerGroupTreeStore::find_layer_row(const synfig::Layer::Handle &layer, Gtk::Tre } bool -LayerGroupTreeStore::find_group_row(const String &group, Gtk::TreeModel::Children::iterator &iter) +LayerGroupTreeStore::find_group_row(const synfig::String &group, Gtk::TreeModel::Children::iterator &iter) { Gtk::TreeModel::Children::iterator prev; return find_group_row_(group,children(),iter,prev); @@ -1004,7 +997,6 @@ LayerGroupTreeStore::find_group_row_(const synfig::String &group, Gtk::TreeModel } iter=children().end(); - //DEBUGPOINT(); //return false; }