Removed a bunch more DEBUGPOINT()s.

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

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp
index 82387b2..81460f5 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp
@@ -41,6 +41,8 @@
 #include "instance.h"
 #include <gtkmm/treemodelsort.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -116,9 +118,6 @@ LayerTree::LayerTree():
        attach(*layer_amount_hscale, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 1, 1);
        layer_amount_adjustment_.signal_value_changed().connect(sigc::mem_fun(*this, &studio::LayerTree::on_amount_value_changed));
 
-
-
-
        Gtk::Image *icon;
        //Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon"));
        Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR);
@@ -143,19 +142,14 @@ LayerTree::LayerTree():
        button_duplicate->set_sensitive(false);
        button_delete->set_sensitive(false);
 
-
-
-
        get_selection()->signal_changed().connect(sigc::mem_fun(*this, &studio::LayerTree::on_selection_changed));
 
-
        get_layer_tree_view().set_reorderable(true);
        get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
        //get_param_tree_view().get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
        get_layer_tree_view().show();
        get_param_tree_view().show();
 
-
        hbox->show();
        layer_amount_hscale->show();
        blend_method_widget.show();
@@ -163,10 +157,6 @@ LayerTree::LayerTree():
        tooltips_.enable();
        disable_amount_changed_signal=false;
 
-
-
-
-
        blend_method_widget.set_param_desc(ParamDesc(Color::BlendMethod(),"blend_method"));
 
        blend_method_widget.set_value((int)Color::BLEND_COMPOSITE);
@@ -175,7 +165,6 @@ LayerTree::LayerTree():
        blend_method_widget.signal_activate().connect(sigc::mem_fun(*this, &studio::LayerTree::on_blend_method_changed));
 }
 
