X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fchildrentree.cpp;h=3509c410440fbef07caa8f26e2ebbf92afcf6cd2;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=c4177a3724729bba10a7821056d7e2a491f7fafa;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
index c4177a3..3509c41 100644
--- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentree.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
@@ -103,7 +104,7 @@ ChildrenTree::ChildrenTree()
 		column->set_resizable();
 		column->set_clickable();
 		column->set_min_width(150);
-		column->set_sort_column_id(model.label);
+		column->set_sort_column(model.label);
 		tree_view.append_column(*column);
 
 	}
@@ -115,7 +116,7 @@ ChildrenTree::ChildrenTree()
 			column->set_reorderable();
 			column->set_resizable();
 			column->set_clickable();
-			column->set_sort_column_id(model.type);
+			column->set_sort_column(model.type);
 		}
 	}
 	{	// --- V A L U E  -----------------------------------------------------
@@ -141,7 +142,7 @@ ChildrenTree::ChildrenTree()
 		// Set up the value-node cell-renderer
 		cellrenderer_time_track=ChildrenTreeStore::add_cell_renderer_value_node(column);
 		cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
-		cellrenderer_time_track->signal_waypoint_clicked().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_waypoint_clicked) );
+		cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_waypoint_clicked_childrentree) );
 		column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc);
 		column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
 
@@ -186,10 +187,10 @@ ChildrenTree::ChildrenTree()
 	//Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon"));
 	Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR);
 
-	SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
-	SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
-	SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate");
-	SMALL_BUTTON(button_delete,"gtk-delete","Delete");
+	SMALL_BUTTON(button_raise,"gtk-go-up",_("Raise"));
+	SMALL_BUTTON(button_lower,"gtk-go-down",_("Lower"));
+	SMALL_BUTTON(button_duplicate,"synfig-duplicate",_("Duplicate"));
+	SMALL_BUTTON(button_delete,"gtk-delete",_("Delete"));
 
 	hbox->pack_start(*button_raise,Gtk::PACK_SHRINK);
 	hbox->pack_start(*button_lower,Gtk::PACK_SHRINK);
@@ -278,13 +279,16 @@ ChildrenTree::on_edited_value(const Glib::ustring&path_string,synfig::ValueBase
 }
 
 void
-ChildrenTree::on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button)
+ChildrenTree::on_waypoint_clicked_childrentree(const etl::handle<synfig::Node>& node __attribute__ ((unused)),
+											   const synfig::Time& time __attribute__ ((unused)),
+											   const synfig::Time& time_offset __attribute__ ((unused)),
+											   int button __attribute__ ((unused)),
+											   synfig::Waypoint::Side side __attribute__ ((unused)))
 {
-	Gtk::TreePath path(path_string);
-
-	const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
+	//! \todo writeme
 
-	signal_waypoint_clicked()(static_cast<synfigapp::ValueDesc>(row[model.value_desc]),waypoint,button);
+	// std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
+	// signal_waypoint_clicked_childrentree()(waypoint_set,button,side);
 }
 
 bool