[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/keymap.xml src/commands/comm...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso resources/keymap.xml src/commands/comm... |
|
Date: |
Tue, 22 Jan 2008 20:47:17 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/01/22 20:47:17
Modified files:
resources : keymap.xml
src/commands : commands.h Scroll.cpp Scroll.h Zoom.h
src/commands/plugins/TraversoCommands: TraversoCommands.cpp
TraversoCommands.h
src/sheetcanvas: SheetView.cpp SheetView.h
Log message:
* move updownleftright hold scrolling to TraversoCommandsPlugin, cleans
up SheetView
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/commands.h?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Scroll.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Scroll.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Zoom.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/SheetView.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/SheetView.h?cvsroot=traverso&r1=1.1&r2=1.2
Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- resources/keymap.xml 21 Jan 2008 16:22:10 -0000 1.96
+++ resources/keymap.xml 22 Jan 2008 20:47:15 -0000 1.97
@@ -241,7 +241,7 @@
<keyfact type="FKEY" key1="MouseScrollVerticalDown" >
<Objects>
<Object objectname="DragNode"
slotsignature="move_down" modes="Effects" />
- <Object objectname="SheetView"
slotsignature="scroll_down" modes="All" sortorder="2" submenu="Scroll" />
+ <Object objectname="SheetView"
slotsignature="scroll_down" modes="All" sortorder="4" submenu="Scroll" />
<Object objectname="Gain"
slotsignature="decrease_gain" modes="All" />
<Object objectname="TrackPanelPan"
slotsignature="pan_left" modes="All" sortorder="2" />
<Object objectname="TrackPanelGain"
slotsignature="gain_decrement" modes="All" sortorder="2" />
@@ -431,22 +431,22 @@
</keyfact>
<keyfact type="HKEY" key1="LARROW" >
<Objects>
- <Object objectname="SheetView"
slotsignature="scroll_left_hold" modes="All" sortorder="1" submenu="Scroll" />
+ <Object objectname="SheetView" modes="All"
sortorder="1" submenu="Scroll" pluginname="TraversoCommands"
commandname="ScrollLeftHold" arguments="-20;0" />
</Objects>
</keyfact>
<keyfact type="HKEY" key1="RARROW" >
<Objects>
- <Object objectname="SheetView"
slotsignature="scroll_right_hold" modes="All" sortorder="2" submenu="Scroll" />
+ <Object objectname="SheetView" modes="All"
sortorder="2" submenu="Scroll" pluginname="TraversoCommands"
commandname="ScrollRightHold" arguments="20;0" />
</Objects>
</keyfact>
<keyfact type="HKEY" key1="UARROW" >
<Objects>
- <Object objectname="SheetView"
slotsignature="scroll_up_hold" modes="All" sortorder="4" submenu="Scroll" />
+ <Object objectname="SheetView" modes="All"
sortorder="3" submenu="Scroll" pluginname="TraversoCommands"
commandname="ScrollUpHold" arguments="0;-20" />
</Objects>
</keyfact>
<keyfact type="HKEY" key1="DARROW" >
<Objects>
- <Object objectname="SheetView"
slotsignature="scroll_down_hold" modes="All" sortorder="4" submenu="Scroll" />
+ <Object objectname="SheetView" modes="All"
sortorder="4" submenu="Scroll" pluginname="TraversoCommands"
commandname="ScrollDownHold" arguments="0;20" />
</Objects>
</keyfact>
Index: src/commands/commands.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/commands.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/commands/commands.h 2 Jan 2008 03:03:38 -0000 1.14
+++ src/commands/commands.h 22 Jan 2008 20:47:16 -0000 1.15
@@ -14,3 +14,4 @@
#include "ArmTracks.h"
#include "RemoveClip.h"
#include "MultiMove.h"
+#include "Scroll.h"
Index: src/commands/Scroll.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Scroll.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/commands/Scroll.cpp 21 Jan 2008 16:22:12 -0000 1.2
+++ src/commands/Scroll.cpp 22 Jan 2008 20:47:16 -0000 1.3
@@ -30,12 +30,18 @@
#include "Debugger.h"
-Scroll::Scroll(int x, int y, SheetView* sv)
+Scroll::Scroll(SheetView* sv, QVariantList args)
: Command("Scroll")
{
- m_dx = x;
- m_dy = y;
m_sv = sv;
+ m_dx = m_dy = 0;
+
+ if (args.size() > 0) {
+ m_dx = args.at(0).toInt();
+ }
+ if (args.size() > 1) {
+ m_dy = args.at(1).toInt();
+ }
}
@@ -49,6 +55,11 @@
{
m_sv->start_shuttle(true);
m_sv->set_shuttle_factor_values(m_dx, m_dy);
+ if (m_dx) {
+
cpointer().get_viewport()->setCursor(themer()->get_cursor("LR"));
+ } else {
+
cpointer().get_viewport()->setCursor(themer()->get_cursor("UD"));
+ }
return 1;
}
Index: src/commands/Scroll.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Scroll.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/commands/Scroll.h 21 Jan 2008 16:22:12 -0000 1.2
+++ src/commands/Scroll.h 22 Jan 2008 20:47:16 -0000 1.3
@@ -29,7 +29,7 @@
class Scroll : public Command
{
public :
- Scroll(int x, int y, SheetView* sv);
+ Scroll(SheetView* sv, QVariantList args);
~Scroll() {};
int begin_hold();
Index: src/commands/Zoom.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Zoom.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/commands/Zoom.h 21 Jan 2008 16:22:12 -0000 1.6
+++ src/commands/Zoom.h 22 Jan 2008 20:47:16 -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: Zoom.h,v 1.6 2008/01/21 16:22:12 r_sijrier Exp $
+ $Id: Zoom.h,v 1.7 2008/01/22 20:47:16 r_sijrier Exp $
*/
#ifndef ZOOM_H
@@ -25,8 +25,6 @@
#include "Command.h"
-#include <QTimer>
-
class SheetView;
class QPoint;
@@ -60,7 +58,6 @@
qreal m_yScalefactor;
QPoint mousePos;
QPoint origPos;
- QTimer m_jogVerticalResetTimer;
SheetView* m_sv;
Index: src/commands/plugins/TraversoCommands/TraversoCommands.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/commands/plugins/TraversoCommands/TraversoCommands.cpp 21 Jan 2008
16:26:09 -0000 1.20
+++ src/commands/plugins/TraversoCommands/TraversoCommands.cpp 22 Jan 2008
20:47:16 -0000 1.21
@@ -60,6 +60,10 @@
m_dict.insert("HJogZoom", ZoomCommand);
m_dict.insert("VJogZoom", ZoomCommand);
m_dict.insert("JogZoom", ZoomCommand);
+ m_dict.insert("ScrollRightHold", ScrollCommand);
+ m_dict.insert("ScrollLeftHold", ScrollCommand);
+ m_dict.insert("ScrollUpHold", ScrollCommand);
+ m_dict.insert("ScrollDownHold", ScrollCommand);
}
Command* TraversoCommands::create(QObject* obj, const QString& command,
QVariantList arguments)
@@ -328,6 +332,16 @@
}
return new Zoom(view, arguments);
}
+ case ScrollCommand:
+ {
+ SheetView* view = qobject_cast<SheetView*>(obj);
+ if (!view) {
+ PERROR("TraversoCommands: Supplied QObject was
not an SheetView! "
+ "ArmTracksCommand needs an
SheetView as argument");
+ return 0;
+ }
+ return new Scroll(view, arguments);
+ }
}
return 0;
Index: src/commands/plugins/TraversoCommands/TraversoCommands.h
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/commands/plugins/TraversoCommands/TraversoCommands.h 21 Jan 2008
16:26:09 -0000 1.8
+++ src/commands/plugins/TraversoCommands/TraversoCommands.h 22 Jan 2008
20:47:16 -0000 1.9
@@ -56,6 +56,10 @@
Q_CLASSINFO("Zoom", tr("Omnidirectional"))
Q_CLASSINFO("HJogZoom", tr("Horizontal"))
Q_CLASSINFO("VJogZoom", tr("Vertical"))
+ Q_CLASSINFO("ScrollRightHold", tr("Right"))
+ Q_CLASSINFO("ScrollLeftHold", tr("Left"))
+ Q_CLASSINFO("ScrollUpHold", tr("Up"))
+ Q_CLASSINFO("ScrollDownHold", tr("Down"))
public:
TraversoCommands();
@@ -79,6 +83,7 @@
ArmTracksCommand,
MultiMoveCommand,
ZoomCommand,
+ ScrollCommand
};
};
Index: src/sheetcanvas/SheetView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/SheetView.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/sheetcanvas/SheetView.cpp 21 Jan 2008 16:17:29 -0000 1.1
+++ src/sheetcanvas/SheetView.cpp 22 Jan 2008 20:47:16 -0000 1.2
@@ -21,7 +21,13 @@
#include <QScrollBar>
-#include <libtraversocore.h>
+
+#include "InputEngine.h"
+#include "Sheet.h"
+#include "SnapList.h"
+#include "Track.h"
+#include "ContextPointer.h"
+#include "Themer.h"
#include "SheetView.h"
#include "SheetWidget.h"
@@ -32,13 +38,11 @@
#include "TimeLineViewPort.h"
#include "TimeLineView.h"
#include "TrackPanelViewPort.h"
-#include "Themer.h"
-#include "AddRemove.h"
-#include <Zoom.h>
-#include <Scroll.h>
-#include <PlayHeadMove.h>
-#include <WorkCursorMove.h>
+#include "AddRemove.h"
+#include "Zoom.h"
+#include "PlayHeadMove.h"
+#include "WorkCursorMove.h"
#include "AudioDevice.h"
@@ -626,31 +630,6 @@
return (Command*) 0;
}
-Command* SheetView::scroll_up_hold( )
-{
- PENTER3;
- return new Scroll(0, -20, this);
-}
-
-Command* SheetView::scroll_down_hold( )
-{
- PENTER3;
- return new Scroll(0, 20, this);
-}
-
-Command* SheetView::scroll_right_hold()
-{
- PENTER3;
- return new Scroll(20, 0, this);
-}
-
-
-Command* SheetView::scroll_left_hold()
-{
- PENTER3;
- return new Scroll(-20, 0, this);
-}
-
int SheetView::hscrollbar_value() const
{
return m_clipsViewPort->horizontalScrollBar()->value();
Index: src/sheetcanvas/SheetView.h
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/SheetView.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/sheetcanvas/SheetView.h 21 Jan 2008 16:17:30 -0000 1.1
+++ src/sheetcanvas/SheetView.h 22 Jan 2008 20:47:16 -0000 1.2
@@ -47,10 +47,6 @@
Q_CLASSINFO("scroll_left", tr("Left"))
Q_CLASSINFO("scroll_up", tr("Up"))
Q_CLASSINFO("scroll_down", tr("Down"))
- Q_CLASSINFO("scroll_right_hold", tr("Right"))
- Q_CLASSINFO("scroll_left_hold", tr("Left"))
- Q_CLASSINFO("scroll_up_hold", tr("Up"))
- Q_CLASSINFO("scroll_down_hold", tr("Down"))
Q_CLASSINFO("shuttle", tr("Shuttle"))
Q_CLASSINFO("goto_begin", tr("To start"))
Q_CLASSINFO("goto_end", tr("To end"))
@@ -141,10 +137,6 @@
Command* scroll_left();
Command* scroll_up();
Command* scroll_down();
- Command* scroll_right_hold();
- Command* scroll_left_hold();
- Command* scroll_up_hold();
- Command* scroll_down_hold();
Command* shuttle();
Command* goto_begin();
Command* goto_end();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso resources/keymap.xml src/commands/comm...,
Remon Sijrier <=