X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayergrouptreestore.cpp;h=22629a109dd78de0281d4526f2b4b1c5fdb1cbe6;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=750d1bb9ed86d3449de08ae5db46ab43cba658b6;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp index 750d1bb..22629a1 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 @@ -30,7 +31,7 @@ #endif #include "layergrouptreestore.h" -#include "iconcontroler.h" +#include "iconcontroller.h" #include #include #include @@ -40,10 +41,11 @@ #include #include "dockmanager.h" #include "dockable.h" -#include "iconcontroler.h" #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -94,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()); @@ -465,7 +465,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co bool -LayerGroupTreeStore::row_draggable_vfunc (const TreeModel::Path& path)const +LayerGroupTreeStore::row_draggable_vfunc (const TreeModel::Path& /*path*/)const { //if(!get_iter(path)) return false; // Gtk::TreeModel::Row row(*get_iter(path)); @@ -512,7 +512,7 @@ LayerGroupTreeStore::drag_data_get_vfunc (const TreeModel::Path& path, Gtk::Sele } bool -LayerGroupTreeStore::drag_data_delete_vfunc (const TreeModel::Path& path) +LayerGroupTreeStore::drag_data_delete_vfunc (const TreeModel::Path& /*path*/) { return true; } @@ -670,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; } @@ -683,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); @@ -703,7 +701,7 @@ void LayerGroupTreeStore::rebuild() { rebuilding=true; - etl::clock timer;timer.reset(); + // etl::clock timer;timer.reset(); try { // Clear out the current list @@ -736,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 @@ -830,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); @@ -842,18 +838,16 @@ LayerGroupTreeStore::on_group_removed(synfig::String group) } bool -LayerGroupTreeStore::on_group_changed(synfig::String group) +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); @@ -864,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; @@ -898,7 +891,7 @@ LayerGroupTreeStore::on_activity() } void -LayerGroupTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool x) +LayerGroupTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool /*x*/) { Gtk::TreeModel::Children::iterator iter; if(find_layer_row(handle,iter)) @@ -951,7 +944,6 @@ LayerGroupTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig: } iter=children().end(); - //DEBUGPOINT(); //return false; } @@ -986,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); @@ -1005,7 +997,6 @@ LayerGroupTreeStore::find_group_row_(const synfig::String &group, Gtk::TreeModel } iter=children().end(); - //DEBUGPOINT(); //return false; }