removed "reorder list" function when in new-style-mode

really tiny cleanups

3 files changed, 16 insertions, 12 deletions

diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 172dd069..8aecc525 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -55,6 +55,7 @@
 #define CARET2   5
 
 using MusEGlobal::debugMsg;
+using MusEGlobal::heavyDebugMsg;
 
 //---------------------------------------------------------
 //   DEvent
@@ -83,7 +84,7 @@ void DrumCanvas::addItem(Part* part, Event& event)
       int instr=pitch_and_track_to_instrument(event.pitch(), part->track());
       if (instr<0)
       {
-        if (debugMsg) printf("trying to add event which is hidden or not in any part known to me\n");
+        if (heavyDebugMsg) printf("trying to add event which is hidden or not in any part known to me\n");
         return;
       }
       
@@ -109,7 +110,7 @@ DrumCanvas::DrumCanvas(MidiEditor* pr, QWidget* parent, int sx,
    int sy, const char* name)
    : EventCanvas(pr, parent, sx, sy, name)
       {
-      old_style_drummap_mode = dynamic_cast<DrumEdit*>(pr)->old_style_drummap_mode(); //FINDMICH TODO
+      old_style_drummap_mode = dynamic_cast<DrumEdit*>(pr)->old_style_drummap_mode();
 
       if (old_style_drummap_mode)
       {
@@ -300,7 +301,7 @@ Undo DrumCanvas::moveCanvasItems(MusEWidget::CItemList& items, int dp, int dx, D
 			// Do not process if the event has already been processed (meaning it's an event in a clone part)...
 			if (idl == doneList.end())
 			{
-				operations.push_back(moveItem(ci, newpos, dtype)); //FINDMICH update moveItem()
+				operations.push_back(moveItem(ci, newpos, dtype));
 				doneList.push_back(ci);
 			}
 			ci->move(newpos);
@@ -332,7 +333,7 @@ Undo DrumCanvas::moveCanvasItems(MusEWidget::CItemList& items, int dp, int dx, D
 //   moveItem
 //---------------------------------------------------------
 
-UndoOp DrumCanvas::moveItem(MusEWidget::CItem* item, const QPoint& pos, DragType dtype) //FINDMICHJETZT
+UndoOp DrumCanvas::moveItem(MusEWidget::CItem* item, const QPoint& pos, DragType dtype)
       {
       DEvent* nevent   = (DEvent*) item;
       
@@ -749,7 +750,7 @@ void DrumCanvas::cmd(int cmd)
                               DEvent* devent = (DEvent*)(k->second);
                               Event event    = devent->event();
                               Event newEvent = event.clone();
-                              // newEvent.setLenTick(ourDrumMap[event.pitch()].len);
+                              // newEvent.setLenTick(drumMap[event.pitch()].len);
                               newEvent.setLenTick(ourDrumMap[y2pitch(devent->y())].len); //FINDMICH
                               // Indicate no undo, and do not do port controller values and clone parts. 
                               audio->msgChangeEvent(event, newEvent, devent->part(), false, false, false);
@@ -1227,7 +1228,7 @@ void DrumCanvas::moveAwayUnused()
 {
   if (!old_style_drummap_mode)
   {
-    printf("THIS SHOULD NEVER HAPPEN: DrumCanvas::moveAwayUnused() cannot be used in new style mode\n"); //FINDMICH really disable that
+    printf("THIS SHOULD NEVER HAPPEN: DrumCanvas::moveAwayUnused() cannot be used in new style mode\n");
     return;
   }
 	
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 4e99c0c1..230eef04 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -253,8 +253,14 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       
       menuFunctions->setTearOffEnabled(true);
       
-      QAction* reorderListAction = menuFunctions->addAction(tr("Re-order list"));
-      menuFunctions->addSeparator();
+      if (old_style_drummap_mode())
+      {
+        QAction* reorderListAction = menuFunctions->addAction(tr("Re-order list"));
+        connect(reorderListAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
+        signalMapper->setMapping(reorderListAction, DrumCanvas::CMD_REORDER_LIST);
+        menuFunctions->addSeparator();
+      }
+
       fixedAction = menuFunctions->addAction(tr("Set Fixed Length"));
       veloAction = menuFunctions->addAction(tr("Modify Velocity"));
       crescAction = menuFunctions->addAction(tr("Crescendo/Decrescendo"));
@@ -263,7 +269,6 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       QAction* noteShiftAction = menuFunctions->addAction(tr("Move Notes"));
       QAction* delOverlapsAction = menuFunctions->addAction(tr("Delete Overlaps"));
 
-      connect(reorderListAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
       connect(fixedAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
       connect(veloAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
       connect(crescAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
@@ -272,7 +277,6 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       connect(noteShiftAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
       connect(delOverlapsAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
 
-      signalMapper->setMapping(reorderListAction, DrumCanvas::CMD_REORDER_LIST);
       signalMapper->setMapping(fixedAction, DrumCanvas::CMD_FIXED_LEN);
       signalMapper->setMapping(veloAction, DrumCanvas::CMD_MODIFY_VELOCITY);
       signalMapper->setMapping(crescAction, DrumCanvas::CMD_CRESCENDO);
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index fe3e5696..c9f5454d 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4581,6 +4581,7 @@ void ScoreCanvas::add_new_parts(const std::map< Part*, std::set<Part*> >& param)
  *     because after A (and B) got resized, the B-resize is invalid!
  *   o when changing toolbarstate when sharing and immediately after that
  *     changing "share" status, the changed state isn't stored
+ *   o arranger state and mixer state aren't stored (says tim)
  *   ? pasting in editors sometimes fails oO? ( ERROR: reading eventlist
  *     from clipboard failed. ignoring this one... ) [ not reproducible ]
  * 
@@ -4589,8 +4590,6 @@ void ScoreCanvas::add_new_parts(const std::map< Part*, std::set<Part*> >& param)
  *   o fix valgrind problems
  *
  * > o drum editor: channel-stuff
- *        o stuff is inserted into the right part, but displayed in the wrong part
- * 
  *        o each track has its own drumlist and a bool maintained_automatically
  *        o whenever changing the patch and maintained_automatically==true,
  *          the drumlist is replaced by the according one (for example, "jazz" drum kit's list)