Now that it doesn't matter which half of a waypoint you click on, we don't need to...

git-svn-id: http://svn.voria.com/code@1715 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index d0b1026..8ba09bc 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -155,7 +155,6 @@ using namespace sigc;
 
 /* === C L A S S E S ======================================================= */
 
-
 class studio::UniversalScrubber
 {
        CanvasView *canvas_view;
@@ -226,7 +225,6 @@ public:
        }
 };
 
-
 class studio::CanvasViewUIInterface : public synfigapp::UIInterface
 {
        CanvasView *view;
@@ -236,7 +234,6 @@ public:
        CanvasViewUIInterface(CanvasView *view):
                view(view)
        {
-
                view->statusbar->push(_("Idle"));
        }
 
@@ -385,13 +382,9 @@ class studio::CanvasViewSelectionManager : public synfigapp::SelectionManager
        CanvasView *view;
        CanvasView::LayerTreeModel layer_tree_model;
        CanvasView::ChildrenTreeModel children_tree_model;
-public:
-
-       CanvasViewSelectionManager(CanvasView *view): view(view)
-{
-
- }
 
+public:
+       CanvasViewSelectionManager(CanvasView *view): view(view) { }
 
 private:
        void _set_selected_layer(const synfig::Layer::Handle &layer)
@@ -484,8 +477,6 @@ public:
                view->layer_tree->clear_selected_layers();
        }
 
-
-
        //! Returns the number of value_nodes selected.
        virtual int get_selected_children_count()const
        {
@@ -566,8 +557,6 @@ public:
                return;
        }
 
-
-
        int get_selected_layer_parameter_count()const
        {
                return get_selected_layer_parameters().size();
@@ -623,7 +612,6 @@ public:
 
 }; // END of class SelectionManager
 
-
 CanvasView::IsWorking::IsWorking(CanvasView &canvas_view_):
        canvas_view_(canvas_view_)
 {
@@ -701,7 +689,6 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
        //vpaned->pack2(*notebook, Gtk::SHRINK);
        //vpaned->show_all();
 
-
        //notebook->show();
 
        //notebook->append_page(*create_layer_tree(),_("Layers"));
@@ -718,7 +705,6 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
        init_menus();
        //layout_table->attach(*App::ui_manager()->get_widget("/menu-main"), 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
 
-
        layout_table->attach(*create_time_bar(), 0, 1, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
        layout_table->attach(*create_status_bar(), 0, 1, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
 
@@ -750,7 +736,6 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
        time_window_adjustment().signal_value_changed().connect(sigc::mem_fun(*this,&studio::CanvasView::refresh_time_window));
        time_adjustment().signal_value_changed().connect(sigc::mem_fun(*this,&studio::CanvasView::time_was_changed));
 
-
        work_area->signal_layer_selected().connect(sigc::mem_fun(*this,&studio::CanvasView::workarea_layer_selected));
        work_area->signal_input_device_changed().connect(sigc::mem_fun(*this,&studio::CanvasView::on_input_device_changed));
 
@@ -773,7 +758,6 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
                )
        );
 
-
        //MUCH TIME STUFF TAKES PLACE IN HERE
        refresh_rend_desc();
        refresh_time_window();
@@ -808,9 +792,6 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
        set_default_size(w,h);
        property_window_position().set_value(Gtk::WIN_POS_NONE);
 
-
-
-
        std::list<Gtk::TargetEntry> listTargets;
        listTargets.push_back( Gtk::TargetEntry("STRING") );
        listTargets.push_back( Gtk::TargetEntry("text/plain") );
@@ -819,7 +800,6 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
        drag_dest_set(listTargets);
        signal_drag_data_received().connect( sigc::mem_fun(*this, &studio::CanvasView::on_drop_drag_data_received) );
 
-
        /*
        Time length(get_canvas()->rend_desc().get_time_end()-get_canvas()->rend_desc().get_time_start());
        if(length<10.0)
@@ -864,7 +844,6 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
        time_window_adjustment().set_value(get_canvas()->rend_desc().get_time_start());
        time_window_adjustment().value_changed();
 
-
        GRAB_HINT_DATA("canvas_view");
        /*
        {
@@ -916,8 +895,6 @@ CanvasView::~CanvasView()
                synfig::info("CanvasView::~CanvasView(): Deleted");
 }
 
-
-
 std::list<int>&
 CanvasView::get_pixel_sizes()
 {
@@ -942,7 +919,6 @@ CanvasView::create_time_bar()
        timeslider->set_bounds_adjustment(&time_window_adjustment());
        //layout_table->attach(*timeslider, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL);
 
-
        tooltips.set_tip(*time_window_scroll,_("Moves the time window"));
        tooltips.set_tip(*timeslider,_("Changes the current time"));
        time_window_scroll->show();
@@ -1000,7 +976,6 @@ CanvasView::create_work_area()
        return work_area.get();
 }
 
-
 Gtk::Widget*
 CanvasView::create_status_bar()
 {
@@ -1021,7 +996,6 @@ CanvasView::create_status_bar()
 //     statusbartable->attach(*lowerbutton, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 //     statusbartable->attach(*raisebutton, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 
-
        current_time_widget=manage(new Widget_Time);
        current_time_widget->set_value(get_time());
        current_time_widget->set_fps(get_canvas()->rend_desc().get_frame_rate());
@@ -1048,7 +1022,6 @@ CanvasView::create_status_bar()
        refreshbutton->signal_clicked().connect(SLOT_EVENT(EVENT_REFRESH));
        stopbutton->signal_clicked().connect(SLOT_EVENT(EVENT_STOP));
 
-
        statusbartable->show_all();
        return statusbartable;
 }
@@ -1418,7 +1391,6 @@ CanvasView::init_menus()
 
        }
 
-
 #define DUCK_MASK(lower,upper,string)  \
        duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", string); \
        duck_mask_##lower->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_##upper)); \
@@ -1493,8 +1465,6 @@ CanvasView::init_menus()
        }
 */
 
-
-
 #if 0
 //
 //     //Test some key stuff
@@ -1780,7 +1750,6 @@ CanvasView::add_layer(synfig::String x)
                target_depth=canvas->get_depth(*layer_list.begin());
        }
 
