Author: Konstantin Dmitriev <[email protected]> Date: Sat Jun 18 12:47:06 2011 +0700
Revert commit 9286334 because of the regressions. See https://www.pivotaltracker.com/story/show/14452415 --- synfig-studio/src/gui/trees/layertree.cpp | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/synfig-studio/src/gui/trees/layertree.cpp b/synfig-studio/src/gui/trees/layertree.cpp index 9977c33..71005a6 100644 --- a/synfig-studio/src/gui/trees/layertree.cpp +++ b/synfig-studio/src/gui/trees/layertree.cpp @@ -196,13 +196,16 @@ LayerTree::create_layer_tree() column->add_attribute(cellrenderer->property_active(), layer_model.active); get_layer_tree_view().append_column(*column); } - { // --- N A M E -------------------------------------------------------- - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Name")) ); + { // --- I C O N -------------------------------------------------------- + int index; // Set up the icon cell-renderer - Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage ( new Gtk::CellRendererPixbuf() ); - column->pack_start(*icon_cellrenderer,false); - column->add_attribute(icon_cellrenderer->property_pixbuf(), layer_model.icon); + index=get_layer_tree_view().append_column(_("Icon"),layer_model.icon); + Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1); + get_layer_tree_view().set_expander_column(*column); + } + { // --- N A M E -------------------------------------------------------- + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Name")) ); // Set up the Layer label cell-renderer Gtk::CellRendererText* cellrenderer = Gtk::manage( new Gtk::CellRendererText() ); @@ -217,7 +220,6 @@ LayerTree::create_layer_tree() column->set_sort_column(layer_model.label); get_layer_tree_view().append_column(*column); - get_layer_tree_view().set_expander_column(*column); } { // --- Z D E P T H ---------------------------------------------------- int index; ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev _______________________________________________ Synfig-devl mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/synfig-devl
