X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayertree.h;h=97b11958af479c3b29d30656490b0f7e6d18a7a1;hb=590c258945a3865f48afa0a0f9d9b90cc35e548c;hp=6542231177437bb65b0355991223034e123d25bf;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.h b/synfig-studio/trunk/src/gtkmm/layertree.h
index 6542231..97b1195 100644
--- a/synfig-studio/trunk/src/gtkmm/layertree.h
+++ b/synfig-studio/trunk/src/gtkmm/layertree.h
@@ -2,7 +2,7 @@
 /*!	\file layertree.h
 **	\brief Template Header
 **
-**	$Id: layertree.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -50,7 +50,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace Gtk { class TreeModelSort; }; 
+namespace Gtk { class TreeModelSort; };
 
 namespace studio {
 
@@ -71,18 +71,18 @@ public:
 		COLUMNID_NAME,
 		COLUMNID_VALUE,
 		COLUMNID_TIME_TRACK,
-		
+
 		COLUMNID_END			//!< \internal
 	};
 */
 	typedef std::list<synfig::Layer::Handle> LayerList;
-	
+
 	/*
  -- ** -- P U B L I C  D A T A ------------------------------------------------
 	*/
 
 public:
-	
+
 	//LayerTreeStore::Model model;
 
 	LayerTreeStore::Model layer_model;
@@ -106,7 +106,7 @@ private:
 
 	Gtk::TreeView* param_tree_view_;
 
-	
+
 
 	Gtk::HBox *hbox;
 
@@ -119,7 +119,7 @@ private:
 	Glib::RefPtr<LayerTreeStore> layer_tree_store_;
 
 	Glib::RefPtr<LayerParamTreeStore> param_tree_store_;
-	
+
 	Glib::RefPtr<Gtk::TreeModelSort> sorted_layer_tree_store_;
 
 //	CellRenderer_TimeTrack *cellrenderer_time_track;
@@ -138,7 +138,7 @@ private:
 
 	sigc::signal<bool, int, Gtk::TreeRow, ColumnID> signal_param_user_click_;
 
-	sigc::signal<void,synfigapp::ValueDesc,synfig::Waypoint,int> signal_waypoint_clicked_;
+	sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int,synfig::Waypoint::Side> signal_waypoint_clicked_layertree_;
 
 	bool disable_amount_changed_signal;
 
@@ -148,16 +148,16 @@ private:
 	Gtk::Button *button_delete;
 
 	Widget_ValueBase blend_method_widget;
-	
+
 	/*
  -- ** -- P R I V A T E   M E T H O D S ---------------------------------------
 	*/
 
 private:
-	
+
 	Gtk::Widget* create_layer_tree();
 	Gtk::Widget* create_param_tree();
-	
+
 	/*
  -- ** -- S I G N A L   T E R M I N A L S -------------------------------------
 	*/
@@ -166,9 +166,11 @@ private:
 
 	void on_edited_value(const Glib::ustring&path_string,synfig::ValueBase value);
 
+	void on_layer_renamed(const Glib::ustring&path_string,const Glib::ustring& value);
+
 	void on_layer_toggle(const Glib::ustring& path_string);
 
-	void on_waypoint_clicked(const Glib::ustring &, synfig::Waypoint, int button);
+	void on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node, const synfig::Time&, const synfig::Time&, int button, synfig::Waypoint::Side side);
 
 	void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node);
 
@@ -185,7 +187,7 @@ private:
 	void on_blend_method_changed();
 
 public:
-	
+
 	void on_raise_pressed();
 
 	void on_lower_pressed();
@@ -201,7 +203,7 @@ public:
 public:
 
 	//Gtk::TreeView* get_param_tree_view() { return param_tree_view_; }
-	Gtk::TreeView& param_tree_view() { return *param_tree_view_; }
+	//Gtk::TreeView& param_tree_view() { return *param_tree_view_; }
 	Gtk::HBox& get_hbox() { return *hbox; }
 
 	Gtk::TreeView& get_layer_tree_view() { return *layer_tree_view_; }
@@ -209,10 +211,10 @@ public:
 
 	const Gtk::TreeView& get_layer_tree_view()const { return *layer_tree_view_; }
 	const Gtk::TreeView& get_param_tree_view()const { return *param_tree_view_; }
-	
+
 	Glib::RefPtr<Gtk::TreeSelection> get_selection() { return get_layer_tree_view().get_selection(); }
 	Glib::SignalProxy1< bool,GdkEvent* >  signal_event () { return get_layer_tree_view().signal_event(); }
-	
+
 	LayerTree();
 	~LayerTree();
 
@@ -232,12 +234,12 @@ public:
 
 	sigc::signal<bool,int, Gtk::TreeRow, ColumnID>& signal_param_user_click() { return signal_param_user_click_; }
 
-	sigc::signal<void,synfigapp::ValueDesc,synfig::Waypoint,int>& signal_waypoint_clicked() { return signal_waypoint_clicked_; }
+	sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int,synfig::Waypoint::Side>& signal_waypoint_clicked_layertree() { return signal_waypoint_clicked_layertree_; }
 
 	etl::handle<synfigapp::SelectionManager> get_selection_manager() { return layer_tree_store_->canvas_interface()->get_selection_manager(); }
-	
-	
-	
+
+
+
 	void select_layer(synfig::Layer::Handle layer);
 	void select_layers(const LayerList& layer_list);
 	void select_all_children_layers(synfig::Layer::Handle layer);