X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Faction_system.cpp;h=844c52ce622626e2c44db844c770f1332ed0046b;hb=6989d1403b14b5b27dbf81b2c1cf6889511adf97;hp=33f71f987e5a82536cb375bf3b2c6f35cc9aa6c7;hpb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp
index 33f71f9..844c52c 100644
--- a/synfig-studio/trunk/src/synfigapp/action_system.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp
@@ -74,7 +74,7 @@ Action::System::perform_action(etl::handle<Action::Base> action)
 
 	if(!action->is_ready())
 	{
-		uim->error(action->get_name()+": "+_("Action is not ready."));
+		uim->error(action->get_local_name()+": "+_("Action is not ready."));
 		return false;
 	}
 
@@ -105,7 +105,7 @@ Action::System::perform_action(etl::handle<Action::Base> action)
 	if(!undoable_action)
 	{
 		if(uim->yes_no(
-			action->get_name(),
+			action->get_local_name(),
 			_("This action cannot be undone! Are you sure you want to continue?"),
 			UIInterface::RESPONSE_NO
 			) == UIInterface::RESPONSE_NO
@@ -125,15 +125,15 @@ Action::System::perform_action(etl::handle<Action::Base> action)
 	try { action->perform(); }
 	catch(Action::Error err)
 	{
-		uim->task(action->get_name()+' '+_("Failed"));
+		uim->task(action->get_local_name()+' '+_("Failed"));
 		inuse=false;
 
 		if(err.get_type()!=Action::Error::TYPE_UNABLE)
 		{
 			if(err.get_desc().empty())
-				uim->error(action->get_name()+": "+strprintf("%d",err.get_type()));
+				uim->error(action->get_local_name()+": "+strprintf("%d",err.get_type()));
 			else
-				uim->error(action->get_name()+": "+err.get_desc());
+				uim->error(action->get_local_name()+": "+err.get_desc());
 		}
 
 		// If action failed for whatever reason, just return false and do
@@ -142,10 +142,10 @@ Action::System::perform_action(etl::handle<Action::Base> action)
 	}
 	catch(std::exception err)
 	{
-		uim->task(action->get_name()+' '+_("Failed"));
+		uim->task(action->get_local_name()+' '+_("Failed"));
 		inuse=false;
 
-		uim->error(action->get_name()+": "+err.what());
+		uim->error(action->get_local_name()+": "+err.what());
 
 		// If action failed for whatever reason, just return false and do
 		// not add the action onto the list
@@ -153,7 +153,7 @@ Action::System::perform_action(etl::handle<Action::Base> action)
 	}
 	catch(...)
 	{
-		uim->task(action->get_name()+' '+_("Failed"));
+		uim->task(action->get_local_name()+' '+_("Failed"));
 		inuse=false;
 
 		// If action failed for whatever reason, just return false and do
@@ -186,7 +186,7 @@ Action::System::perform_action(etl::handle<Action::Base> action)
 
 	inuse=false;
 
-	uim->task(action->get_name()+' '+_("Successful"));
+	uim->task(action->get_local_name()+' '+_("Successful"));
 
 	// If the action has "dirtied" the preview, signal it.
 	if(0)if(canvas_specific && canvas_specific->is_dirty())
@@ -198,7 +198,6 @@ Action::System::perform_action(etl::handle<Action::Base> action)
 		{
 			handle<CanvasInterface> canvas_interface=static_cast<Instance*>(this)->find_canvas_interface(canvas);
 			assert(canvas_interface);
-			DEBUGPOINT();
 			//canvas_interface->signal_dirty_preview()();
 		}
 	}
@@ -220,9 +219,9 @@ synfigapp::Action::System::undo_(etl::handle<UIInterface> uim)
 		if(err.get_type()!=Action::Error::TYPE_UNABLE)
 		{
 			if(err.get_desc().empty())
-				uim->error(action->get_name()+_(" (Undo): ")+strprintf("%d",err.get_type()));
+				uim->error(action->get_local_name()+_(" (Undo): ")+strprintf("%d",err.get_type()));
 			else
-				uim->error(action->get_name()+_(" (Undo): ")+err.get_desc());
+				uim->error(action->get_local_name()+_(" (Undo): ")+err.get_desc());
 		}
 
 		return false;
@@ -282,7 +281,7 @@ synfigapp::Action::System::undo()
 
 	if(!undo_(uim))
 	{
-		uim->error(undo_action_stack_.front()->get_name()+": "+_("Failed to undo."));
+		uim->error(undo_action_stack_.front()->get_local_name()+": "+_("Failed to undo."));
 		inuse=false;
 		return false;
 	}
@@ -299,7 +298,6 @@ synfigapp::Action::System::undo()
 		{
 			handle<CanvasInterface> canvas_interface=static_cast<Instance*>(this)->find_canvas_interface(canvas);
 			assert(canvas_interface);
-			//DEBUGPOINT();
 			//canvas_interface->signal_dirty_preview()();
 		}
 	}
@@ -319,9 +317,9 @@ Action::System::redo_(etl::handle<UIInterface> uim)
 		if(err.get_type()!=Action::Error::TYPE_UNABLE)
 		{
 			if(err.get_desc().empty())
-				uim->error(action->get_name()+_(" (Redo): ")+strprintf("%d",err.get_type()));
+				uim->error(action->get_local_name()+_(" (Redo): ")+strprintf("%d",err.get_type()));
 			else
-				uim->error(action->get_name()+_(" (Redo): ")+err.get_desc());
+				uim->error(action->get_local_name()+_(" (Redo): ")+err.get_desc());
 		}
 
 		return false;
@@ -381,7 +379,7 @@ Action::System::redo()
 
 	if(!redo_(uim))
 	{
-		uim->error(redo_action_stack_.front()->get_name()+": "+_("Failed to redo."));
+		uim->error(redo_action_stack_.front()->get_local_name()+": "+_("Failed to redo."));
 		inuse=false;
 		return false;
 	}
@@ -398,7 +396,6 @@ Action::System::redo()
 		{
 			handle<CanvasInterface> canvas_interface=static_cast<Instance*>(this)->find_canvas_interface(canvas);
 			assert(canvas_interface);
-			//DEBUGPOINT();
 			//canvas_interface->signal_dirty_preview()();
 		}
 	}
