X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=89ce488322a363a1ab39c7331690aed50dbe07db;hb=10bc4dc98c164330589595f67f120f10f4bf0dad;hp=400aa02145c6a9719d4e1695e937a8421e665628;hpb=1cc193c2c59276dbb860d726f82cb6c78ce14027;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 400aa02..89ce488 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1357,8 +1357,8 @@ CanvasView::init_menus()
 	}
 
 
-#define DUCK_MASK(lower,upper)	\
-	duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", _("Show "#lower" ducks")); \
+#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)); \
 	action_group->add( duck_mask_##lower, \
 		sigc::bind( \
@@ -1366,12 +1366,12 @@ CanvasView::init_menus()
 			Duck::TYPE_##upper \
 		) \
 	)
-	DUCK_MASK(position,POSITION);
-	DUCK_MASK(tangent,TANGENT);
-	DUCK_MASK(vertex,VERTEX);
-	DUCK_MASK(radius,RADIUS);
-	DUCK_MASK(width,WIDTH);
-	DUCK_MASK(angle,ANGLE);
+	DUCK_MASK(position,POSITION,_("Show Position Ducks"));
+	DUCK_MASK(tangent,TANGENT,_("Show Tangent Ducks"));
+	DUCK_MASK(vertex,VERTEX,_("Show Vertex Ducks"));
+	DUCK_MASK(radius,RADIUS,_("Show Radius Ducks"));
+	DUCK_MASK(width,WIDTH,_("Show Width Ducks"));
+	DUCK_MASK(angle,ANGLE,_("Show Angle Ducks"));
 #undef DUCK_MASK
 
 	add_accel_group(App::ui_manager()->get_accel_group());
@@ -1990,7 +1990,7 @@ CanvasView::close_instance()
 }
 
 handle<CanvasView>
-CanvasView::create(loose_handle<Instance> instance,handle<Canvas> canvas)
+CanvasView::create(etl::loose_handle<Instance> instance, etl::handle<synfig::Canvas> canvas)
 {
 	etl::handle<studio::CanvasView> view(new CanvasView(instance,instance->synfigapp::Instance::find_canvas_interface(canvas)));
 	instance->canvas_view_list().push_front(view);
@@ -2536,7 +2536,7 @@ CanvasView::on_keyframe_button_pressed()
 }
 
 bool
-CanvasView::duck_change_param(const Point &value,synfig::Layer::Handle layer, synfig::String param_name)
+CanvasView::duck_change_param(const synfig::Point &value,synfig::Layer::Handle layer, synfig::String param_name)
 {
 	return canvas_interface()->change_value(synfigapp::ValueDesc(layer,param_name),value);
 }
@@ -2569,7 +2569,7 @@ CanvasView::on_duck_angle_changed(const synfig::Angle &rotation,const synfigapp:
 }
 
 void
-CanvasView::selected_layer_color_set(Color color)
+CanvasView::selected_layer_color_set(synfig::Color color)
 {
 	synfigapp::SelectionManager::LayerList selected_list(get_selection_manager()->get_selected_layers());
 	synfigapp::SelectionManager::LayerList::iterator iter;
@@ -2588,7 +2588,7 @@ CanvasView::selected_layer_color_set(Color color)
 }
 
 void
-CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas::Handle canvas, std::set<synfig::Layer::Handle>& selected_list)
+CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig::Canvas::Handle canvas, std::set<synfig::Layer::Handle>& selected_list)
 {
 	int transforms(0);
 	String layer_name;
@@ -3421,7 +3421,7 @@ CanvasView::on_audio_file_change(const std::string &f)
 }
 
 void
-CanvasView::on_audio_offset_change(const Time &t)
+CanvasView::on_audio_offset_change(const synfig::Time &t)
 {
 	canvas_interface()->set_meta_data("audiooffset",t.get_string());
 }