X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayertree.h;h=97b2d27f993971c9265b607608635aa1abc83138;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=884cb36463805d6f0d64fde8622501d1fb3d32e7;hpb=a3b6b682f6c57efe5a76456e03dd123e4b851f40;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.h b/synfig-studio/trunk/src/gtkmm/layertree.h
index 884cb36..97b2d27 100644
--- a/synfig-studio/trunk/src/gtkmm/layertree.h
+++ b/synfig-studio/trunk/src/gtkmm/layertree.h
@@ -2,10 +2,11 @@
 /*!	\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
+**	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
@@ -46,11 +47,15 @@
 
 /* === M A C R O S ========================================================= */
 
+// comment this out if you don't want the params dialog to have a 'timetrack' column
+// (alternatively, export SYNFIG_DISABLE_PARAMS_PANEL_TIMETRACK=1 in environment at runtime)
+#define TIMETRACK_IN_PARAMS_PANEL
+
 /* === T Y P E D E F S ===================================================== */
 
 /* === 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 +76,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;
@@ -100,14 +105,10 @@ private:
 	Gtk::Tooltips tooltips_;
 	Gtk::TreePath last_tooltip_path;
 
-
-
 	Gtk::TreeView* layer_tree_view_;
 
 	Gtk::TreeView* param_tree_view_;
 
-	
-
 	Gtk::HBox *hbox;
 
 	Gtk::Adjustment layer_amount_adjustment_;
@@ -119,10 +120,12 @@ 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;
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+	CellRenderer_TimeTrack *cellrenderer_time_track;
+#endif	// TIMETRACK_IN_PARAMS_PANEL
 
 	Gtk::TreeView::Column* column_time_track;
 
@@ -138,26 +141,27 @@ 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> signal_waypoint_clicked_layertree_;
 
 	bool disable_amount_changed_signal;
 
 	Gtk::Button *button_raise;
 	Gtk::Button *button_lower;
 	Gtk::Button *button_duplicate;
+	Gtk::Button *button_encapsulate;
 	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 -------------------------------------
 	*/
@@ -170,7 +174,7 @@ private:
 
 	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);
 
 	void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node);
 
@@ -187,14 +191,16 @@ private:
 	void on_blend_method_changed();
 
 public:
-	
-	void on_raise_pressed();
 
-	void on_lower_pressed();
+	// void on_raise_pressed();
+
+	// void on_lower_pressed();
 
-	void on_duplicate_pressed();
+	// void on_duplicate_pressed();
 
-	void on_delete_pressed();
+	// void on_encapsulate_pressed();
+
+	// void on_delete_pressed();
 
 	/*
  -- ** -- P U B L I C   M E T H O D S -----------------------------------------
@@ -203,7 +209,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_; }
@@ -211,10 +217,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();
 
@@ -234,12 +240,10 @@ 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>& 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);