X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=4f6dec97ca70e91281ff796150da17df3b2c9bc6;hb=f3b374ad0a71fe8e96a1095370870de8e83bc36c;hp=1749eb9288701eeb32f4103cd071515af3fa074c;hpb=2db25eb9d77d3f995367e403035083be4607783c;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 1749eb9..4f6dec9 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -123,13 +123,6 @@ using namespace sigc;
 
 #define DEFAULT_TIME_WINDOW_SIZE		(10.0)
 
-/*
-#ifdef DEBUGPOINT
-#undef DEBUGPOINT
-#endif
-#define DEBUGPOINT()
-*/
-
 #ifndef SMALL_BUTTON
 #define SMALL_BUTTON(button,stockid,tooltip)	\
 	button = manage(new class Gtk::Button());	\
@@ -449,7 +442,7 @@ public:
 	{
 //		assert(view->layer_tree);
 
-		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return LayerList(); }
+		if(!view->layer_tree) { synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return LayerList(); }
 		return view->layer_tree->get_selected_layers();
 	}
 
@@ -458,7 +451,7 @@ public:
 	{
 //		assert(view->layer_tree);
 
-		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return 0; }
+		if(!view->layer_tree) { synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return 0; }
 		return view->layer_tree->get_selected_layer();
 	}
 
@@ -467,7 +460,7 @@ public:
 	{
 //		assert(view->layer_tree);
 
-		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return; }
+		if(!view->layer_tree) { synfig::error("%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__); return; }
 		view->layer_tree->select_layers(layer_list);
 		//view->get_smach().process_event(EVENT_REFRESH_DUCKS);
 
@@ -479,7 +472,7 @@ public:
 	{
 //		assert(view->layer_tree);
 
-		if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return; }
+		if(!view->layer_tree) { synfig::error("canvas_view.layer_tree not defined!?"); return; }
 		view->layer_tree->select_layer(layer);
 		//view->queue_rebuild_ducks();
 	}
@@ -1187,6 +1180,12 @@ CanvasView::init_menus()
 	action_group = Gtk::ActionGroup::create();
 
 	//action_group->add( Gtk::Action::create("MenuFile", _("_File")) );
+	action_group->add( Gtk::Action::create("new", Gtk::Stock::NEW),
+		sigc::hide_return(sigc::ptr_fun(&studio::App::new_instance))
+	);
+	action_group->add( Gtk::Action::create("open", Gtk::Stock::OPEN),
+		sigc::hide_return(sigc::ptr_fun(&studio::App::dialog_open))
+	);
 	action_group->add( Gtk::Action::create("save", Gtk::Stock::SAVE),
 		hide_return(sigc::mem_fun(*get_instance().get(), &studio::Instance::save))
 	);
@@ -1229,6 +1228,9 @@ CanvasView::init_menus()
 	action_group->add( Gtk::Action::create("close-document", Gtk::StockID("gtk-close"), _("Close Document")),
 		sigc::hide_return(sigc::mem_fun(*this,&studio::CanvasView::close_instance))
 	);
+	action_group->add( Gtk::Action::create("quit", Gtk::StockID("gtk-quit"), _("Quit")),
+		sigc::hide_return(sigc::ptr_fun(&studio::App::quit))
+	);
 
 	//action_group->add( Gtk::Action::create("undo", Gtk::StockID("gtk-undo")),
 	//	SLOT_EVENT(EVENT_UNDO)
@@ -1274,7 +1276,7 @@ CanvasView::init_menus()
 			if (i == 10) note = _(" (fastest)");
 			Glib::RefPtr<Gtk::RadioAction> action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i),
 																		   strprintf(_("Set Quality to %d"),i) + note));
-			if(i==10)
+			if(i==9)			// default quality
 			{
 				action->set_active();
 				work_area->set_quality(i);
@@ -1770,7 +1772,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer)
 void
 CanvasView::register_layer_type(synfig::Layer::Book::value_type &/*lyr*/,std::map<synfig::String,Gtk::Menu*>* /*category_map*/)
 {
-/*	if(lyr.second.category==_("Do Not Use"))
+/*	if(lyr.second.category==CATEGORY_DO_NOT_USE)
 		return;
 
 	if(category_map->count(lyr.second.category)==0)
@@ -3020,7 +3022,7 @@ CanvasView::on_waypoint_clicked(synfigapp::ValueDesc value_desc,synfig::Waypoint
 				)
 			));
 
-			waypoint_menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("Edit Waypoint"),
+			waypoint_menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID(_("Edit Waypoint")),
 				sigc::mem_fun(
 					waypoint_dialog,
 					&Gtk::Widget::show