[Lmuse-cvs-traffic] muse/muse/arranger arranger.cpp,1.105,1.106 canvas.cpp,1.21,1.22 canvas.h,1.12,1.13 tlswidget.cpp,1.17,1.18 tlwidget.cpp,1.33,1.34

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

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

Modified Files:
	arranger.cpp canvas.cpp canvas.h tlswidget.cpp tlwidget.cpp 
Log Message:
updates


Index: tlwidget.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwidget.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** tlwidget.cpp	18 Oct 2005 19:41:41 -0000	1.33
--- tlwidget.cpp	20 Oct 2005 08:49:17 -0000	1.34
***************
*** 51,56 ****
        pl->setAlignment(AlignTop);
    */
!       SimpleButton* plus = new SimpleButton(this, plusIcon, plusIcon);
!       plus->setLineWidth(0);
        plus->setBackgroundColor(c);
        QToolTip::add(plus, tr("Add Subtrack"));
--- 51,56 ----
        pl->setAlignment(AlignTop);
    */
!       SimpleButton* plus = newPlusButton(this);
! //      plus->setLineWidth(0);
        plus->setBackgroundColor(c);
        QToolTip::add(plus, tr("Add Subtrack"));

Index: tlswidget.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlswidget.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tlswidget.cpp	5 Oct 2005 18:15:27 -0000	1.17
--- tlswidget.cpp	20 Oct 2005 08:49:17 -0000	1.18
***************
*** 19,22 ****
--- 19,23 ----
  #include "selectfilter.h"
  #include "midictrl.h"
+ #include "widgets/utils.h"
  
  static Ctrl veloList(CTRL_VELOCITY, "velocity", Ctrl::DISCRETE, 0.0, 127.0);    // dummy
***************
*** 30,35 ****
     : QWidget(parent)
        {
!       minus = new SimpleButton(this, minusIcon, minusIcon);
!       minus->setLineWidth(0);
        QToolTip::add(minus, tr("Remove Subtrack"));
        connect(minus, SIGNAL(clicked()), SIGNAL(minusClicked()));
--- 31,36 ----
     : QWidget(parent)
        {
!       minus = newMinusButton(this);
! //      minus->setLineWidth(0);
        QToolTip::add(minus, tr("Remove Subtrack"));
        connect(minus, SIGNAL(clicked()), SIGNAL(minusClicked()));

Index: arranger.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** arranger.cpp	18 Oct 2005 19:41:41 -0000	1.105
--- arranger.cpp	20 Oct 2005 08:49:17 -0000	1.106
***************
*** 203,207 ****
        QHBoxLayout* ttoolsLayout = new QHBoxLayout(ttools, 2, 2, "ttoolsLayout");
        SimpleButton* configButton = new SimpleButton(ttools, configIcon, configIcon);
!       configButton->setBackgroundMode(ttools->backgroundMode());
        QToolTip::add(configButton, tr("Config Tracklist"));
        connect(configButton, SIGNAL(clicked()), SLOT(configTrackList()));
--- 203,207 ----
        QHBoxLayout* ttoolsLayout = new QHBoxLayout(ttools, 2, 2, "ttoolsLayout");
        SimpleButton* configButton = new SimpleButton(ttools, configIcon, configIcon);
!       configButton->setAutoRaise(true);
        QToolTip::add(configButton, tr("Config Tracklist"));
        connect(configButton, SIGNAL(clicked()), SLOT(configTrackList()));

Index: canvas.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/canvas.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** canvas.h	13 Oct 2005 20:53:04 -0000	1.12
--- canvas.h	20 Oct 2005 08:49:17 -0000	1.13
***************
*** 65,69 ****
        void drawWavePart(QPainter& p, WavePart* part, int x0, int x1, int x2);
        void drawMidiPart(QPainter& p, MidiPart* mp, int, int, int, int);
!       virtual void mousePress(QPoint);
        virtual void mouseMove(QPoint);
        virtual void mouseRelease(QPoint);
--- 65,69 ----
        void drawWavePart(QPainter& p, WavePart* part, int x0, int x1, int x2);
        void drawMidiPart(QPainter& p, MidiPart* mp, int, int, int, int);
!       virtual void mousePress(QMouseEvent*);
        virtual void mouseMove(QPoint);
        virtual void mouseRelease(QPoint);

Index: canvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/canvas.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** canvas.cpp	18 Oct 2005 19:41:41 -0000	1.21
--- canvas.cpp	20 Oct 2005 08:49:17 -0000	1.22
***************
*** 704,709 ****
  //---------------------------------------------------------
  
! void PartCanvas::mousePress(QPoint pos)
        {
        startDrag = pos;
        int hit   = searchPart(startDrag);
--- 704,710 ----
  //---------------------------------------------------------
  
! void PartCanvas::mousePress(QMouseEvent* me)
        {
+       QPoint pos(me->pos().x(), me->pos().y() - rulerHeight);
        startDrag = pos;
        int hit   = searchPart(startDrag);
***************
*** 975,979 ****
        {
        if (tool != PointerTool) {
!             mousePress(pos);
              return;
              }
--- 976,980 ----
        {
        if (tool != PointerTool) {
! //TD            mousePress(pos);
              return;
              }