-
 LayerTree::~LayerTree()
 {
        synfig::info("LayerTree::~LayerTree(): Deleted");
@@ -186,7 +175,6 @@ LayerTree::create_layer_tree()
 {
        const LayerTreeStore::Model model;
 
-
        {       // --- O N / O F F ----------------------------------------------------
                //int index;
                //index=get_layer_tree_view().append_column_editable(_(" "),layer_model.active);
@@ -209,7 +197,6 @@ LayerTree::create_layer_tree()
                Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
                get_layer_tree_view().set_expander_column(*column);
 
-
                column->set_sort_column_id(layer_model.z_depth);
                //column->set_reorderable();
                //column->set_resizable();
@@ -267,7 +254,6 @@ LayerTree::create_layer_tree()
        listTargets.push_back( Gtk::TargetEntry("LAYER") );
        get_layer_tree_view().drag_dest_set(listTargets);
 
-
        // This makes things easier to read.
        get_layer_tree_view().set_rules_hint();
 
@@ -277,8 +263,6 @@ LayerTree::create_layer_tree()
        get_layer_tree_view().signal_event().connect(sigc::mem_fun(*this, &studio::LayerTree::on_layer_tree_event));
        get_layer_tree_view().show();
 
-
-
        Gtk::ScrolledWindow *scroll = manage(new class Gtk::ScrolledWindow());
        scroll->set_flags(Gtk::CAN_FOCUS);
        scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -357,16 +341,16 @@ LayerTree::create_param_tree()
                column->set_resizable();
        }
        {       // --- T Y P E --------------------------------------------------------
-               const CanvasTreeStore::Model model;
-               int cols_count = get_param_tree_view().append_column(_("Type"),model.type);
-               Gtk::TreeViewColumn* column = get_param_tree_view().get_column(cols_count-1);
-               if(column)
-               {
-                       column->set_reorderable();
-                       column->set_resizable();
-                       column->set_clickable();
-                       column->set_sort_column_id(model.type);
-               }
+               Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Type")) );
+               Gtk::CellRendererText* text_cellrenderer = Gtk::manage( new Gtk::CellRendererText() );
+               column->pack_start(*text_cellrenderer,false);
+               column->add_attribute(text_cellrenderer->property_text(), param_model.type);
+               text_cellrenderer->property_attributes()=attr_list;
+               get_param_tree_view().append_column(*column);
+               column->set_reorderable();
+               column->set_resizable();
+               column->set_clickable();
+               column->set_sort_column_id(param_model.type);
        }
        /*{     // --- T I M E   T R A C K --------------------------------------------
                Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) );
@@ -390,8 +374,6 @@ LayerTree::create_param_tree()
                //get_param_tree_view().append_column(*column);
        }*/
 
-
-
        // This makes things easier to read.
        get_param_tree_view().set_rules_hint();
 
@@ -427,7 +409,7 @@ LayerTree::on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::H
 }
 
 void
-LayerTree::select_layer(Layer::Handle layer)
+LayerTree::select_layer(synfig::Layer::Handle layer)
 {
        Gtk::TreeModel::Children::iterator iter;
        if(layer_tree_store_->find_layer_row(layer,iter))
@@ -522,18 +504,6 @@ LayerTree::clear_selected_layers()
        get_layer_tree_view().get_selection()->unselect_all();
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 void
 LayerTree::set_show_timetrack(bool x)
 {
@@ -547,7 +517,6 @@ LayerTree::set_model(Glib::RefPtr<LayerTreeStore> layer_tree_store)
 {
        layer_tree_store_=layer_tree_store;
 
-
        if(false)
        {
                sorted_layer_tree_store_=Gtk::TreeModelSort::create(layer_tree_store);
@@ -630,7 +599,6 @@ LayerTree::on_selection_changed()
                }
        }
 
-
        {
                if(!layer_list.empty())
                {
@@ -643,7 +611,6 @@ LayerTree::on_selection_changed()
                }
        }
 
-
        if(layer_list.empty())
        {
                button_raise->set_sensitive(false);
@@ -690,7 +657,6 @@ LayerTree::on_selection_changed()
        }
 }
 
-
 void
 LayerTree::on_blend_method_changed()
 {
@@ -720,7 +686,6 @@ LayerTree::on_amount_value_changed()
        disable_amount_changed_signal=false;
 }
 
-
 void
 LayerTree::on_edited_value(const Glib::ustring&path_string,synfig::ValueBase value)
 {
@@ -843,7 +808,6 @@ LayerTree::on_layer_tree_event(GdkEvent *event)
        return false;
 }
 
-
 bool
 LayerTree::on_param_tree_event(GdkEvent *event)
 {
@@ -1074,25 +1038,6 @@ LayerTree::on_delete_pressed()
        layer_tree_store_->canvas_interface()->get_instance()->perform_action(action);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /*
 void
 LayerTree::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&context, Gtk::SelectionData& selection_data, guint info, guint time)
@@ -1101,24 +1046,19 @@ LayerTree::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&context, Gtk::S
        synfig::info("Dragged data of target \"%s\"",gdk_atom_name(selection_data->target));
        synfig::info("Dragged selection=\"%s\"",gdk_atom_name(selection_data->selection));
 
-       DEBUGPOINT();
-
        Gtk::TreeModel::Path path;
        Gtk::TreeViewColumn *column;
        int cell_x, cell_y;
        if(get_selection()
        Gtk::TreeRow row = *(get_selection()->get_selected());
-       DEBUGPOINT();
 
        if(synfig::String(gdk_atom_name(selection_data->target))=="LAYER" && (bool)row[model.is_layer])
        {
-               DEBUGPOINT();
                Layer* layer(((Layer::Handle)row[model.layer]).get());
                assert(layer);
                selection_data.set(8, reinterpret_cast<const guchar*>(&layer), sizeof(layer));
                return;
        }
-       DEBUGPOINT();
 }
 
 void
@@ -1149,7 +1089,6 @@ LayerTree::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& cont
 
        Gtk::TreeRow row = *(get_model()->get_iter(path));
 
-
        if ((selection_data.get_length() >= 0) && (selection_data.get_format() == 8))
        {
                if(synfig::String(selection_data.get_data_type())=="LAYER")do