[Traverso-commit] traverso/src commands/MoveEdge.cpp commands/Mov...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/04/20 06:37:10

Modified files:
        src/commands   : MoveEdge.cpp MoveEdge.h 
        src/traverso/songcanvas: CurveView.cpp 

Log message:
        Implement cancel_action() for more commands, make DragNode undoable

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveEdge.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveEdge.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.29&r2=1.30

Patches:
Index: commands/MoveEdge.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveEdge.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- commands/MoveEdge.cpp       29 Mar 2007 21:09:42 -0000      1.15
+++ commands/MoveEdge.cpp       20 Apr 2007 06:37:10 -0000      1.16
@@ -79,6 +79,13 @@
 }
 
 
+void MoveEdge::cancel_action()
+{
+       finish_hold();
+       undo_action();
+}
+
+
 int MoveEdge::do_action()
 {
         return QMetaObject::invokeMethod(m_clip, m_edge.data(), Q_ARG(long, 
m_newPos));

Index: commands/MoveEdge.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveEdge.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- commands/MoveEdge.h 16 Jan 2007 20:21:08 -0000      1.6
+++ commands/MoveEdge.h 20 Apr 2007 06:37:10 -0000      1.7
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: MoveEdge.h,v 1.6 2007/01/16 20:21:08 r_sijrier Exp $
+    $Id: MoveEdge.h,v 1.7 2007/04/20 06:37:10 benjie Exp $
 */
 
 #ifndef MOVEEDGE_H
@@ -40,6 +40,7 @@
 
         int begin_hold();
         int finish_hold();
+       void cancel_action();
         int prepare_actions();
         int do_action();
         int undo_action();

Index: traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- traverso/songcanvas/CurveView.cpp   17 Apr 2007 19:56:46 -0000      1.29
+++ traverso/songcanvas/CurveView.cpp   20 Apr 2007 06:37:10 -0000      1.30
@@ -48,6 +48,7 @@
        int do_action();
         int undo_action();
        int finish_hold();
+       void cancel_action();
         int begin_hold();
         int jog();
 
@@ -83,7 +84,10 @@
        // this makes no sense!!!!!!!
        // So we fake this action to be failed, and thus
        // it won't show up in the history 
-       return -1;
+
+       // BEN: What?  This should be undoable.
+       // TODO: Figure out what that comment means...
+       return 1;
 }
 
 int DragNode::finish_hold()
@@ -91,6 +95,11 @@
        return 1;
 }
 
+void DragNode::cancel_action()
+{
+       undo_action();
+}
+
 int DragNode::begin_hold()
 {
        m_origPos.setX(m_node->get_when());