Tidied up and reformatted a bit. No real changes.

[synfig.git] / synfig-studio / trunk / src / gtkmm / layertree.h

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.h b/synfig-studio/trunk/src/gtkmm/layertree.h
index 44af6bb..bd09cc3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.h
+++ b/synfig-studio/trunk/src/gtkmm/layertree.h
@@ -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
@@ -100,14 +101,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_;
@@ -138,13 +135,14 @@ 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;
@@ -170,7 +168,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, synfig::Waypoint::Side side);
 
        void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node);
 
@@ -188,13 +186,15 @@ private:
 
 public:
 
-       void on_raise_pressed();
+       // void on_raise_pressed();
 
-       void on_lower_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 +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_; }
@@ -234,12 +234,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);