[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/keymap.xml src/commands/Move...
|
From: |
Ben Levitt |
|
Subject: |
[Traverso-commit] traverso resources/keymap.xml src/commands/Move... |
|
Date: |
Sat, 22 Nov 2008 18:26:33 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 08/11/22 18:26:33
Modified files:
resources : keymap.xml
src/commands : MoveClip.cpp MoveClip.h
src/commands/plugins/TraversoCommands: TraversoCommands.cpp
TraversoCommands.h
src/sheetcanvas: TimeLineView.cpp
Log message:
Add Fold Markers command.
Use < D F > for Fold Sheet
Use Ctrl + < D F > for Fold Markers and for Fold Track (The modifier
key makes the Fold command more specific)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.h?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.3&r2=1.4
Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- resources/keymap.xml 3 Oct 2008 20:09:10 -0000 1.109
+++ resources/keymap.xml 22 Nov 2008 18:26:32 -0000 1.110
@@ -494,8 +494,9 @@
</keyfact>
<keyfact type="HKEY2" key1="D" key2="F" >
<Objects>
- <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" />
+ <Object objectname="SheetView" mousehint="LR"
modes="All" sortorder="20" pluginname="TraversoCommands"
commandname="FoldSheet" arguments="fold_sheet" />
+ <Object objectname="TimeLineView"
mousehint="LR" modes="All" sortorder="7" pluginname="TraversoCommands"
modifierkeys="CTRL" commandname="FoldMarkers" arguments="fold_markers" />
+ <Object objectname="TrackView" mousehint="LR"
modes="All" sortorder="6" pluginname="TraversoCommands" modifierkeys="CTRL"
commandname="FoldTrack" arguments="fold_track" />
</Objects>
</keyfact>
<keyfact type="HKEY2" key1="Z" key2="V" >
Index: src/commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- src/commands/MoveClip.cpp 21 Nov 2008 16:12:29 -0000 1.77
+++ src/commands/MoveClip.cpp 22 Nov 2008 18:26:32 -0000 1.78
@@ -87,13 +87,16 @@
} else if (action == "fold_track") {
des = tr("Fold Track");
m_actionType = FOLD_TRACK;
+ } else if (action == "fold_markers") {
+ des = tr("Fold Markers");
+ m_actionType = FOLD_MARKERS;
} else {
PERROR("MoveClip: Unknown action type: %s", QS_C(action));
}
setText(des);
- if (m_actionType == FOLD_SHEET || m_actionType == FOLD_TRACK) {
+ if (m_actionType == FOLD_SHEET || m_actionType == FOLD_TRACK ||
m_actionType == FOLD_MARKERS) {
QList<AudioClip*> movingClips;
QList<Track*> tracks;
@@ -103,10 +106,13 @@
Q_ASSERT(tv);
d->sv= tv->get_sheetview();
tracks.append(tv->get_track());
- } else {
+ } else if (m_actionType == FOLD_SHEET) {
d->sv = qobject_cast<SheetView*>(view);
Q_ASSERT(d->sv);
tracks = d->sv->get_sheet()->get_tracks();
+ } else {
+ d->sv = qobject_cast<SheetView*>(view->get_sheetview());
+ Q_ASSERT(d->sv);
}
TimeRef currentLocation =
TimeRef(cpointer().on_first_input_event_scene_x() * d->sv->timeref_scalefactor);
@@ -117,7 +123,7 @@
d->pointedTrackIndex = 0;
}
- if (m_actionType == FOLD_SHEET) {
+ if (m_actionType == FOLD_SHEET || m_actionType == FOLD_MARKERS)
{
QList<Marker*> movingMarkers =
d->sv->get_sheet()->get_timeline()->get_markers();
foreach(Marker* marker, movingMarkers) {
if (marker->get_when() > currentLocation) {
@@ -129,15 +135,7 @@
}
}
- if (m_actionType == FOLD_SHEET) {
- QList<Marker*> movingMarkers =
d->sv->get_sheet()->get_timeline()->get_markers();
- foreach(Marker* marker, movingMarkers) {
- if (marker->get_when() > currentLocation) {
- m_markers.append(marker);
- }
- }
- }
-
+ if (m_actionType == FOLD_SHEET || m_actionType == FOLD_TRACK) {
foreach(Track* track, tracks) {
QList<AudioClip*> clips = track->get_cliplist();
foreach(AudioClip* clip, clips) {
@@ -146,6 +144,7 @@
}
}
}
+ }
m_group.set_clips(movingClips);
@@ -182,7 +181,7 @@
int MoveClip::begin_hold()
{
- if (!m_group.get_size() || m_group.is_locked()) {
+ if ((!m_group.get_size() || m_group.is_locked()) && !m_markers.count())
{
return -1;
}
@@ -227,7 +226,7 @@
}
if (m_origTrackIndex == m_newTrackIndex && m_posDiff == TimeRef() &&
- ! (m_actionType == COPY || m_actionType == MOVE_TO_START ||
m_actionType == MOVE_TO_END) ) {
+ ! (m_actionType == COPY || m_actionType == MOVE_TO_START ||
m_actionType == MOVE_TO_END || m_actionType == FOLD_MARKERS) ) {
return -1;
}
@@ -252,11 +251,9 @@
move_to_end(false);
}
- if (m_actionType == FOLD_SHEET) {
foreach(MarkerAndOrigin markerAndOrigin, m_markers) {
markerAndOrigin.marker->set_when(markerAndOrigin.origin
+ m_posDiff);
}
- }
return 1;
}
@@ -272,11 +269,9 @@
m_group.move_to(m_origTrackIndex, m_trackStartLocation);
}
- if (m_actionType == FOLD_SHEET) {
foreach(MarkerAndOrigin markerAndOrigin, m_markers) {
markerAndOrigin.marker->set_when(markerAndOrigin.origin);
}
- }
return 1;
}
@@ -332,11 +327,9 @@
m_group.move_to(m_newTrackIndex, m_trackStartLocation + m_posDiff);
// and used to move the markers
- if (m_actionType == FOLD_SHEET) {
foreach(MarkerAndOrigin markerAndOrigin, m_markers) {
markerAndOrigin.marker->set_when(markerAndOrigin.origin
+ m_posDiff);
}
- }
d->sv->update_shuttle_factor();
Index: src/commands/MoveClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/commands/MoveClip.h 21 Nov 2008 16:12:30 -0000 1.35
+++ src/commands/MoveClip.h 22 Nov 2008 18:26:32 -0000 1.36
@@ -73,6 +73,7 @@
COPY,
FOLD_TRACK,
FOLD_SHEET,
+ FOLD_MARKERS,
MOVE_TO_START,
MOVE_TO_END
};
Index: src/commands/plugins/TraversoCommands/TraversoCommands.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/commands/plugins/TraversoCommands/TraversoCommands.cpp 18 Feb 2008
19:49:59 -0000 1.28
+++ src/commands/plugins/TraversoCommands/TraversoCommands.cpp 22 Nov 2008
18:26:32 -0000 1.29
@@ -114,6 +114,7 @@
m_dict.insert("MoveClip", MoveClipCommand);
m_dict.insert("FoldSheet", MoveClipCommand);
m_dict.insert("FoldTrack", MoveClipCommand);
+ m_dict.insert("FoldMarkers", MoveClipCommand);
m_dict.insert("DragEdge", DragEdgeCommand);
m_dict.insert("MoveClipOrEdge", MoveClipOrEdgeCommand);
m_dict.insert("CopyClip", MoveClipCommand);
Index: src/commands/plugins/TraversoCommands/TraversoCommands.h
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/commands/plugins/TraversoCommands/TraversoCommands.h 18 Feb 2008
19:49:59 -0000 1.12
+++ src/commands/plugins/TraversoCommands/TraversoCommands.h 22 Nov 2008
18:26:33 -0000 1.13
@@ -50,6 +50,7 @@
Q_CLASSINFO("ArmTracks", tr("Arm Tracks"))
Q_CLASSINFO("FoldSheet", tr("Fold Sheet"))
Q_CLASSINFO("FoldTrack", tr("Fold Track"))
+ Q_CLASSINFO("FoldMarkers", tr("Fold Markers"))
Q_CLASSINFO("VZoomIn", tr("Vertical In"))
Q_CLASSINFO("HZoomOut", tr("Horizontal Out"))
Q_CLASSINFO("HZoomIn", tr("Horizontal In"))
Index: src/sheetcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/TimeLineView.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/sheetcanvas/TimeLineView.cpp 21 Feb 2008 20:00:49 -0000 1.3
+++ src/sheetcanvas/TimeLineView.cpp 22 Nov 2008 18:26:33 -0000 1.4
@@ -163,7 +163,7 @@
TimeLineView::TimeLineView(SheetView* view)
- : ViewItem(0, 0)
+ : ViewItem(0, view->get_sheet()->get_timeline())
, m_blinkingMarker(0)
{
PENTERCONS2;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso resources/keymap.xml src/commands/Move...,
Ben Levitt <=