From bf97cc86df42bdbef8f626f2fd457e17f8bc4366 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Fri, 31 Dec 2010 09:02:13 +0000 Subject: Possible fix for arranger focussing problems. --- muse2/muse/app.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'muse2/muse/app.cpp') diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 968c9388..3758bcb9 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -764,6 +764,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() setIconSize(ICON_SIZE); setFocusPolicy(Qt::WheelFocus); + //setFocusPolicy(Qt::NoFocus); muse = this; // hack clipListEdit = 0; midiSyncConfig = 0; @@ -1469,7 +1470,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() arranger = new Arranger(this, "arranger"); setCentralWidget(arranger); - + connect(tools1, SIGNAL(toolChanged(int)), arranger, SLOT(setTool(int))); connect(arranger, SIGNAL(editPart(Track*)), SLOT(startEditor(Track*))); connect(arranger, SIGNAL(dropSongFile(const QString&)), SLOT(loadProjectFile(const QString&))); @@ -3417,6 +3418,24 @@ void MusE::kbAccel(int key) else if (key == shortcuts[SHRT_PLAY_SONG].key ) { song->setPlay(true); } + + /* + else if (key == shortcuts[SHRT_POS_DEC].key) { + int pos = song->pos(); + int frames = pos - AL::sigmap.rasterStep(pos, *_raster); + if (frames < 0) + frames = 0; + Pos p(frames,true); + song->setPos(0, p, true, true, true); + return; + } + else if (key == shortcuts[SHRT_POS_INC].key) { + Pos p(pos[0] + AL::sigmap.rasterStep(pos[0], *_raster), true); + song->setPos(0, p, true, true, true); //CDW + return; + } + */ + else if (key == shortcuts[SHRT_GOTO_LEFT].key) { if (!song->record()) song->setPos(0, song->lPos()); -- cgit v1.2.3