[Lmuse-cvs-traffic] muse/muse/arranger arranger.cpp,1.139,1.140 arranger.h,1.64,1.65 tllineedit.cpp,1.7,1.8 tlswidget.cpp,1.32,1.33 tlwidget.cpp,1.54,1.55 tlwidget.h,1.19,1.20 tlwlayout.cpp,1.20,1.21 trackinfo.cpp,1.43,1.44

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

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

Modified Files:
	arranger.cpp arranger.h tllineedit.cpp tlswidget.cpp 
	tlwidget.cpp tlwidget.h tlwlayout.cpp trackinfo.cpp 
Log Message:
Use the source, Luke


Index: arranger.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** arranger.h	11 Jan 2006 16:14:28 -0000	1.64
--- arranger.h	12 Jan 2006 14:49:13 -0000	1.65
***************
*** 33,39 ****
  class TLayout;
  
- static const int TRACK_ROW_HEIGHT = 24;
- static const int INFO_WIDTH = 140;
- 
  //---------------------------------------------------------
  //   TrackListWidget
--- 33,36 ----

Index: tlwlayout.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwlayout.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tlwlayout.cpp	11 Jan 2006 16:14:28 -0000	1.20
--- tlwlayout.cpp	12 Jan 2006 14:49:13 -0000	1.21
***************
*** 9,12 ****
--- 9,13 ----
  #include "tlwlayout.h"
  #include "arranger.h"
+ #include "gui.h"
  
  //---------------------------------------------------------
***************
*** 54,59 ****
        int x2 = rect.x() + rect.width();
        int y  = rect.y() + 1;
!       int y2 = y + rect.height() - 6;	// split height
!       int dh = TRACK_ROW_HEIGHT;
  
        QLayoutItem* item = itemList.at(0);
--- 55,60 ----
        int x2 = rect.x() + rect.width();
        int y  = rect.y() + 1;
!       int y2 = y + rect.height() - splitWidth;
!       int dh = trackRowHeight;
  
        QLayoutItem* item = itemList.at(0);

Index: tlwidget.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwidget.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** tlwidget.cpp	11 Jan 2006 16:14:28 -0000	1.54
--- tlwidget.cpp	12 Jan 2006 14:49:13 -0000	1.55
***************
*** 40,43 ****
--- 40,51 ----
        outPort = 0;
  
+       bgColor       = _track->ccolor();
+       selectBgColor = bgColor.light();
+ 
+       QPalette p(palette());
+       p.setColor(QPalette::Window, bgColor);
+       p.setColor(QPalette::Base, bgColor);
+       setPalette(p);
+ 
        l = new TLWidgetLayout(this);
        configChanged();
***************
*** 54,67 ****
  void TLWidget::selectionChanged()
        {
!       bool val = _track->selected();
!       QPalette::ColorRole cr = val ? QPalette::Base : QPalette::Window;
! 
!       label->setBackgroundRole(cr);
!       plus->setBackgroundRole(cr);
! 
!       if (record)
!             record->setBackgroundRole(cr);
!       if (off)
!             off->setBackgroundRole(cr);
        }
  
--- 62,66 ----
  void TLWidget::selectionChanged()
        {
!       update();
        }
  
***************
*** 234,249 ****
        outPort    = 0;
  
-       QColor color(_track->ccolor());
-       QColor lcolor(_track->ccolor().light());
-       QPalette p(palette());
-       p.setColor(QPalette::Window, color);
-       p.setColor(QPalette::Base, color.light());
-       setPalette(p);
- 
        label = new QLabel;
-       label->setAutoFillBackground(true);
        l->addWidget(label);
        label->setIndent(3);
-       label->setPalette(p);
  
        label->setFont(*config.fonts[1]);
--- 233,239 ----
***************
*** 252,258 ****
  
        plus = newPlusButton(this);
-       plus->setAutoFillBackground(true);
        l->addWidget(plus);
-       plus->setPalette(p);
        plus->setToolTip(tr("Add Subtrack"));
        connect(plus, SIGNAL(clicked()), SLOT(labelPlusClicked()));
--- 242,246 ----
***************
*** 266,271 ****
                          case TR_NAME:
                                nameEdit = new TLLineEdit(_track->name(), this);
!                               nameEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
!                               nameEdit->setFixedHeight(TRACK_ROW_HEIGHT);
                                connect(nameEdit, SIGNAL(contentChanged(QString)), SLOT(nameChanged(QString)));
                                connect(nameEdit, SIGNAL(mousePress()), SLOT(select()));
