Removed unused code. The duck toggle actions look after themselves.

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

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 812958d..1cb3b42 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 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
@@ -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,19 +307,11 @@ 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;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_radius;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_width;
-       Glib::RefPtr<Gtk::ToggleAction> duck_mask_angle;
-
        Gtk::RadioButtonGroup quality_group;
+       Gtk::RadioButtonGroup low_res_pixel_size_group;
 
        Glib::RefPtr<Gtk::ActionGroup> action_group;
 
-
        etl::handle<synfigapp::UIInterface> ui_interface_;
        etl::handle<synfigapp::SelectionManager> selection_manager_;
 
@@ -352,7 +340,6 @@ public:
 
        bool cancel;
 
-
        /*
  -- ** -- D I A L O G S -------------------------------------------------------
        */
@@ -379,13 +366,13 @@ private:
        CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigapp::CanvasInterface> canvas_interface);
 
        //! Constructor Helper
-       Gtk::Widget* create_layer_tree();
+       // Gtk::Widget* create_layer_tree();
 
        //! Constructor Helper
-       Gtk::Widget* create_children_tree();
+       // Gtk::Widget* create_children_tree();
 
        //! Constructor Helper
-       Gtk::Widget* create_keyframe_tree();
+       // Gtk::Widget* create_keyframe_tree();
 
        //! Constructor Helper
        Gtk::Widget* create_status_bar();
@@ -407,20 +394,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
@@ -428,6 +410,9 @@ private:
 
        void rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig::Canvas::Handle canvas, std::set<synfig::Layer::Handle>& selected_list);
 
+       void decrease_low_res_pixel_size();
+       void increase_low_res_pixel_size();
+
        /*
  -- ** -- P U B L I C   M E T H O D S -----------------------------------------
        */
@@ -590,7 +575,7 @@ public:
 
        void image_import();
 
-       void on_waypoint_clicked(synfigapp::ValueDesc,synfig::Waypoint, int button);
+       void on_waypoint_clicked_canvasview(synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >, int button);
 
        void preview_option() {on_preview_option();}
 
@@ -677,8 +662,6 @@ private:
 
        void on_edited_value(synfigapp::ValueDesc,synfig::ValueBase);
 
-       //void on_waypoint_clicked(synfigapp::ValueDesc,synfig::ValueNode_Animated::WaypointList::iterator, int button);
-
        void on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time);
 
        //void on_audio_play();
@@ -695,6 +678,8 @@ protected:
 public:
 
        static etl::handle<studio::CanvasView> create(etl::loose_handle<Instance> instance,etl::handle<synfig::Canvas> canvas);
+       static std::list<int>& get_pixel_sizes();
+
 }; // END of class CanvasView
 
 }; // END of namespace studio