summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-09 16:33:22 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-09 16:33:22 +0000
commit3793e801b3116509fadd853e158b522a65fb6d22 (patch)
treeb754aa39e12f8b8e55543f9af1d655a117d0b65a /muse2/muse/midiedit
parenta3670594c5a3c5a7053dd8bd8280b7c2b20cefbe (diff)
swapped ctrl and shift for selecting stuff
-> made muse's behaviour according to common standards
Diffstat (limited to 'muse2/muse/midiedit')
-rw-r--r--muse2/muse/midiedit/dcanvas.cpp3
-rw-r--r--muse2/muse/midiedit/dlist.cpp5
-rw-r--r--muse2/muse/midiedit/pianoroll.cpp3
3 files changed, 0 insertions, 11 deletions
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 9c50c8b2..a21f04c0 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -1352,13 +1352,10 @@ void DrumCanvas::keyPress(QKeyEvent* event)
if (_tool == CursorTool) {
int key = event->key();
- ///if (event->state() & Qt::ShiftButton)
if (((QInputEvent*)event)->modifiers() & Qt::ShiftModifier)
key += Qt::SHIFT;
- ///if (event->state() & Qt::AltButton)
if (((QInputEvent*)event)->modifiers() & Qt::AltModifier)
key += Qt::ALT;
- ///if (event->state() & Qt::ControlButton)
if (((QInputEvent*)event)->modifiers() & Qt::ControlModifier)
key+= Qt::CTRL;
diff --git a/muse2/muse/midiedit/dlist.cpp b/muse2/muse/midiedit/dlist.cpp
index 3736d6aa..3b8670db 100644
--- a/muse2/muse/midiedit/dlist.cpp
+++ b/muse2/muse/midiedit/dlist.cpp
@@ -220,8 +220,6 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
int x = ev->x();
int y = ev->y();
int button = ev->button();
- ///bool shift = ev->state() & Qt::ShiftButton;
- //bool shift = ev->modifiers() & Qt::ShiftModifier;
unsigned pitch = y / TH;
DrumMap* dm = &drumMap[pitch];
@@ -259,7 +257,6 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
break;
case COL_PORT:
if (button == Qt::RightButton) {
- ///bool changeAll = ev->state() & Qt::ControlButton;
bool changeAll = ev->modifiers() & Qt::ControlModifier;
devicesPopupMenu(dm, mapx(x), mapy(pitch * TH), changeAll);
}
@@ -328,7 +325,6 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
else if (val > 127)
val = 127;
- ///if (ev->state() & Qt::ControlButton) {
if (ev->modifiers() & Qt::ControlModifier) {
audio->msgIdle(true);
// Delete all port controller events.
@@ -724,7 +720,6 @@ void DList::viewMouseReleaseEvent(QMouseEvent* ev)
editor->setFocus();
int x = ev->x();
int y = ev->y();
- ///bool shift = ev->state() & Qt::ShiftButton;
bool shift = ev->modifiers() & Qt::ShiftModifier;
unsigned pitch = y / TH;
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index d008b35f..6b0e37cb 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -1045,13 +1045,10 @@ void PianoRoll::keyPressEvent(QKeyEvent* event)
PianoCanvas* pc = (PianoCanvas*)canvas;
int key = event->key();
- //if (event->state() & Qt::ShiftButton)
if (((QInputEvent*)event)->modifiers() & Qt::ShiftModifier)
key += Qt::SHIFT;
- //if (event->state() & Qt::AltButton)
if (((QInputEvent*)event)->modifiers() & Qt::AltModifier)
key += Qt::ALT;
- //if (event->state() & Qt::ControlButton)
if (((QInputEvent*)event)->modifiers() & Qt::ControlModifier)
key+= Qt::CTRL;