--- 254,259 ----
                          case TR_NAME:
                                nameEdit = new TLLineEdit(_track->name(), this);
!                         	nameEdit->setBackgroundRole(QPalette::Window);
!                               nameEdit->setFixedHeight(trackRowHeight);
                                connect(nameEdit, SIGNAL(contentChanged(QString)), SLOT(nameChanged(QString)));
                                connect(nameEdit, SIGNAL(mousePress()), SLOT(select()));
***************
*** 279,283 ****
                                {
                                instrument = new QComboBox(this);
!                               instrument->setFixedHeight(TRACK_ROW_HEIGHT);
                                MidiOutPort* op = (MidiOutPort*)_track;
                                MidiInstrument* mi = op->instrument();
--- 267,271 ----
                                {
                                instrument = new QComboBox(this);
!                               instrument->setFixedHeight(trackRowHeight);
                                MidiOutPort* op = (MidiOutPort*)_track;
                                MidiInstrument* mi = op->instrument();
***************
*** 306,310 ****
                                {
                                off = newOffButton(this);
!                               off->setFixedSize(TRACK_ROW_HEIGHT, TRACK_ROW_HEIGHT);
                                off->setChecked(_track->off());
        				off->setAutoFillBackground(true);
--- 294,298 ----
                                {
                                off = newOffButton(this);
!                               off->setFixedSize(trackRowHeight, trackRowHeight);
                                off->setChecked(_track->off());
        				off->setAutoFillBackground(true);
***************
*** 320,324 ****
                                SimpleButton* dm = newDrumMapButton(this);
                                MidiChannel* mt = (MidiChannel*)_track;
!                               dm->setFixedSize(TRACK_ROW_HEIGHT, TRACK_ROW_HEIGHT);
                                dm->setChecked(mt->useDrumMap());
                                connect(dm, SIGNAL(clicked(bool)), SLOT(drumMapToggled(bool)));
--- 308,312 ----
                                SimpleButton* dm = newDrumMapButton(this);
                                MidiChannel* mt = (MidiChannel*)_track;
!                               dm->setFixedSize(trackRowHeight, trackRowHeight);
                                dm->setChecked(mt->useDrumMap());
                                connect(dm, SIGNAL(clicked(bool)), SLOT(drumMapToggled(bool)));
***************
*** 332,336 ****
                                {
                                SimpleButton* mute = newMuteButton(this);
!                               mute->setFixedSize(TRACK_ROW_HEIGHT, TRACK_ROW_HEIGHT);
                                mute->setChecked(_track->isMute());
                                connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
--- 320,324 ----
                                {
                                SimpleButton* mute = newMuteButton(this);
!                               mute->setFixedSize(trackRowHeight, trackRowHeight);
                                mute->setChecked(_track->isMute());
                                connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
***************
*** 344,348 ****
                                {
                                SimpleButton* solo = newSoloButton(this);
!                               solo->setFixedSize(TRACK_ROW_HEIGHT, TRACK_ROW_HEIGHT);
                                solo->setChecked(_track->solo());
                                connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
--- 332,336 ----
                                {
                                SimpleButton* solo = newSoloButton(this);
!                               solo->setFixedSize(trackRowHeight, trackRowHeight);
                                solo->setChecked(_track->solo());
                                connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
***************
*** 356,360 ****
                                {
                                SimpleButton* monitor = newMonitorButton(this);
!                               monitor->setFixedSize(TRACK_ROW_HEIGHT+4, TRACK_ROW_HEIGHT);
                                monitor->setChecked(_track->monitor());
                                connect(monitor, SIGNAL(clicked(bool)), SLOT(monitorToggled(bool)));
--- 344,348 ----
                                {
                                SimpleButton* monitor = newMonitorButton(this);
!                               monitor->setFixedSize(trackRowHeight+4, trackRowHeight);
                                monitor->setChecked(_track->monitor());
                                connect(monitor, SIGNAL(clicked(bool)), SLOT(monitorToggled(bool)));
***************
*** 368,372 ****
                                {
                                record  = newRecordButton(this);
!                               record->setFixedSize(TRACK_ROW_HEIGHT, TRACK_ROW_HEIGHT);
                                record->setChecked(_track->recordFlag());
        				record->setAutoFillBackground(true);
--- 356,360 ----
                                {
                                record  = newRecordButton(this);
!                               record->setFixedSize(trackRowHeight, trackRowHeight);
                                record->setChecked(_track->recordFlag());
        				record->setAutoFillBackground(true);
***************
*** 381,385 ****
                                {
                                SimpleButton* b = newAutoReadButton(this);
!                               b->setFixedSize(TRACK_ROW_HEIGHT, TRACK_ROW_HEIGHT);
                                b->setChecked(_track->autoRead());
                                connect(b, SIGNAL(clicked(bool)), SLOT(autoReadToggled(bool)));
--- 369,373 ----
                                {
                                SimpleButton* b = newAutoReadButton(this);
!                               b->setFixedSize(trackRowHeight, trackRowHeight);
                                b->setChecked(_track->autoRead());
                                connect(b, SIGNAL(clicked(bool)), SLOT(autoReadToggled(bool)));
***************
*** 393,397 ****
                                {
                                SimpleButton* b = newAutoWriteButton(this);
!                               b->setFixedSize(TRACK_ROW_HEIGHT, TRACK_ROW_HEIGHT);
                                b->setChecked(_track->autoWrite());
                                connect(b, SIGNAL(clicked(bool)), SLOT(autoWriteToggled(bool)));
--- 381,385 ----
                                {
                                SimpleButton* b = newAutoWriteButton(this);
!                               b->setFixedSize(trackRowHeight, trackRowHeight);
                                b->setChecked(_track->autoWrite());
                                connect(b, SIGNAL(clicked(bool)), SLOT(autoWriteToggled(bool)));
***************
*** 405,409 ****
                                {
                                outChannel = new QSpinBox(this);
!                               outChannel->setFixedSize(45, TRACK_ROW_HEIGHT);
                                outChannel->setRange(1, 16);
                                MidiChannel* midiChannel = ((MidiTrack*)_track)->channel();
--- 393,397 ----
                                {
                                outChannel = new QSpinBox(this);
!                               outChannel->setFixedSize(45, trackRowHeight);
                                outChannel->setRange(1, 16);
                                MidiChannel* midiChannel = ((MidiTrack*)_track)->channel();
***************
*** 627,631 ****
        QPainter p(this);
        QRect r(ev->rect());
!       QColor color = _track->selected() ? _track->ccolor().light() : _track->ccolor();
        p.fillRect(r, color);
        paintHLine(p, r.x(), r.x() + r.width(), height() - splitWidth);
--- 615,619 ----
        QPainter p(this);
        QRect r(ev->rect());
!       QColor color(_track->selected() ? selectBgColor : bgColor);
        p.fillRect(r, color);
        paintHLine(p, r.x(), r.x() + r.width(), height() - splitWidth);

Index: tlswidget.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlswidget.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tlswidget.cpp	2 Dec 2005 16:07:53 -0000	1.32
--- tlswidget.cpp	12 Jan 2006 14:49:13 -0000	1.33
***************
*** 96,100 ****
        item = itemList.at(1);
        size = item->sizeHint();
!       item->setGeometry(QRect(x1, rect.y(), size.width(), TRACK_ROW_HEIGHT));
        }
  
--- 96,100 ----
        item = itemList.at(1);
        size = item->sizeHint();
!       item->setGeometry(QRect(x1, rect.y(), size.width(), trackRowHeight));
        }
  

Index: tlwidget.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwidget.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tlwidget.h	28 Nov 2005 18:14:43 -0000	1.19
--- tlwidget.h	12 Jan 2006 14:49:13 -0000	1.20
***************
*** 29,32 ****
--- 29,34 ----
        int starty;
        Track* _track;
+       QColor bgColor;
+       QColor selectBgColor;
  
        QLineEdit* nameEdit;

Index: arranger.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** arranger.cpp	11 Jan 2006 16:14:28 -0000	1.139
--- arranger.cpp	12 Jan 2006 14:49:13 -0000	1.140
***************
*** 27,33 ****
  #include "part.h"
  
- static const int minTrackHeight = TRACK_ROW_HEIGHT + 6;
- static const int defaultTrackHeight = minTrackHeight;
- static const int infoHeight  = 20;
  int Arranger::trackNameWidth = 80;
  
--- 27,30 ----
***************
*** 89,92 ****
--- 86,91 ----
        QLayoutItem *itemAt(int index) const { return itemList.value(index); }
        QLayoutItem *takeAt(int idx) {
+             if (idx < 0 || idx >= itemList.size())
+                   printf("TLayout::takeAt: bad index %d\n", idx);
              return idx >= 0 && idx < itemList.size() ? itemList.takeAt(idx) : 0;
              }
***************
*** 281,285 ****
        infoDock = new QDockWidget(tr("TrackInfo"));
        infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
!  	infoDock->setFixedWidth(INFO_WIDTH);
        infoDock->layout()->setMargin(0);
        infoDock->layout()->setSpacing(0);
--- 280,284 ----
        infoDock = new QDockWidget(tr("TrackInfo"));
        infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
!  	infoDock->setFixedWidth(infoWidth);
        infoDock->layout()->setMargin(0);
        infoDock->layout()->setSpacing(0);
***************
*** 300,304 ****
        infoView = new QScrollArea;
        infoDock->setWidget(infoView);
!       infoView->setFixedWidth(INFO_WIDTH);
        infoView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
        trackInfo = new QStackedWidget;
--- 299,303 ----
        infoView = new QScrollArea;
        infoDock->setWidget(infoView);
!       infoView->setFixedWidth(infoWidth);
        infoView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
        trackInfo = new QStackedWidget;
***************
*** 510,513 ****
--- 509,513 ----
        tw->setFixedHeight(t->arrangerTrack.h);
        tl->insertWidget(idx, tw);
+       tw->show();	// needed if song is reloaded
  
        connect(tw,   SIGNAL(plusClicked(TLWidget*)),   SLOT(appendSubtrack(TLWidget*)));
***************
*** 831,835 ****
        {
        if (strip)
!             delete strip;
        strip = 0;
  
--- 831,835 ----
        {
        if (strip)
!             strip->close();
        strip = 0;
  
***************
*** 857,860 ****
--- 857,861 ----
        {
        TrackList* stl = song->tracks();
+ 
        for (iTrack i = stl->begin(); i != stl->end(); ++i) {
              Track* t = *i;

Index: trackinfo.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/trackinfo.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** trackinfo.cpp	11 Jan 2006 16:14:28 -0000	1.43
--- trackinfo.cpp	12 Jan 2006 14:49:13 -0000	1.44
***************
*** 16,19 ****
--- 16,20 ----
  #include "tllineedit.h"
  #include "audio.h"
+ #include "gui.h"
  
  //---------------------------------------------------------
***************
*** 176,180 ****
        grid->addWidget(port,  11, 0, 1, 2);
        instrument = new QComboBox;
!       instrument->setFixedWidth(INFO_WIDTH);
        instrument->setToolTip(tr("Midi Instrument"));
        grid->addWidget(instrument,  12, 0, 1, 2);
--- 177,181 ----
        grid->addWidget(port,  11, 0, 1, 2);
        instrument = new QComboBox;
!       instrument->setFixedWidth(infoWidth);
        instrument->setToolTip(tr("Midi Instrument"));
        grid->addWidget(instrument,  12, 0, 1, 2);
***************
*** 528,532 ****
        {
        instrument = new QComboBox(this);
!       instrument->setFixedWidth(INFO_WIDTH);
        instrument->setToolTip(tr("Midi Device"));
        grid->addWidget(instrument,  2, 0, 1, 2);
--- 529,533 ----
        {
        instrument = new QComboBox(this);
!       instrument->setFixedWidth(infoWidth);
        instrument->setToolTip(tr("Midi Device"));
        grid->addWidget(instrument,  2, 0, 1, 2);
***************
*** 624,628 ****
        grid->addWidget(portName,  4, 0, 1, 2);
        instrument = new QComboBox;
!       instrument->setFixedWidth(INFO_WIDTH);
        instrument->setToolTip(tr("Midi Device"));
        grid->addWidget(instrument,  5, 0, 1, 2);
--- 625,629 ----
        grid->addWidget(portName,  4, 0, 1, 2);
        instrument = new QComboBox;
!       instrument->setFixedWidth(infoWidth);
        instrument->setToolTip(tr("Midi Device"));
        grid->addWidget(instrument,  5, 0, 1, 2);

Index: tllineedit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/tllineedit.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tllineedit.cpp	11 Jan 2006 16:14:28 -0000	1.7
--- tllineedit.cpp	12 Jan 2006 14:49:13 -0000	1.8
***************
*** 16,20 ****
     : QLineEdit(contents, parent)
        {
- //      setBackgroundMode(Qt::PaletteBackground);
        setReadOnly(true);
        setFrame(false);
--- 16,19 ----