updates

23 files changed, 397 insertions, 146 deletions

diff --git a/muse/muse/arranger/arranger.cpp b/muse/muse/arranger/arranger.cpp
index 4884fb59..22aa631c 100644
--- a/muse/muse/arranger/arranger.cpp
+++ b/muse/muse/arranger/arranger.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: arranger.cpp,v 1.150 2006/04/23 12:27:50 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004-2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "song.h"
 #include "muse.h"
diff --git a/muse/muse/arranger/arranger.h b/muse/muse/arranger/arranger.h
index b48fdaf0..47a58b59 100644
--- a/muse/muse/arranger/arranger.h
+++ b/muse/muse/arranger/arranger.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: arranger.h,v 1.72 2006/02/07 16:59:35 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __ARRANGER_H__
 #define __ARRANGER_H__
diff --git a/muse/muse/arranger/canvas.cpp b/muse/muse/arranger/canvas.cpp
index 8dfbd9b5..c9c694f5 100644
--- a/muse/muse/arranger/canvas.cpp
+++ b/muse/muse/arranger/canvas.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: canvas.cpp,v 1.57 2006/03/24 21:41:16 a-lin Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004-2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "canvas.h"
 #include "al/sig.h"
diff --git a/muse/muse/arranger/canvas.h b/muse/muse/arranger/canvas.h
index 3abe53f4..d1c1d166 100644
--- a/muse/muse/arranger/canvas.h
+++ b/muse/muse/arranger/canvas.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: canvas.h,v 1.21 2006/01/23 17:41:21 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __CANVAS_H__
 #define __CANVAS_H__
diff --git a/muse/muse/arranger/configtrack.cpp b/muse/muse/arranger/configtrack.cpp
index 8fee2af1..f212329e 100644
--- a/muse/muse/arranger/configtrack.cpp
+++ b/muse/muse/arranger/configtrack.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: configtrack.cpp,v 1.10 2005/11/05 11:05:24 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "configtrack.h"
 #include "trelement.h"
diff --git a/muse/muse/arranger/configtrack.h b/muse/muse/arranger/configtrack.h
index 72579fb6..47dd0f4a 100644
--- a/muse/muse/arranger/configtrack.h
+++ b/muse/muse/arranger/configtrack.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: configtrack.h,v 1.4 2005/11/02 18:02:10 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __CONFIG_TRACK_H__
 #define __CONFIG_TRACK_H__
diff --git a/muse/muse/arranger/miditrackinfo.h b/muse/muse/arranger/miditrackinfo.h
index 7f5e0775..ba066986 100644
--- a/muse/muse/arranger/miditrackinfo.h
+++ b/muse/muse/arranger/miditrackinfo.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: miditrackinfo.h,v 1.2 2004/10/07 17:53:47 wschweer Exp $
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MIDITRACKINFO_H__
 #define __MIDITRACKINFO_H__
diff --git a/muse/muse/arranger/partdrag.cpp b/muse/muse/arranger/partdrag.cpp
index c78fbdc4..9415fc88 100644
--- a/muse/muse/arranger/partdrag.cpp
+++ b/muse/muse/arranger/partdrag.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: partdrag.cpp,v 1.5 2006/01/25 22:25:48 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "partdrag.h"
 
diff --git a/muse/muse/arranger/partdrag.h b/muse/muse/arranger/partdrag.h
index 8eaecc07..489d7f80 100644
--- a/muse/muse/arranger/partdrag.h
+++ b/muse/muse/arranger/partdrag.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: partdrag.h,v 1.3 2005/11/04 12:03:35 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __PARTDRAG_H__
 #define __PARTDRAG_H__
diff --git a/muse/muse/arranger/selectfilter.h b/muse/muse/arranger/selectfilter.h
index ee448ce1..a28e6947 100644
--- a/muse/muse/arranger/selectfilter.h
+++ b/muse/muse/arranger/selectfilter.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: selectfilter.h,v 1.1 2005/01/24 14:32:34 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __SELECTFILTER_H__
 #define __SELECTFILTER_H__
diff --git a/muse/muse/arranger/tllineedit.cpp b/muse/muse/arranger/tllineedit.cpp
index 4d5f9b4f..0581b858 100644
--- a/muse/muse/arranger/tllineedit.cpp
+++ b/muse/muse/arranger/tllineedit.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tllineedit.cpp,v 1.8 2006/01/12 14:49:13 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "tllineedit.h"
 
diff --git a/muse/muse/arranger/tllineedit.h b/muse/muse/arranger/tllineedit.h
index b0e5fb35..56bfdd55 100644
--- a/muse/muse/arranger/tllineedit.h
+++ b/muse/muse/arranger/tllineedit.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tllineedit.h,v 1.3 2006/01/06 22:48:09 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TLLINEEDIT_H__
 #define __TLLINEEDIT_H__
