swapped ctrl and shift for selecting stuff

-> made muse's behaviour according to common standards

2 files changed, 10 insertions, 10 deletions

diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 35de93ee..599e90a0 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -231,9 +231,9 @@ void PartCanvas::viewMouseDoubleClickEvent(QMouseEvent* event)
             }
       QPoint cpos = event->pos();
       curItem     = items.find(cpos);
-      bool shift  = event->modifiers() & Qt::ShiftModifier;
+      bool ctrl  = event->modifiers() & Qt::ControlModifier;
       if (curItem) {
-            if (event->button() == Qt::LeftButton && shift) {
+            if (event->button() == Qt::LeftButton && ctrl) {
                   editPart = (NPart*)curItem;
                   QRect r = map(curItem->bbox());
                   if (lineEditor == 0) {
@@ -1002,7 +1002,7 @@ void PartCanvas::itemPopup(CItem* item, int n, const QPoint& pt)
 
 void PartCanvas::mousePress(QMouseEvent* event)
       {
-    if (event->modifiers() & Qt::ShiftModifier) {
+    if (event->modifiers() & Qt::ControlModifier) {
             return;
             }
       QPoint pt = event->pos();
@@ -1059,7 +1059,7 @@ void PartCanvas::mouseMove(QMouseEvent* event)
             x = 0;
 
       if (_tool == AutomationTool)
-          processAutomationMovements(event->pos(), event->modifiers() & Qt::ControlModifier);
+          processAutomationMovements(event->pos(), event->modifiers() & Qt::ShiftModifier);
 
       emit timeChanged(AL::sigmap.raster(x, *_raster));
       }
@@ -1665,7 +1665,7 @@ void PartCanvas::drawMoving(QPainter& p, const CItem* item, const QRect&)
 //    pr - part rectangle
 //---------------------------------------------------------
 
-void PartCanvas::drawMidiPart(QPainter& p, const QRect& bb, EventList* events, MidiTrack *mt, MidiPart *pt, const QRect& r, int pTick, int from, int to)
+void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, MidiTrack *mt, MidiPart *pt, const QRect& r, int pTick, int from, int to)
 {
   //printf("x=%d y=%d h=%d w=%d\n",r.x(),r.y(),r.height(),r.width());
 
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index b907b555..2a397a4e 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -348,7 +348,7 @@ void TList::paint(const QRect& r)
                                         if (cl->isVisible())
                                             countVisible++;
                                     }
-                                    int count = ((AudioTrack*)track)->controller()->size();
+                                    //int count = ((AudioTrack*)track)->controller()->size(); //commented out by flo: gives a "unused variable" warning
                                     s.sprintf(" %d(%d) visible",countVisible, countAll);
                                     }
 
@@ -914,7 +914,7 @@ void TList::mousePressEvent(QMouseEvent* ev)
       int x       = ev->x();
       int y       = ev->y();
       int button  = ev->button();
-      bool shift  = ((QInputEvent*)ev)->modifiers() & Qt::ShiftModifier;
+      bool ctrl  = ((QInputEvent*)ev)->modifiers() & Qt::ControlModifier;
 
       Track* t    = y2Track(y + ypos);
 
@@ -1152,7 +1152,7 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   break;
             case COL_MUTE:
                   // p3.3.29
-                  if ((button == Qt::RightButton) || (((QInputEvent*)ev)->modifiers() & Qt::ControlModifier))
+                  if ((button == Qt::RightButton) || (((QInputEvent*)ev)->modifiers() & Qt::ShiftModifier))
                     t->setOff(!t->off());
                   else
                   {
@@ -1170,7 +1170,7 @@ void TList::mousePressEvent(QMouseEvent* ev)
 
             case COL_NAME:
                   if (button == Qt::LeftButton) {
-                        if (!shift) {
+                        if (!ctrl) {
                               song->deselectTracks();
                               t->setSelected(true);
 
@@ -1463,7 +1463,7 @@ void TList::wheelEvent(QWheelEvent* ev)
                   break;
             case COL_MUTE:
                   // p3.3.29
-                  if (((QInputEvent*)ev)->modifiers() & Qt::ControlModifier)
+                  if (((QInputEvent*)ev)->modifiers() & Qt::ShiftModifier)
                     t->setOff(!t->off());
                   else
                   {