@@ -511,7 +508,6 @@ Action::System::set_action_status(etl::handle<Action::Undoable> action, bool x)
 			Canvas::Handle canvas=canvas_specific->get_canvas();
 			handle<CanvasInterface> canvas_interface=static_cast<Instance*>(this)->find_canvas_interface(canvas);
 			assert(canvas_interface);
-			//DEBUGPOINT();
 			//canvas_interface->signal_dirty_preview()();
 		}
 
@@ -532,7 +528,6 @@ Action::System::set_action_status(etl::handle<Action::Undoable> action, bool x)
 			Canvas::Handle canvas=canvas_specific->get_canvas();
 			handle<CanvasInterface> canvas_interface=static_cast<Instance*>(this)->find_canvas_interface(canvas);
 			assert(canvas_interface);
-			DEBUGPOINT();
 			//canvas_interface->signal_dirty_preview()();
 		}
 
@@ -555,12 +550,10 @@ Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<System> instance_,synfi
 void
 Action::PassiveGrouper::request_redraw(etl::handle<CanvasInterface> x)
 {
-/*	DEBUGPOINT();
-	if(instance_->group_stack_.empty())
+/*	if(instance_->group_stack_.empty())
 	{
 		if(x!=canvas_interface_)
 		{
-			DEBUGPOINT();
 			x->signal_dirty_preview()();
 		}
 
@@ -568,21 +561,16 @@ Action::PassiveGrouper::request_redraw(etl::handle<CanvasInterface> x)
 	}
 	else
 	{
-		DEBUGPOINT();
 		if(instance_->group_stack_.back()==this)
 		{
-			DEBUGPOINT();
 			redraw_requested_=true;
 		}
 		else
 		{
-			DEBUGPOINT();
 			instance_->group_stack_.back()->request_redraw(x);
 			redraw_requested_=false;
 		}
-		DEBUGPOINT();
 	}
-	DEBUGPOINT();
 */
 	if(x)
 	{
@@ -678,7 +666,6 @@ Action::PassiveGrouper::~PassiveGrouper()
 		if(instance_->group_stack_.empty())
 		{
 			assert(canvas_interface_);
-			DEBUGPOINT();
 			canvas_interface_->signal_dirty_preview()();
 		}
 		else