diff --git a/muse/muse/arranger/tlswidget.cpp b/muse/muse/arranger/tlswidget.cpp
index fa86e9e3..df498647 100644
--- a/muse/muse/arranger/tlswidget.cpp
+++ b/muse/muse/arranger/tlswidget.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tlswidget.cpp,v 1.33 2006/01/12 14:49:13 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "song.h"
 #include "track.h"
@@ -16,6 +28,7 @@
 #include "muse.h"
 #include "midiport.h"
 #include "ctrl/configmidictrl.h"
+#include "ctrl/ctrldialog.h"
 #include "midictrl.h"
 #include "widgets/utils.h"
 
@@ -123,16 +136,15 @@ TLSWidget::TLSWidget(Track* t, ArrangerTrack* atrack, TimeCanvas* timeC)
       l->addWidget(minus);
 
       ctrlList = new QToolButton;
-      ctrlList->setPopupMode(QToolButton::MenuButtonPopup);
-      ctrlMenu = new QMenu;
-      connect(ctrlMenu, SIGNAL(aboutToShow()), SLOT(showController()));
-      ctrlList->setMenu(ctrlMenu);
+      ctrlList->setText(tr("Ctrl"));
+
+      connect(ctrlList, SIGNAL(clicked()), SLOT(showControllerList()));
 
       l->addWidget(ctrlList);
       ctrlList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
       updateController();
-      connect(ctrlMenu, SIGNAL(triggered(QAction*)), SLOT(selectController(QAction*)));
+
       connect(_track, SIGNAL(clChanged()), SLOT(updateController()));
       connect(_track, SIGNAL(selectionChanged(bool)), SLOT(selectionChanged()));
       connect(_track, SIGNAL(controllerChanged(int)), SLOT(controllerListChanged(int)));
@@ -190,28 +202,32 @@ void TLSWidget::updateController()
       }
 
 //---------------------------------------------------------
-//   showController
-//---------------------------------------------------------
-
-void TLSWidget::showController()
-      {
-      populateControllerMenu(ctrlMenu);
-      }
-
-//---------------------------------------------------------
-//   selectController
+//   showControllerList
 //---------------------------------------------------------
 
-void TLSWidget::selectController(QAction* a)
+void TLSWidget::showControllerList()
       {
-      selectController(a->data().toInt());
+      Ctrl* c = ctrl();
+      int id;
+      if (c)
+            id = c->id();
+      else
+            id = CTRL_NO_CTRL;
+      CtrlDialog cd(_ctrlTrack, id);
+      int rv = cd.exec();
+      if (rv != 1)
+            return;
+      id = cd.curId();
+      if (id == CTRL_NO_CTRL)
+            return;
+      setCtrl(id);
       }
 
 //---------------------------------------------------------
-//   selectController
+//   setCtrl
 //---------------------------------------------------------
 