-
        Layer::Handle layer(canvas_interface()->add_layer_to(x,canvas,target_depth));
        if(layer)
        {
@@ -1903,13 +1872,11 @@ CanvasView::workarea_layer_selected(synfig::Layer::Handle layer)
                get_selection_manager()->set_selected_layer(layer);
 }
 
-
 void
 CanvasView::refresh_rend_desc()
 {
        current_time_widget->set_fps(get_canvas()->rend_desc().get_frame_rate());
 
-
        //????
        //synfig::info("Canvasview: Refreshing render desc info");
        if(!get_time().is_equal(time_adjustment().get_value()))
@@ -2012,7 +1979,6 @@ CanvasView::refresh_rend_desc()
        work_area->queue_render_preview();
 }
 
-
 bool
 CanvasView::close_view()
 {
@@ -2090,7 +2056,6 @@ CanvasView::update_title()
        set_title(title);
 }
 
-
 void
 CanvasView::on_hide()
 {
@@ -2181,7 +2146,6 @@ CanvasView::on_layer_toggle(synfig::Layer::Handle layer)
        canvas_interface()->get_instance()->perform_action(action);
 }
 
-
 void
 CanvasView::popup_param_menu(synfigapp::ValueDesc value_desc, float location)
 {
@@ -2204,7 +2168,6 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
        {
        case 3:
                {
-
                        Gtk::MenuItem* menu = dynamic_cast<Gtk::MenuItem*>(App::ui_manager()->get_widget("/menu-main/menu-layer"));
                        if(menu && menu->get_submenu())
                        {
@@ -2213,7 +2176,6 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
                                menu->get_submenu()->popup(button,gtk_get_current_event_time());
                        }
 
-
                        #if 0
                        bool multiple_selected=true;
 
@@ -2326,8 +2288,6 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
        }
 }
 
-
-
 bool
 CanvasView::on_children_user_click(int button, Gtk::TreeRow row, ChildrenTree::ColumnID column_id)
 {
@@ -2386,7 +2346,6 @@ CanvasView::on_keyframe_tree_event(GdkEvent *event)
        return false;
 }
 
-
 void
 CanvasView::refresh_time_window()
 {
@@ -2421,7 +2380,6 @@ CanvasView::on_time_changed()
 
        if(get_time() != time_adjustment().get_value())
        {
-
                //Recenters the window, causing it to jump (possibly undesirably... but whatever)
                if(time < time_window_adjustment().get_value() ||
                        time > time_window_adjustment().get_value()+time_window_adjustment().get_page_size())
@@ -2505,7 +2463,6 @@ CanvasView::on_id_changed()
        update_title();
 }
 
-
 void
 CanvasView::on_mode_changed(synfigapp::CanvasInterface::Mode mode)
 {
@@ -3106,7 +3063,6 @@ CanvasView::set_sensitive_timebar(bool sensitive)
                children_tree->set_sensitive(sensitive);
 }
 
-
 static void
 set_waypoint_model(std::set<synfig::Waypoint, std::less<UniqueID> > waypoints,
                                   Waypoint::Model model,
@@ -3174,8 +3130,7 @@ remove_waypoints(std::set<synfig::Waypoint, std::less<UniqueID> > waypoints,
 void
 CanvasView::on_waypoint_clicked_canvasview(synfigapp::ValueDesc value_desc,
                                                                                   std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set,
-                                                                                  int button,
-                                                                                  synfig::Waypoint::Side side)
+                                                                                  int button)
 {
        int size = waypoint_set.size();
        Waypoint waypoint(*(waypoint_set.begin()));
@@ -3479,7 +3434,6 @@ CanvasView::on_keyframe_remove_pressed()
        canvas_interface()->get_instance()->perform_action(action);
 }
 
-
 void
 CanvasView::toggle_duck_mask(Duckmatic::Type type)
 {
@@ -3530,7 +3484,6 @@ CanvasView::toggle_duck_mask(Duckmatic::Type type)
        work_area->queue_draw();
 }
 
-
 void
 CanvasView::image_import()
 {
@@ -3725,8 +3678,6 @@ CanvasView::on_audio_scrub()
        return true;
 }
 
-
-
 Glib::RefPtr<Glib::ObjectBase>
 CanvasView::get_ref_obj(const synfig::String& x)
 {

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index cb0c0f3..448f990 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -232,7 +232,6 @@ private:
        std::map<synfig::String,Glib::RefPtr<Glib::ObjectBase> > ref_obj_book_;
        std::map<synfig::String,Gtk::Widget*> ext_widget_book_;
 
-
        //! The time adjustment's scope is defined by the time_window adjustment
        Gtk::Adjustment time_adjustment_;
 
@@ -240,7 +239,6 @@ private:
        //Gtk::Adjustment time_window_adjustment_;
        studio::Adjust_Window time_window_adjustment_;
 
-
        LayerTree *layer_tree;
 
        ChildrenTree *children_tree;
@@ -268,8 +266,6 @@ private:
 
        std::list<sigc::connection> duck_changed_connections;
 
-
-
        Gtk::Button *animatebutton;
        Gtk::Button *keyframebutton;
 
@@ -311,7 +307,6 @@ private:
 */
        Gtk::Menu parammenu;
 
-
        Glib::RefPtr<Gtk::ToggleAction> duck_mask_position;
        Glib::RefPtr<Gtk::ToggleAction> duck_mask_vertex;
        Glib::RefPtr<Gtk::ToggleAction> duck_mask_tangent;
@@ -324,7 +319,6 @@ private:
 
        Glib::RefPtr<Gtk::ActionGroup> action_group;
 
-
        etl::handle<synfigapp::UIInterface> ui_interface_;
        etl::handle<synfigapp::SelectionManager> selection_manager_;
 
@@ -353,7 +347,6 @@ public:
 
        bool cancel;
 
-
        /*
  -- ** -- D I A L O G S -------------------------------------------------------
        */
@@ -408,20 +401,15 @@ private:
 
        Gtk::Widget *create_time_bar();
 
-
-
        void popup_param_menu_bezier(float location, synfigapp::ValueDesc value_desc)
        { popup_param_menu(value_desc,location); }
 
        void popup_param_menu(synfigapp::ValueDesc value_desc, float location=0);
 
-
        void workarea_layer_selected(synfig::Layer::Handle layer);
 
        void selected_layer_color_set(synfig::Color color);
 
-
-
        void register_layer_type(synfig::Layer::Book::value_type &lyr,std::map<synfig::String,Gtk::Menu*>*);
 
        //! Rebuilds the "new layer" menu
@@ -594,7 +582,7 @@ public:
 
        void image_import();
 
-       void on_waypoint_clicked_canvasview(synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >, int button, synfig::Waypoint::Side side);
+       void on_waypoint_clicked_canvasview(synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >, int button);
 
        void preview_option() {on_preview_option();}
 

diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
index 3509c41..a7b91f4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
@@ -176,12 +176,9 @@ ChildrenTree::ChildrenTree()
 
        attach(*hbox, 0, 1, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 
-
-
        tree_view.set_enable_search(true);
        tree_view.set_search_column(model.label);
 
-
 /*
        Gtk::Image *icon;
        //Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon"));
@@ -208,11 +205,8 @@ ChildrenTree::ChildrenTree()
        button_delete->set_sensitive(false);
 */
 
-
-
        get_selection()->signal_changed().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_selection_changed));
 
-
        tree_view.set_reorderable(true);
 
        hbox->show();
@@ -223,7 +217,6 @@ ChildrenTree::ChildrenTree()
        //get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
 }
 
-
 ChildrenTree::~ChildrenTree()
 {
 }
@@ -266,7 +259,6 @@ ChildrenTree::on_selection_changed()
        }
 }
 
