X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.h;h=cb0c0f311b8b3d708abe68b8b1096eec2264ede1;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=17cedda7dcc658ea6594a1e5a12ebbaaf9eb8410;hpb=6ea7e1fb3e6c78544c4d319b4338820f6559de80;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 17cedda..cb0c0f3 100644
--- 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
@@ -98,6 +98,10 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace synfig {
+	class TransformStack;
+}
+
 namespace studio {
 
 class CanvasViewUIInterface;
@@ -121,7 +125,6 @@ class Widget_Time;
 class Dialog_SoundSelect;
 class Dialog_Preview;
 
-class synfig::TransformStack;
 class Dock_Layers;
 class Dock_Children;
 class Dock_Keyframes;
@@ -155,7 +158,7 @@ public:
 	typedef ChildrenTreeStore::Model ChildrenTreeModel;
 
 	//! Create an instance of this class whenever doing a longer task.
-	/*! Make sure that you check the bool value of this class occasionaly
+	/*! Make sure that you check the bool value of this class occasionally
 	**	to make sure the action has not been canceled. */
 	class IsWorking
 	{
@@ -185,31 +188,31 @@ private:
 
 	synfig::Rect bbox;
 
-	DEBUGPOINT_CLASS(1);
+	// DEBUGPOINT_CLASS(1);
 
 	//! State Machine
 	Smach smach_;
 
-	DEBUGPOINT_CLASS(2);
+	// DEBUGPOINT_CLASS(2);
 
 	etl::loose_handle<Instance> instance_;
 	etl::handle<synfigapp::CanvasInterface> canvas_interface_;
 
-	DEBUGPOINT_CLASS(3);
+	// DEBUGPOINT_CLASS(3);
 
 	//! Sound and information to play it
 	etl::handle<AudioContainer>		audio;
 	studio::Widget_Sound			*disp_audio; //should this be put into thing too?
 
-	SigC::Connection				playcon;
-	SigC::Connection				stopcon;
+	sigc::connection				playcon;
+	sigc::connection				stopcon;
 
 	std::auto_ptr<UniversalScrubber> universal_scrubber;
 
-	//! Tooltip controler
+	//! Tooltip controller
 	Gtk::Tooltips tooltips;
 
-	DEBUGPOINT_CLASS(4);
+	// DEBUGPOINT_CLASS(4);
 
 	//! TreeModel for the layers
 	LayerTreeModel layer_tree_model;
@@ -223,7 +226,7 @@ private:
 
 	//Glib::RefPtr<KeyframeTreeStore> keyframe_tree_store_;
 
-	DEBUGPOINT_CLASS(5);
+	// DEBUGPOINT_CLASS(5);
 
 	//std::map<synfig::String,Glib::RefPtr<Gtk::TreeModel> > tree_model_book_;
 	std::map<synfig::String,Glib::RefPtr<Glib::ObjectBase> > ref_obj_book_;
@@ -317,6 +320,7 @@ private:
 	Glib::RefPtr<Gtk::ToggleAction> duck_mask_angle;
 
 	Gtk::RadioButtonGroup quality_group;
+	Gtk::RadioButtonGroup low_res_pixel_size_group;
 
 	Glib::RefPtr<Gtk::ActionGroup> action_group;
 
@@ -376,13 +380,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();
@@ -425,6 +429,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 -----------------------------------------
 	*/
@@ -587,7 +594,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, synfig::Waypoint::Side side);
 
 	void preview_option() {on_preview_option();}
 
@@ -668,13 +675,12 @@ private:
 	void on_audio_offset_notify();
 
 	bool on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc);
+	bool on_duck_angle_changed(const synfig::Angle &rotation,const synfigapp::ValueDesc& value_desc);
 
 	void on_layer_toggle(synfig::Layer::Handle);
 
 	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();
@@ -691,6 +697,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