[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: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso resources/keymap.xml src/commands/Move... |
|
Date: |
Wed, 13 Feb 2008 10:41:01 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/02/13 10:41:01
Modified files:
resources : keymap.xml
src/commands : MoveClip.cpp MoveClip.h
src/commands/plugins/TraversoCommands: TraversoCommands.cpp
Log message:
* Added [ D V ] for vertical moving only
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.h?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp?cvsroot=traverso&r1=1.22&r2=1.23
Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- resources/keymap.xml 12 Feb 2008 10:54:40 -0000 1.102
+++ resources/keymap.xml 13 Feb 2008 10:41:00 -0000 1.103
@@ -479,6 +479,7 @@
<keyfact type="HKEY2" key1="D" key2="V" >
<Objects>
<Object objectname="CurveView" mousehint="UD"
slotsignature="drag_node_vertical_only" modes="Effects" sortorder="4" />
+ <Object objectname="AudioClipView"
mousehint="UD" modes="All" pluginname="TraversoCommands" commandname="MoveClip"
arguments="move;true" />
</Objects>
</keyfact>
<keyfact type="HKEY2" key1="D" key2="F" >
Index: src/commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/commands/MoveClip.cpp 12 Feb 2008 15:09:35 -0000 1.61
+++ src/commands/MoveClip.cpp 13 Feb 2008 10:41:00 -0000 1.62
@@ -55,11 +55,21 @@
* @param cv The AudioClipView that is to be dragged/copied.
* @param arguments Can be either one of the following: move, copy,
move_to_end, move_to_start
*/
-MoveClip::MoveClip(AudioClipView* cv, QString type)
+MoveClip::MoveClip(AudioClipView* cv, QVariantList args)
: Command(cv->get_clip(), "")
, d(new Data)
{
- m_actionType = type;
+ m_actionType = "move"; // default action!
+
+ if (args.size() > 0) {
+ m_actionType = args.at(0).toString();
+ }
+ if (args.size() > 1) {
+ d->verticalOnly = args.at(1).toBool();
+ } else {
+ d->verticalOnly = false;
+ }
+
d->view = cv;
d->sv = d->view->get_sheetview();
d->zoom = 0;
@@ -241,6 +251,10 @@
int newXPos = cpointer().scene_x();
TimeRef diff_f = TimeRef((cpointer().scene_x() - d->origXPos) *
d->sv->timeref_scalefactor);
+ if (d->verticalOnly) {
+ diff_f = TimeRef();
+ }
+
TimeRef newTrackStartLocation;
TimeRef newTrackEndLocation = d->origTrackEndLocation + diff_f;
@@ -383,8 +397,10 @@
void MoveClip::set_cursor_shape(int useX, int useY)
{
- Q_UNUSED(useX);
- Q_UNUSED(useY);
+ if (useX && useY) {
cpointer().get_viewport()->set_holdcursor(":/cursorHoldLrud");
+ } else {
+ cpointer().get_viewport()->set_holdcursor(":/cursorHoldUd");
+ }
}
Index: src/commands/MoveClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/commands/MoveClip.h 12 Feb 2008 15:09:35 -0000 1.26
+++ src/commands/MoveClip.h 13 Feb 2008 10:41:00 -0000 1.27
@@ -42,7 +42,7 @@
Q_CLASSINFO("start_zoom", tr("Jog Zoom"));
public :
- MoveClip(AudioClipView* clipView, QString type);
+ MoveClip(AudioClipView* clipView, QVariantList args);
~MoveClip();
int begin_hold();
@@ -73,6 +73,7 @@
TimeRef origTrackEndLocation;
bool resync;
bool bypassjog;
+ bool verticalOnly;
QPoint jogBypassPos;
Zoom* zoom;
};
Index: src/commands/plugins/TraversoCommands/TraversoCommands.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/commands/plugins/TraversoCommands/TraversoCommands.cpp 12 Feb 2008
11:01:08 -0000 1.22
+++ src/commands/plugins/TraversoCommands/TraversoCommands.cpp 13 Feb 2008
10:41:00 -0000 1.23
@@ -272,13 +272,7 @@
return 0;
}
- QString type;
- if (arguments.size()) {
- type = arguments.at(0).toString();
- } else {
- type = "move"; // Default Action
- }
- return new MoveClip(view, type);
+ return new MoveClip(view, arguments);
}
case DragEdgeCommand:
@@ -290,7 +284,10 @@
return 0;
}
- int x = (int)
(cpointer().on_first_input_event_scene_x() - view->scenePos().x());
+ return 0;
+
+ // No longer needed?
+/* int x = (int)
(cpointer().on_first_input_event_scene_x() - view->scenePos().x());
bool anchorAudio = false;
if (arguments.size()) {
@@ -309,7 +306,7 @@
} else {
return new MoveEdge(view,
view->get_sheetview(), "set_right_edge");
}
- }
+ }*/
}
case MoveClipOrEdgeCommand:
@@ -322,7 +319,10 @@
return 0;
}
- int x = (int)
(cpointer().on_first_input_event_scene_x() - view->scenePos().x());
+ return 0;
+
+ // no longer needed?
+/* int x = (int)
(cpointer().on_first_input_event_scene_x() - view->scenePos().x());
int edge_width = 0;
bool anchorAudio = false;
@@ -344,7 +344,7 @@
return new MoveEdge(view,
view->get_sheetview(), "set_right_edge");
}
}
- return new MoveClip(view, "move");
+ return new MoveClip(view, "move");*/
}
case SplitClipCommand: