Please see the changelog

4 files changed, 23 insertions, 1 deletions

diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index 1542d4ef..338d702c 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -64,7 +64,8 @@ WaveEdit::WaveEdit(PartList* pl)
       QAction* act;
       
       //---------Pulldown Menu----------------------------
-      QMenu* menuFile = menuBar()->addMenu(tr("&File"));
+      // We probably don't need an empty menu - Orcan
+      //QMenu* menuFile = menuBar()->addMenu(tr("&File"));
       QMenu* menuEdit = menuBar()->addMenu(tr("&Edit"));
       
       menuFunctions = menuBar()->addMenu(tr("Func&tions"));
@@ -197,6 +198,7 @@ WaveEdit::WaveEdit(PartList* pl)
        
       time                 = new MTScale(&_raster, mainw, xscale, true);
       ymag->setFixedWidth(16);
+      connect(view, SIGNAL(mouseWheelMoved(int)), this, SLOT(moveVerticalSlider(int)));
       connect(ymag, SIGNAL(valueChanged(int)), view, SLOT(setYScale(int)));
       time->setOrigin(0, 0);
 
@@ -447,4 +449,12 @@ void WaveEdit::keyPressEvent(QKeyEvent* event)
             }
       }
 
+//---------------------------------------------------------
+//   moveVerticalSlider
+//---------------------------------------------------------
+
+void WaveEdit::moveVerticalSlider(int val)
+      {
+      ymag->setValue(ymag->value() + val);
+      }
 
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index 83943944..79102410 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -55,6 +55,7 @@ class WaveEdit : public MidiEditor {
       void setTime(unsigned t);
       void songChanged1(int);
       void soloChanged(bool flag);
+      void moveVerticalSlider(int val);
 
    public slots:
       void configChanged();
diff --git a/muse2/muse/waveedit/waveview.cpp b/muse2/muse/waveedit/waveview.cpp
index d70beefe..b357408c 100644
--- a/muse2/muse/waveedit/waveview.cpp
+++ b/muse2/muse/waveedit/waveview.cpp
@@ -378,6 +378,15 @@ void WaveView::viewMousePressEvent(QMouseEvent* event)
       viewMouseMoveEvent(event);
       }
 
+
+//---------------------------------------------------------
+//   wheelEvent
+//---------------------------------------------------------
+void WaveView::wheelEvent(QWheelEvent* event)
+      {
+      emit mouseWheelMoved(event->delta() / 10);
+      }
+
 //---------------------------------------------------------
 //   viewMouseReleaseEvent
 //---------------------------------------------------------
diff --git a/muse2/muse/waveedit/waveview.h b/muse2/muse/waveedit/waveview.h
index 49ac251f..d1f247b3 100644
--- a/muse2/muse/waveedit/waveview.h
+++ b/muse2/muse/waveedit/waveview.h
@@ -55,6 +55,7 @@ class WaveView : public View {
       virtual void viewMousePressEvent(QMouseEvent*);
       virtual void viewMouseMoveEvent(QMouseEvent*);
       virtual void viewMouseReleaseEvent(QMouseEvent*);
+      virtual void wheelEvent(QWheelEvent*);
 
       bool getUniqueTmpfileName(QString& newFilename); //!< Generates unique filename for temporary SndFile
       WaveSelectionList getSelection(unsigned startpos, unsigned stoppos);
@@ -84,6 +85,7 @@ class WaveView : public View {
    signals:
       void followEvent(int);
       void timeChanged(unsigned);
+      void mouseWheelMoved(int);
 
    public:
       WaveView(MidiEditor*, QWidget* parent, int xscale, int yscale);