Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / action_system.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp
index daeab59..7aef925 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/action_system.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp
@@ -66,15 +66,18 @@ Action::System::~System()
 }
 
 bool
-Action::System::perform_action(handle<Action::Base> action)
+Action::System::perform_action(etl::handle<Action::Base> action)
 {
+       //// debug actions
+       // synfig::info("%s:%d perform_action: '%s'", __FILE__, __LINE__, action->get_name().c_str());
+
        handle<UIInterface> uim(get_ui_interface());
 
        assert(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 +108,7 @@ Action::System::perform_action(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 +128,15 @@ Action::System::perform_action(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 +145,10 @@ Action::System::perform_action(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 +156,7 @@ Action::System::perform_action(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 +189,7 @@ Action::System::perform_action(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 +201,6 @@ Action::System::perform_action(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()();
                }
        }
@@ -209,7 +211,7 @@ Action::System::perform_action(handle<Action::Base> action)
 }
 
 bool
-synfigapp::Action::System::undo_(handle<UIInterface> uim)
+synfigapp::Action::System::undo_(etl::handle<UIInterface> uim)
 {
        handle<Action::Undoable> action(undo_action_stack().front());
        most_recent_action_=action;
@@ -220,9 +222,9 @@ synfigapp::Action::System::undo_(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 +284,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 +301,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()();
                }
        }
@@ -308,7 +309,7 @@ synfigapp::Action::System::undo()
 }
 
 bool
-Action::System::redo_(handle<UIInterface> uim)
+Action::System::redo_(etl::handle<UIInterface> uim)
 {
        handle<Action::Undoable> action(redo_action_stack().front());
        most_recent_action_=action;
@@ -319,9 +320,9 @@ Action::System::redo_(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 +382,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 +399,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 +511,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 +531,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()();
                }
 
@@ -542,7 +540,7 @@ Action::System::set_action_status(etl::handle<Action::Undoable> action, bool x)
        return false;
 }
 
-Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<Action::System> instance_,synfig::String name_):
+Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<System> instance_,synfig::String name_):
        instance_(instance_),
        name_(name_),
        redraw_requested_(false),
@@ -553,14 +551,12 @@ Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<Action::System> instanc
 }
 
 void
-Action::PassiveGrouper::request_redraw(handle<CanvasInterface> x)
+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 +564,16 @@ Action::PassiveGrouper::request_redraw(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 +669,6 @@ Action::PassiveGrouper::~PassiveGrouper()
                if(instance_->group_stack_.empty())
                {
                        assert(canvas_interface_);
-                       DEBUGPOINT();
                        canvas_interface_->signal_dirty_preview()();
                }
                else