-
 void
 ChildrenTree::on_edited_value(const Glib::ustring&path_string,synfig::ValueBase value)
 {
@@ -288,7 +280,7 @@ ChildrenTree::on_waypoint_clicked_childrentree(const etl::handle<synfig::Node>&
        //! \todo writeme
 
        // std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
-       // signal_waypoint_clicked_childrentree()(waypoint_set,button,side);
+       // signal_waypoint_clicked_childrentree()(waypoint_set,button);
 }
 
 bool

diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.h b/synfig-studio/trunk/src/gtkmm/childrentree.h
index 5c709b6..e2c4c9a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentree.h
+++ b/synfig-studio/trunk/src/gtkmm/childrentree.h
@@ -99,7 +99,7 @@ private:
 
        sigc::signal<bool, int, Gtk::TreeRow, ColumnID> signal_user_click_;
 
-       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int,synfig::Waypoint::Side> signal_waypoint_clicked_childrentree_;
+       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int> signal_waypoint_clicked_childrentree_;
 
        Gtk::Button *button_raise;
        Gtk::Button *button_lower;
@@ -165,7 +165,7 @@ public:
 
        sigc::signal<bool,int, Gtk::TreeRow, ColumnID>& signal_user_click() { return signal_user_click_; }
 
-       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int,synfig::Waypoint::Side>& signal_waypoint_clicked_childrentree() { return signal_waypoint_clicked_childrentree_; }
+       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int>& signal_waypoint_clicked_childrentree() { return signal_waypoint_clicked_childrentree_; }
 
        etl::handle<synfigapp::SelectionManager> get_selection_manager() { return children_tree_store_->canvas_interface()->get_selection_manager(); }
 

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index f081520..07fed9b 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -69,7 +69,7 @@ class TimeTrackView : public Gtk::TreeView
        Gtk::TreeView *mimic_tree_view;
 public:
 
-       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint, std::less<UniqueID> >,int,synfig::Waypoint::Side> signal_waypoint_clicked_timetrackview;
+       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint, std::less<UniqueID> >,int> signal_waypoint_clicked_timetrackview;
 
        LayerParamTreeStore::Model model;
 
@@ -102,7 +102,6 @@ public:
                        column->set_resizable();
                        column->set_min_width(200);
 
-
                        append_column(*column);
                }
                set_rules_hint();
