[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/keymap.xml src/commands/plug...
|
From: |
Ben Levitt |
|
Subject: |
[Traverso-commit] traverso resources/keymap.xml src/commands/plug... |
|
Date: |
Tue, 24 Apr 2007 23:47:19 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/04/24 23:47:19
Modified files:
resources : keymap.xml
src/commands/plugins/TraversoCommands: TraversoCommands.cpp
TraversoCommands.h
Log message:
Add <<R>> for RemoveClip, disable all hard selection functionality for
now
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h?cvsroot=traverso&r1=1.4&r2=1.5
Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- resources/keymap.xml 20 Apr 2007 09:43:36 -0000 1.57
+++ resources/keymap.xml 24 Apr 2007 23:47:19 -0000 1.58
@@ -93,7 +93,6 @@
<keyfact type="FKEY" key1="S" >
<Objects>
<Object objectname="Project"
slotsignature="select" modes="All" instantanious="0" />
- <Object objectname="AudioClip" modes="All"
sortorder="5" submenu="Selection" pluginname="TraversoCommands"
commandname="ClipSelectionSelect" arguments="select_clip" />
<Object objectname="MoveClip"
slotsignature="prev_snap_pos" modes="All" sortorder="1" instantanious="1" />
<Object objectname="DragMarker"
slotsignature="move_left" modes="All" sortorder="1" instantanious="1" />
</Objects>
@@ -264,21 +263,6 @@
<Object objectname="SongView"
slotsignature="vzoom_in" modes="All" sortorder="5" submenu="Zoom"
instantanious="0" />
</Objects>
</keyfact>
- <keyfact type="FKEY2" key1="S" key2="D" >
- <Objects>
- <Object objectname="AudioClip" modes="All"
sortorder="10" submenu="Selection" pluginname="TraversoCommands"
commandname="ClipSelectionAdd" arguments="add_to_selection" />
- </Objects>
- </keyfact>
- <keyfact type="FKEY2" key1="S" key2="A" >
- <Objects>
- <Object objectname="AudioClip" modes="All"
sortorder="20" submenu="Selection" pluginname="TraversoCommands"
commandname="ClipSelectionRemove" arguments="remove_from_selection" />
- </Objects>
- </keyfact>
- <keyfact type="FKEY2" key1="A" key2="D" >
- <Objects>
- <Object objectname="AudioClipManager"
slotsignature="invert_clip_selection" modes="All" sortorder="5"
submenu="Selection" instantanious="0" />
- </Objects>
- </keyfact>
<keyfact type="FKEY2" key1="J" key2="L" >
<Objects>
<Object objectname="Track"
slotsignature="capture_from_channel_both" modes="All" instantanious="0" />
@@ -467,6 +451,7 @@
</keyfact>
<keyfact type="D_FKEY" key1="R" >
<Objects>
+ <Object objectname="AudioClip" modes="All"
sortorder="50" pluginname="TraversoCommands" commandname="RemoveClip" />
<Object objectname="Track" modes="All"
sortorder="50" pluginname="TraversoCommands" commandname="RemoveTrack" />
<Object objectname="CurveView"
slotsignature="remove_node" modes="All" instantanious="0" />
<Object objectname="PluginView"
slotsignature="remove_plugin" modes="All" instantanious="0" />
@@ -506,16 +491,6 @@
<Object objectname="Song"
slotsignature="remove_track" modes="All" sortorder="33" instantanious="0" />
</Objects>
</keyfact>
- <keyfact type="D_FKEY2" key1="S" key2="D" >
- <Objects>
- <Object objectname="AudioClipManager"
slotsignature="select_all_clips" modes="All" sortorder="5" submenu="Selection"
instantanious="0" />
- </Objects>
- </keyfact>
- <keyfact type="D_FKEY2" key1="S" key2="A" >
- <Objects>
- <Object objectname="AudioClipManager"
slotsignature="deselect_all_clips" modes="All" sortorder="6"
submenu="Selection" instantanious="0" />
- </Objects>
- </keyfact>
<keyfact type="D_FKEY2" key1="F" key2="G" >
<Objects>
<Object objectname="AudioClip"
slotsignature="reset_fade_in" modes="All" sortorder="18" submenu="Fade In/Out"
instantanious="0" />
@@ -531,11 +506,6 @@
<Object objectname="AudioClip"
slotsignature="reset_fade_both" modes="All" sortorder="38" submenu="Fade
In/Out" instantanious="0" />
</Objects>
</keyfact>
- <keyfact type="D_FKEY2" key1="C" key2="X" >
- <Objects>
- <Object objectname="AudioClipManager"
slotsignature="delete_selected_clips" modes="All" sortorder="1"
submenu="Selection" instantanious="0" />
- </Objects>
- </keyfact>
<keyfact type="S_FKEY_FKEY" key1="W" key2="E" >
<Objects>
Index: src/commands/plugins/TraversoCommands/TraversoCommands.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/commands/plugins/TraversoCommands/TraversoCommands.cpp 11 Apr 2007
22:47:02 -0000 1.7
+++ src/commands/plugins/TraversoCommands/TraversoCommands.cpp 24 Apr 2007
23:47:19 -0000 1.8
@@ -38,6 +38,7 @@
m_dict.insert("ResetTrackPan", TrackPanCommand);
m_dict.insert("ImportAudio", ImportAudioCommand);
m_dict.insert("AddNewTrack", AddNewTrackCommand);
+ m_dict.insert("RemoveClip", RemoveClipCommand);
m_dict.insert("RemoveTrack", RemoveTrackCommand);
m_dict.insert("AudioClipExternalProcessing",
AudioClipExternalProcessingCommand);
m_dict.insert("ClipSelectionSelect", ClipSelectionCommand);
@@ -107,6 +108,17 @@
return song->add_track(new Track(song, "Unnamed",
Track::INITIAL_HEIGHT));
}
+ case RemoveClipCommand:
+ {
+ AudioClip* clip = qobject_cast<AudioClip*>(obj);
+ if (!clip) {
+ PERROR("TraversoCommands: Supplied QObject was
not a Clip! "
+ "RemoveClipCommand needs a Clip as
argument");
+ return 0;
+ }
+ return clip->get_track()->remove_clip(clip);
+ }
+
case RemoveTrackCommand:
{
Track* track = qobject_cast<Track*>(obj);
Index: src/commands/plugins/TraversoCommands/TraversoCommands.h
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/commands/plugins/TraversoCommands/TraversoCommands.h 10 Apr 2007
17:12:48 -0000 1.4
+++ src/commands/plugins/TraversoCommands/TraversoCommands.h 24 Apr 2007
23:47:19 -0000 1.5
@@ -35,6 +35,7 @@
Q_CLASSINFO("ImportAudio", tr("Import audio"))
Q_CLASSINFO("CopyClip", tr("Copy Clip"))
Q_CLASSINFO("AddNewTrack", tr("New Track"))
+ Q_CLASSINFO("RemoveClip", tr("Remove Clip"))
Q_CLASSINFO("RemoveTrack", tr("Remove Track"))
Q_CLASSINFO("AudioClipExternalProcessing", tr("External Processing"))
Q_CLASSINFO("ClipSelectionSelect", tr("Select"))
@@ -56,6 +57,7 @@
TrackPanCommand,
ImportAudioCommand,
AddNewTrackCommand,
+ RemoveClipCommand,
RemoveTrackCommand,
AudioClipExternalProcessingCommand,
ClipSelectionCommand,