summaryrefslogtreecommitdiff
path: root/muse2/muse/waveedit
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
committerFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
commit27b7bf6815cda7abb67026c37b3e44daee1803cb (patch)
tree0b9d1c0bc84ac7ff8032e707f2b5fb4e0aaabb5c /muse2/muse/waveedit
parent2d6f113a10eb485694e20a78500f650776d701e3 (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/waveedit')
-rw-r--r--muse2/muse/waveedit/waveedit.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index 06b5ab1d..6cad9871 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -80,7 +80,7 @@ void WaveEdit::closeEvent(QCloseEvent* e)
WaveEdit::WaveEdit(MusECore::PartList* pl)
: MidiEditor(TopWin::WAVE, 1, pl)
{
- setFocusPolicy(Qt::StrongFocus);
+ setFocusPolicy(Qt::NoFocus);
QSignalMapper* mapper = new QSignalMapper(this);
QAction* act;
@@ -190,6 +190,7 @@ WaveEdit::WaveEdit(MusECore::PartList* pl)
solo = new QToolButton();
solo->setText(tr("Solo"));
solo->setCheckable(true);
+ solo->setFocusPolicy(Qt::NoFocus);
tb1->addWidget(solo);
connect(solo, SIGNAL(toggled(bool)), SLOT(soloChanged(bool)));
@@ -230,7 +231,8 @@ WaveEdit::WaveEdit(MusECore::PartList* pl)
ymag->setMaximum(256);
ymag->setPageStep(256);
ymag->setValue(yscale);
-
+ ymag->setFocusPolicy(Qt::NoFocus);
+
time = new MTScale(&_raster, mainw, xscale, true);
ymag->setFixedWidth(16);
connect(view, SIGNAL(mouseWheelMoved(int)), this, SLOT(moveVerticalSlider(int)));
@@ -250,7 +252,7 @@ WaveEdit::WaveEdit(MusECore::PartList* pl)
mainGrid->addWidget(hscroll, 3, 0);
mainGrid->addWidget(corner, 3, 1, Qt::AlignBottom | Qt::AlignRight);
- view->setFocus(); // Tim.
+ view->setFocus();
connect(hscroll, SIGNAL(scrollChanged(int)), view, SLOT(setXPos(int)));
connect(hscroll, SIGNAL(scaleChanged(int)), view, SLOT(setXMag(int)));