@@ -346,7 +345,6 @@ public:
 
        void mimic_resync()
        {
-
                if(mimic_tree_view)
                {
                        Gtk::Adjustment &adjustment(*mimic_tree_view->get_vadjustment());
@@ -388,7 +386,7 @@ public:
                }
 
                if (!waypoint_set.empty())
-                       signal_waypoint_clicked_timetrackview(value_desc,waypoint_set,button,side);
+                       signal_waypoint_clicked_timetrackview(value_desc,waypoint_set,button);
        }
 };
 
@@ -442,7 +440,6 @@ Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
 
        tree_view->signal_waypoint_clicked_timetrackview.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked_canvasview));
 
-
        canvas_view->time_adjustment().signal_value_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
        canvas_view->time_adjustment().signal_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
 
@@ -484,7 +481,6 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
                table_=0;
        }
 
-
        if(canvas_view)
        {
                TimeTrackView* tree_view(dynamic_cast<TimeTrackView*>(canvas_view->get_ext_widget(get_name())));

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 1516eb0..2d4ecdb 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -385,7 +385,6 @@ Instance::close()
                studio::App::instance_list.front()->canvas_view_list().front()->present();
 }
 
-
 void
 Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas)
 {
@@ -437,7 +436,6 @@ Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas)
        */
 }
 
