[Lmuse-cvs-traffic] muse/muse/arranger canvas.cpp,1.37,1.38 tlswidget.cpp,1.30,1.31 tlswidget.h,1.10,1.11

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse/arranger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18958/muse/arranger

Modified Files:
	canvas.cpp tlswidget.cpp tlswidget.h 
Log Message:
new updates


Index: tlswidget.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlswidget.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tlswidget.cpp	28 Nov 2005 18:14:43 -0000	1.30
--- tlswidget.cpp	29 Nov 2005 20:49:13 -0000	1.31
***************
*** 112,115 ****
--- 112,116 ----
        at     = atrack;
        _track = t;
+       _ctrlTrack = t;
  
        TLSLayout* l = new TLSLayout;
***************
*** 130,137 ****
        l->addWidget(ctrlList);
        ctrlList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
- //      ctrlList->setSizeAdjustPolicy(QComboBox::AdjustToContents);
  
        updateController();
- //      ctrlList->setCurrentIndex(0);
        connect(ctrlMenu, SIGNAL(triggered(QAction*)), SLOT(selectController(QAction*)));
        connect(_track, SIGNAL(clChanged()), SLOT(updateController()));
--- 131,136 ----
***************
*** 216,220 ****
        {
        if (ctrl == CTRL_OTHER) {   // "other"
!             ConfigMidiCtrl* mce = new ConfigMidiCtrl((MidiTrack*)_track);
              mce->exec();
              updateController();
--- 215,219 ----
        {
        if (ctrl == CTRL_OTHER) {   // "other"
! /*??*/      ConfigMidiCtrl* mce = new ConfigMidiCtrl((MidiTrack*)_track);
              mce->exec();
              updateController();
***************
*** 225,228 ****
--- 224,228 ----
              at->ctrl = CTRL_VELOCITY;
              ctrlList->setText(tr("Velocity"));
+             _ctrlTrack = _track;
              emit controllerChanged(at->ctrl);
              }
***************
*** 233,237 ****
--- 233,240 ----
                    MidiChannel* mc = ((MidiTrack*)_track)->channel();
                    at->controller = mc->getController(ctrl);
+                   _ctrlTrack = mc;
                    }
+             else
+                   _ctrlTrack = _track;
              ctrlList->setText(at->controller->name());
              emit controllerChanged(ctrl);

Index: tlswidget.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlswidget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tlswidget.h	23 Nov 2005 13:55:32 -0000	1.10
--- tlswidget.h	29 Nov 2005 20:49:13 -0000	1.11
***************
*** 30,34 ****
        int trackIdx;
        int starty;
!       Track* _track;
        TimeCanvas* _tc;
        QToolButton* ctrlList;
--- 30,35 ----
        int trackIdx;
        int starty;
!       Track* _track;          // editor canvas is associated to this track
!       Track* _ctrlTrack;      // track were ctrl belongs to
        TimeCanvas* _tc;
        QToolButton* ctrlList;
***************
*** 66,70 ****
     public:
        TLSWidget(Track*, ArrangerTrack*, TimeCanvas* tc);
!       Track* track() const { return _track; }
        void setCtrl(int ctrl);
        void setIdx(int n) { trackIdx = n; }
--- 67,72 ----
     public:
        TLSWidget(Track*, ArrangerTrack*, TimeCanvas* tc);
!       Track* track() const     { return _track; }
!       Track* ctrlTrack() const { return _ctrlTrack; }
        void setCtrl(int ctrl);
        void setIdx(int n) { trackIdx = n; }

Index: canvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/canvas.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** canvas.cpp	23 Nov 2005 13:55:32 -0000	1.37
--- canvas.cpp	29 Nov 2005 20:49:13 -0000	1.38
***************
*** 364,377 ****
              a->setData(0);
  
!             QMenu* cp = new QMenu(tr("color"));
!             pop->addMenu(cp);
  
              // part color selection
! //TD                const QFontMetrics& fm = cp->fontMetrics();
! //                  int h = fm.lineSpacing();
! //                  for (int i = 0; i < NUM_PARTCOLORS; ++i) {
! //                        ColorListItem* item = new ColorListItem(config.partColors[i], h, fontMetrics().height(), partColorNames[i]);
! //                        cp->insertItem(item, 20 + i);
! //                        }
              a = pop->addAction(*deleteIcon, tr("delete"));
              a->setData(1);
--- 364,378 ----
              a->setData(0);
  
!             QMenu* cp = pop->addMenu(tr("color"));
  
              // part color selection
!             for (int i = 0; i < NUM_PARTCOLORS; ++i) {
!                   a = cp->addAction(partColorNames[i]);
!                   a->setData(20 + i);
!                   QPixmap pm(20, 20);
!                   QPainter p(&pm);
!                   p.fillRect(0, 0, 20, 20, config.partColors[i]);
!                   a->setIcon(QIcon(pm));
!                   }
              a = pop->addAction(*deleteIcon, tr("delete"));
              a->setData(1);
***************
*** 382,385 ****
--- 383,387 ----
              a = pop->addAction(tr("de-clone"));
              a->setData(15);
+             a->setEnabled(part->events()->arefCount() > 1);
  
              pop->addSeparator();
***************
*** 408,415 ****
                          break;
                    }
! //TD            pop->setItemEnabled(1, true);
! //            pop->setItemEnabled(4, true);
! //            bool isClone = part->events()->arefCount() > 1;
! //            pop->setItemEnabled(15, isClone);
              a = pop->exec(mapToGlobal(pos));
              if (a) {
--- 410,414 ----
                          break;
                    }
! 
              a = pop->exec(mapToGlobal(pos));
              if (a) {