-void TLSWidget::selectController(int ctrl)
+void TLSWidget::setCtrl(int ctrl)
       {
       if (ctrl == CTRL_OTHER) {   // "other"
 /*??*/      ConfigMidiCtrl* mce = new ConfigMidiCtrl((MidiTrack*)_track);
@@ -249,34 +265,6 @@ void TLSWidget::selectController(int ctrl)
       }
 
 //---------------------------------------------------------
-//   setCtrl
-//---------------------------------------------------------
-
-void TLSWidget::setCtrl(int ctrl)
-      {
-      if (ctrl == CTRL_OTHER) {
-            QList<QAction*> actions = ctrlMenu->actions();
-            if (actions.isEmpty()) {
-                  if (_track->type() == Track::MIDI) {
-                        selectController(CTRL_VELOCITY);
-                        return;
-                        }
-                  ControllerNameList* cn = _track->controllerNames();
-                  if (!cn->empty())
-                        selectController(cn->front().id);
-                  delete cn;
-                  return;
-                  }
-            QAction* a = actions.at(0);
-            if (a)
-                  selectController(a);
-            }
-      else {
-            selectController(ctrl);
-            }
-      }
-
-//---------------------------------------------------------
 //   labelMinusClicked
 //---------------------------------------------------------
 
diff --git a/muse/muse/arranger/tlswidget.h b/muse/muse/arranger/tlswidget.h
index f452a626..a6e8045f 100644
--- a/muse/muse/arranger/tlswidget.h
+++ b/muse/muse/arranger/tlswidget.h
@@ -1,18 +1,29 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tlswidget.h,v 1.11 2005/11/29 20:49:13 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TLSWIDGET_H__
 #define __TLSWIDGET_H__
 
 class Track;
-class SimpleButton;
 class ArrangerTrack;
-class CtrlEdit;
+class CtrlDialog;
 class TimeCanvas;
 
 #include "ctrl/ctrleditor.h"
@@ -33,7 +44,7 @@ class TLSWidget : public QWidget, public CtrlEditor {
       Track* _ctrlTrack;      // track were ctrl belongs to
       TimeCanvas* _tc;
       QToolButton* ctrlList;
-      QMenu* ctrlMenu;
+//      CtrlDialog* ctrlMenu;
       QLineEdit* nameEdit;
       ArrangerTrack* at;
 
@@ -46,17 +57,14 @@ class TLSWidget : public QWidget, public CtrlEditor {
       virtual void mouseReleaseEvent(QMouseEvent*);
       virtual void mouseMoveEvent(QMouseEvent*);
 
-      void selectController(int);
-
    private slots:
       void labelMinusClicked();
       void updateController();
-      void showController();
+      void showControllerList();
       void selectionChanged();
       void configChanged();
       void controllerListChanged(int);
       void autoReadChanged();
-      void selectController(QAction*);
 
    signals:
       void minusClicked(TLSWidget*);
diff --git a/muse/muse/arranger/tlwidget.cpp b/muse/muse/arranger/tlwidget.cpp
index a6bf14c7..1dc8e0d8 100644
--- a/muse/muse/arranger/tlwidget.cpp
+++ b/muse/muse/arranger/tlwidget.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tlwidget.cpp,v 1.58 2006/02/03 16:46:38 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "song.h"
 #include "track.h"
diff --git a/muse/muse/arranger/tlwidget.h b/muse/muse/arranger/tlwidget.h
index 5050f21c..056d1e52 100644
--- a/muse/muse/arranger/tlwidget.h
+++ b/muse/muse/arranger/tlwidget.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tlwidget.h,v 1.21 2006/02/03 16:46:38 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TLWIDGET_H__
 #define __TLWIDGET_H__
diff --git a/muse/muse/arranger/tlwlayout.cpp b/muse/muse/arranger/tlwlayout.cpp
index ba1cd5a8..126bcaea 100644
--- a/muse/muse/arranger/tlwlayout.cpp
+++ b/muse/muse/arranger/tlwlayout.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tlwlayout.cpp,v 1.21 2006/01/12 14:49:13 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "tlwlayout.h"
 #include "arranger.h"
diff --git a/muse/muse/arranger/tlwlayout.h b/muse/muse/arranger/tlwlayout.h
index 664ba449..1a9cc914 100644
--- a/muse/muse/arranger/tlwlayout.h
+++ b/muse/muse/arranger/tlwlayout.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: tlwlayout.h,v 1.4 2005/11/01 10:00:29 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TLWLAYOUT_H__
 #define __TLWLAYOUT_H__
diff --git a/muse/muse/arranger/trackdrag.cpp b/muse/muse/arranger/trackdrag.cpp
index 34da92a6..beab87dd 100644
--- a/muse/muse/arranger/trackdrag.cpp
+++ b/muse/muse/arranger/trackdrag.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: trackdrag.cpp,v 1.6 2005/11/09 09:03:51 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "trackdrag.h"
 
diff --git a/muse/muse/arranger/trackdrag.h b/muse/muse/arranger/trackdrag.h
index 7edfdcde..083a94b3 100644
--- a/muse/muse/arranger/trackdrag.h
+++ b/muse/muse/arranger/trackdrag.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: trackdrag.h,v 1.4 2005/09/26 18:26:20 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TRACKDRAG_H__
 #define __TRACKDRAG_H__
diff --git a/muse/muse/arranger/trackinfo.cpp b/muse/muse/arranger/trackinfo.cpp
index cbf1812b..8107c5f5 100644
--- a/muse/muse/arranger/trackinfo.cpp
+++ b/muse/muse/arranger/trackinfo.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: trackinfo.cpp,v 1.45 2006/01/14 17:08:48 wschweer Exp $
-//  (C) Copyright 1999-2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "arranger.h"
 #include "widgets/outportcombo.h"
diff --git a/muse/muse/arranger/trackinfo.h b/muse/muse/arranger/trackinfo.h
index 656c8e11..d4565aa4 100644
--- a/muse/muse/arranger/trackinfo.h
+++ b/muse/muse/arranger/trackinfo.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: trackinfo.h,v 1.14 2006/01/11 16:14:28 wschweer Exp $
-//  (C) Copyright 1999-2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TRACKINFO_H__
 #define __TRACKINFO_H__
diff --git a/muse/muse/arranger/trelement.h b/muse/muse/arranger/trelement.h
index fe2e2f1a..478b5e51 100644
--- a/muse/muse/arranger/trelement.h
+++ b/muse/muse/arranger/trelement.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: trelement.h,v 1.6 2005/05/17 15:07:57 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TR_ELEMENT_H__
 #define __TR_ELEMENT_H__