set focus policy to strong in all editors

merged with trunk

1 files changed, 32 insertions, 0 deletions

diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index 99dfd5f1..7a5ad815 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -65,6 +65,7 @@ WaveEdit::WaveEdit(PartList* pl)
    : MidiEditor(1, pl)
       {
       resize(_widthInit, _heightInit);
+      setFocusPolicy(Qt::StrongFocus);
 
       QSignalMapper* mapper = new QSignalMapper(this);
       QAction* act;
@@ -223,6 +224,9 @@ WaveEdit::WaveEdit(PartList* pl)
       ymag->setFixedWidth(16);
       connect(view, SIGNAL(mouseWheelMoved(int)), this, SLOT(moveVerticalSlider(int)));
       connect(ymag, SIGNAL(valueChanged(int)), view, SLOT(setYScale(int)));
+      connect(view, SIGNAL(horizontalZoomIn()), SLOT(horizontalZoomIn()));
+      connect(view, SIGNAL(horizontalZoomOut()), SLOT(horizontalZoomOut()));
+
       time->setOrigin(0, 0);
 
       mainGrid->setRowStretch(0, 100);
@@ -247,6 +251,8 @@ WaveEdit::WaveEdit(PartList* pl)
 //      connect(time,    SIGNAL(timeChanged(unsigned)),  SLOT(setTime(unsigned)));
       connect(view,    SIGNAL(timeChanged(unsigned)),  SLOT(setTime(unsigned)));
 
+      connect(view,  SIGNAL(horizontalScroll(unsigned)),hscroll, SLOT(setPos(unsigned)));
+
       connect(hscroll, SIGNAL(scaleChanged(int)),  SLOT(updateHScrollRange()));
       connect(song, SIGNAL(songChanged(int)), SLOT(songChanged1(int)));
 
@@ -526,3 +532,29 @@ void WaveEdit::moveVerticalSlider(int val)
       ymag->setValue(ymag->value() + val);
       }
 
+
+void WaveEdit::horizontalZoomIn()
+{
+  int mag = hscroll->mag();
+  int zoomlvl = ScrollScale::getQuickZoomLevel(mag);
+  if (zoomlvl < 23)
+        zoomlvl++;
+
+  int newmag = ScrollScale::convertQuickZoomLevelToMag(zoomlvl);
+
+  hscroll->setMag(newmag);
+
+}
+
+void WaveEdit::horizontalZoomOut()
+{
+  int mag = hscroll->mag();
+  int zoomlvl = ScrollScale::getQuickZoomLevel(mag);
+  if (zoomlvl > 1)
+        zoomlvl--;
+
+  int newmag = ScrollScale::convertQuickZoomLevelToMag(zoomlvl);
+
+  hscroll->setMag(newmag);
+
+}