-
 /*
 void
 Instance::insert_value_node(Gtk::TreeRow row,Canvas::Handle canvas,etl::handle<synfig::ValueNode> value_node)
@@ -701,7 +699,6 @@ Instance::safe_close()
        return true;
 }
 
-
 void
 Instance::add_actions_to_group(const Glib::RefPtr<Gtk::ActionGroup>& action_group, synfig::String& ui_info,   const synfigapp::Action::ParamList &param_list, synfigapp::Action::Category category)const
 {
@@ -1019,7 +1016,6 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
                param_list2.add("origin",location);
        }
 
-
        // Populate the convert menu by looping through
        // the ValueNode book and find the ones that are
        // relevant.
@@ -1085,10 +1081,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
                                sigc::bind(
                                        sigc::bind(
                                                sigc::bind(
-                                                       sigc::bind(
-                                                               sigc::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked_canvasview),
-                                                               synfig::Waypoint::SIDE_UNSPECIFIED
-                                                       ),
+                                                       sigc::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked_canvasview),
                                                        -1
                                                ),
                                                waypoint_set
@@ -1119,7 +1112,6 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
 
        dialog.get_vbox()->pack_start(widget_waypoint_model);
 
-
        dialog.add_button(Gtk::StockID("gtk-apply"),1);
        dialog.add_button(Gtk::StockID("gtk-cancel"),0);
        dialog.show();
@@ -1169,7 +1161,6 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
                        action->set_param("canvas",canvas_view->get_canvas());
                        action->set_param("canvas_interface",canvas_interface);
 
-
                        if(!canvas_interface->get_instance()->perform_action(action))
                        {
                                canvas_view->get_ui_interface()->error(_("Unable to convert to animated waypoint"));
@@ -1183,10 +1174,8 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
                                value_node=ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node());
                }
 
-
                if(value_node)
                {
-
                        synfigapp::Action::Handle action(synfigapp::Action::create("waypoint_set_smart"));
 
                        if(!action)
@@ -1196,7 +1185,6 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
                                return;
                        }
 
-
                        action->set_param("canvas",canvas_view->get_canvas());
                        action->set_param("canvas_interface",canvas_interface);
                        action->set_param("value_node",ValueNode::Handle(value_node));

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp
index 4a49852..10af2a5 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp
@@ -739,7 +739,7 @@ LayerTree::on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node _
 
        // synfigapp::ValueDesc value_desc;
        // std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
-       // signal_waypoint_clicked_layertree()(value_desc,waypoint_set,button,side);
+       // signal_waypoint_clicked_layertree()(value_desc,waypoint_set,button);
 }
 
 bool

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.h b/synfig-studio/trunk/src/gtkmm/layertree.h
index 8b599be..bd09cc3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.h
+++ b/synfig-studio/trunk/src/gtkmm/layertree.h
@@ -101,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_;
@@ -139,7 +135,7 @@ private:
 
        sigc::signal<bool, int, Gtk::TreeRow, ColumnID> signal_param_user_click_;
 
-       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int,synfig::Waypoint::Side> signal_waypoint_clicked_layertree_;
+       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int> signal_waypoint_clicked_layertree_;
 
        bool disable_amount_changed_signal;
 
@@ -238,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,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int,synfig::Waypoint::Side>& signal_waypoint_clicked_layertree() { return signal_waypoint_clicked_layertree_; }
+       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);