diff options
| author | Florian Jung <flo@windfisch.org> | 2011-09-27 16:08:57 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-09-27 16:08:57 +0000 |
| commit | e9e38901f1b0c8b0d4c11f6de37abf7ff6c7234f (patch) | |
| tree | 6db56ee33fda6adce28afc456c4fd84b56180453 /muse2/awl | |
| parent | 5c2eaaf143f517e1a4d52e243a761e479aeb3e5b (diff) | |
| parent | d52fac00567bb85944188f3c946b86b2a420819c (diff) | |
merged with trunk
Diffstat (limited to 'muse2/awl')
| -rw-r--r-- | muse2/awl/floatentry.cpp | 5 | ||||
| -rw-r--r-- | muse2/awl/tcanvas.cpp | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/muse2/awl/floatentry.cpp b/muse2/awl/floatentry.cpp index 44739944..573420df 100644 --- a/muse2/awl/floatentry.cpp +++ b/muse2/awl/floatentry.cpp @@ -22,6 +22,7 @@ #include "floatentry.h" #include "fastlog.h" +#include "gconfig.h" #include <QLineEdit> #include <QMouseEvent> @@ -219,7 +220,9 @@ void FloatEntry::repeat() switch (button) { case Qt::LeftButton: - return; + if (!MusEConfig::config.leftMouseButtonCanDecrease) + return; + // else fall through case Qt::MidButton: decValue(evx); break; diff --git a/muse2/awl/tcanvas.cpp b/muse2/awl/tcanvas.cpp index 55d06b1f..d39080e2 100644 --- a/muse2/awl/tcanvas.cpp +++ b/muse2/awl/tcanvas.cpp @@ -297,8 +297,14 @@ bool TimeCanvas::eventFilter(QObject* obj, QEvent* event) int i = 0; if (b & Qt::MidButton) i = 1; - else if (b & Qt::RightButton) - i = 2; + //else if (b & Qt::RightButton) + // i = 2; + else if (b & Qt::RightButton) { + if ((MusEConfig::config.rangeMarkerWithoutMMB) && (event->modifiers() & Qt::ControlModifier)) + i = 1; + else + i = 2; + } if (keyState & Qt::ShiftModifier) emit addMarker(i); emit posChanged(i, pos); |