graphical editing of automation 1st drop

4 files changed, 10 insertions, 4 deletions

diff --git a/muse2/muse/widgets/canvas.cpp b/muse2/muse/widgets/canvas.cpp
index 20b92e8d..5b6dc453 100644
--- a/muse2/muse/widgets/canvas.cpp
+++ b/muse2/muse/widgets/canvas.cpp
@@ -1040,7 +1040,7 @@ void Canvas::viewMouseMoveEvent(QMouseEvent* event)
                   break;
             }
                   
-      mouseMove(ev_pos);
+      mouseMove(event);
       }
 
 //---------------------------------------------------------
@@ -1141,6 +1141,7 @@ void Canvas::viewMouseReleaseEvent(QMouseEvent* event)
       if (redrawFlag)
             redraw();
       setCursor();
+      mouseRelease(pos);
       }
 
 //---------------------------------------------------------
@@ -1348,6 +1349,9 @@ void Canvas::setCursor()
                         case MuteTool:
                               QWidget::setCursor(QCursor(*editmuteIcon, 4, 15));
                               break;
+                        case AutomationTool:
+                              QWidget::setCursor(QCursor(Qt::PointingHandCursor));
+                              break;
                         default:
                               QWidget::setCursor(QCursor(Qt::ArrowCursor));
                               break;
diff --git a/muse2/muse/widgets/canvas.h b/muse2/muse/widgets/canvas.h
index 595fe04e..2f9a3907 100644
--- a/muse2/muse/widgets/canvas.h
+++ b/muse2/muse/widgets/canvas.h
@@ -88,7 +88,7 @@ class Canvas : public View {
 
       virtual void mousePress(QMouseEvent*) {}
       virtual void keyPress(QKeyEvent*);
-      virtual void mouseMove(const QPoint&) = 0;
+      virtual void mouseMove(QMouseEvent* event) = 0;
       virtual void mouseRelease(const QPoint&) {}
       virtual void drawCanvas(QPainter&, const QRect&) = 0;
       virtual void drawItem(QPainter&, const CItem*, const QRect&) = 0;
diff --git a/muse2/muse/widgets/tools.cpp b/muse2/muse/widgets/tools.cpp
index 32f42ad9..268a03d5 100644
--- a/muse2/muse/widgets/tools.cpp
+++ b/muse2/muse/widgets/tools.cpp
@@ -34,6 +34,7 @@ const char* infoQuant = QT_TRANSLATE_NOOP("@default", "select Quantize Tool:\n"
 const char* infoDraw = QT_TRANSLATE_NOOP("@default", "select Drawing Tool");
 const char* infoMute = QT_TRANSLATE_NOOP("@default", "select Muting Tool:\n"
       "click on part to mute/unmute");
+const char* infoAutomation = QT_TRANSLATE_NOOP("@default", "Manipulate automation");
 
 ToolB toolList[] = {
       {&pointerIcon,  QT_TRANSLATE_NOOP("@default", "pointer"),     infoPointer },
@@ -45,6 +46,7 @@ ToolB toolList[] = {
       {&quantIcon,    QT_TRANSLATE_NOOP("@default", "quantize"),    infoQuant   },
       {&drawIcon,     QT_TRANSLATE_NOOP("@default", "draw"),        infoDraw    },
       {&editmuteIcon, QT_TRANSLATE_NOOP("@default", "mute parts"),  infoMute    },
+      {&drawIcon, QT_TRANSLATE_NOOP("@default", "edit automation"),    infoAutomation},
       };
 
 //---------------------------------------------------------
diff --git a/muse2/muse/widgets/tools.h b/muse2/muse/widgets/tools.h
index 7cc5e62c..43d1ebaf 100644
--- a/muse2/muse/widgets/tools.h
+++ b/muse2/muse/widgets/tools.h
@@ -17,9 +17,9 @@ class QPixmap;
 class QWidget;
 
 enum Tool { PointerTool=1, PencilTool=2, RubberTool=4, CutTool=8,
-   ScoreTool=16, GlueTool=32, QuantTool=64, DrawTool=128, MuteTool=256};
+   ScoreTool=16, GlueTool=32, QuantTool=64, DrawTool=128, MuteTool=256, AutomationTool=512};
 
-const int arrangerTools = PointerTool | PencilTool | RubberTool | CutTool | GlueTool | MuteTool;
+const int arrangerTools = PointerTool | PencilTool | RubberTool | CutTool | GlueTool | MuteTool | AutomationTool;
 
 struct ToolB {
       QPixmap** icon;