[Traverso-commit] traverso resources/keymap.xml src/commands/CMak...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/02/13 23:20:59

Modified files:
        resources      : keymap.xml 
        src/commands   : CMakeLists.txt 
        src/commands/plugins/TraversoCommands: TraversoCommands.cpp 
                                               TraversoCommands.h 

Log message:
        * show FoldSheet and FoldTrack in the Sheet/Track menu

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/CMakeLists.txt?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h?cvsroot=traverso&r1=1.10&r2=1.11

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- resources/keymap.xml        13 Feb 2008 23:02:16 -0000      1.104
+++ resources/keymap.xml        13 Feb 2008 23:20:58 -0000      1.105
@@ -484,8 +484,8 @@
                </keyfact>
                <keyfact type="HKEY2" key1="D" key2="F" >
                        <Objects>
-                               <Object objectname="TrackView" mousehint="LRUD" 
modes="All" sortorder="20" pluginname="TraversoCommands" commandname="MoveClip" 
arguments="fold_track" />
-                               <Object objectname="SheetView" mousehint="LRUD" 
modes="All" sortorder="21" pluginname="TraversoCommands" modifierkeys="CTRL" 
commandname="MoveClip" arguments="fold_sheet" />
+                               <Object objectname="TrackView" mousehint="LRUD" 
modes="All" sortorder="6" pluginname="TraversoCommands" commandname="FoldTrack" 
arguments="fold_track" />
+                               <Object objectname="SheetView" mousehint="LRUD" 
modes="All" sortorder="20" pluginname="TraversoCommands" modifierkeys="CTRL" 
commandname="FoldSheet" arguments="fold_sheet" />
                        </Objects>
                </keyfact>
                <keyfact type="HKEY2" key1="Z" key2="V" >

Index: src/commands/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/commands/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/commands/CMakeLists.txt 13 Feb 2008 23:02:17 -0000      1.9
+++ src/commands/CMakeLists.txt 13 Feb 2008 23:20:59 -0000      1.10
@@ -20,7 +20,6 @@
 Gain.cpp
 Import.cpp
 MoveClip.cpp
-MultiMove.cpp
 MoveEdge.cpp
 PCommand.cpp
 SplitClip.cpp

Index: src/commands/plugins/TraversoCommands/TraversoCommands.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/commands/plugins/TraversoCommands/TraversoCommands.cpp  13 Feb 2008 
23:02:17 -0000      1.26
+++ src/commands/plugins/TraversoCommands/TraversoCommands.cpp  13 Feb 2008 
23:20:59 -0000      1.27
@@ -111,13 +111,13 @@
        m_dict.insert("ClipSelectionAdd", ClipSelectionCommand);
        m_dict.insert("ClipSelectionRemove", ClipSelectionCommand);
        m_dict.insert("MoveClip", MoveClipCommand);
+       m_dict.insert("FoldSheet", MoveClipCommand);
+       m_dict.insert("FoldTrack", MoveClipCommand);
        m_dict.insert("DragEdge", DragEdgeCommand);
        m_dict.insert("MoveClipOrEdge", MoveClipOrEdgeCommand);
        m_dict.insert("CopyClip", MoveClipCommand);
        m_dict.insert("SplitClip", SplitClipCommand);
        m_dict.insert("ArmTracks", ArmTracksCommand);
-       m_dict.insert("MultiMove", MultiMoveCommand);
-       m_dict.insert("MultiMoveSingle", MultiMoveCommand);
        m_dict.insert("VZoomIn", ZoomCommand);
        m_dict.insert("VZoomOut", ZoomCommand);
        m_dict.insert("HZoomIn", ZoomCommand);
@@ -345,22 +345,6 @@
                        return new ArmTracks(view);
                }
                
-               case MultiMoveCommand:
-               {
-                       SheetView* view = qobject_cast<SheetView*>(obj);
-                       
-                       bool allTracks = true;
-                       if (arguments.size()) {
-                               allTracks = arguments[0].toBool();
-                       }
-                       
-                       if (!view) {
-                               PERROR("TraversoCommands: Supplied QObject was 
not a SheetView! "
-                                       "MultiMoveCommand needs a SheetView as 
argument");
-                               return 0;
-                       }
-                       return new MultiMove(view, allTracks);
-               }
                case ZoomCommand:
                {
                        SheetView* view = qobject_cast<SheetView*>(obj);

Index: src/commands/plugins/TraversoCommands/TraversoCommands.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/commands/plugins/TraversoCommands/TraversoCommands.h    12 Feb 2008 
11:01:08 -0000      1.10
+++ src/commands/plugins/TraversoCommands/TraversoCommands.h    13 Feb 2008 
23:20:59 -0000      1.11
@@ -47,8 +47,8 @@
        Q_CLASSINFO("MoveClipOrEdge", tr("Move Or Resize Clip"))
        Q_CLASSINFO("SplitClip", tr("Split"))
        Q_CLASSINFO("ArmTracks", tr("Arm Tracks"))
-       Q_CLASSINFO("MultiMove", tr("Fold Sheet"))
-       Q_CLASSINFO("MultiMoveSingle", tr("Fold Track"))
+       Q_CLASSINFO("FoldSheet", tr("Fold Sheet"))
+       Q_CLASSINFO("FoldTrack", tr("Fold Track"))
        Q_CLASSINFO("VZoomIn", tr("Vertical In"))
        Q_CLASSINFO("HZoomOut", tr("Horizontal Out"))
        Q_CLASSINFO("HZoomIn", tr("Horizontal In"))
@@ -81,7 +81,6 @@
                MoveClipOrEdgeCommand,
                SplitClipCommand,
                ArmTracksCommand,
-               MultiMoveCommand,
                ZoomCommand,
                ScrollCommand
        };