OK, let's use alt-o (o is for onion) instead of control-k to toggle onion skin.

[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 a9f2f0a..bc78ace 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 =========================================================== */
@@ -195,7 +197,7 @@ 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_sort_column(layer_model.z_depth);
                //column->set_reorderable();
                //column->set_resizable();
                //column->set_clickable();
@@ -206,27 +208,27 @@ LayerTree::create_layer_tree()
        }
        //get_layer_tree_view().append_column(_("Z"),layer_model.z_depth);
        {       // --- N A M E --------------------------------------------------------
-               Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Layer")) );
+               Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Name")) );
 
                // Set up the icon cell-renderer
                Gtk::CellRendererText* cellrenderer = Gtk::manage( new Gtk::CellRendererText() );
+               column->pack_start(*cellrenderer,false);
+               column->add_attribute(cellrenderer->property_text(), layer_model.label);
                cellrenderer->signal_edited().connect(sigc::mem_fun(*this, &studio::LayerTree::on_layer_renamed));
                cellrenderer->property_editable()=true;
 
-               column->pack_start(*cellrenderer,false);
-               column->add_attribute(cellrenderer->property_text(), layer_model.label);
+               column->set_reorderable();
+               // column->set_resizable();
+               column->set_clickable(true);
+               column->set_sort_column(layer_model.label);
+
                get_layer_tree_view().append_column(*column);
 
                //              int index;
 //             index=get_layer_tree_view().append_column_editable(_("Layer"),layer_model.label);
                //Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
 
-               //column->set_sort_column_id(layer_model.index);
-
                //get_layer_tree_view().set_expander_column(*column);
-               //column->set_reorderable();
-               //column->set_resizable();
-               //column->set_clickable(false);
 
                //Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() );
                //column->pack_start(*icon_cellrenderer,false);
@@ -241,7 +243,7 @@ LayerTree::create_layer_tree()
                column_z_depth->set_resizable();
                column_z_depth->set_clickable();
 
-               column_z_depth->set_sort_column_id(layer_model.z_depth);
+               column_z_depth->set_sort_column(layer_model.z_depth);
        }
 
        get_layer_tree_view().set_enable_search(true);
@@ -348,7 +350,7 @@ LayerTree::create_param_tree()
                column->set_reorderable();
                column->set_resizable();
                column->set_clickable();
-               column->set_sort_column_id(param_model.type);
+               column->set_sort_column(param_model.type);
        }
        /*{     // --- T I M E   T R A C K --------------------------------------------
                Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) );
@@ -407,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,7 +524,7 @@ LayerTree::set_model(Glib::RefPtr<LayerTreeStore> layer_tree_store)
                sorted_layer_tree_store_->set_default_sort_func(sigc::ptr_fun(&studio::LayerTreeStore::z_sorter));
 
                //sorted_store->set_sort_func(model.time.index(),sigc::mem_fun(&studio::KeyframeTreeStore::time_sorter));
-               //sorted_store->set_sort_column_id(model.time.index(), Gtk::SORT_ASCENDING);
+               //sorted_store->set_sort_column(model.time.index(), Gtk::SORT_ASCENDING);
 
                get_layer_tree_view().set_model(sorted_layer_tree_store_);
        }
@@ -705,6 +707,7 @@ LayerTree::on_layer_renamed(const Glib::ustring&path_string,const Glib::ustring&
        if(!row)
                return;
        row[layer_model.label]=value;
+       get_layer_tree_view().columns_autosize();
 }
 
 void
@@ -1044,24 +1047,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