merged with trunk

tiny fix: removed bool initalizing completely
reindented cobject.cpp

2 files changed, 8 insertions, 4 deletions

diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp
index 9e7dc754..fdd80e60 100644
--- a/muse2/muse/mixer/rack.cpp
+++ b/muse2/muse/mixer/rack.cpp
@@ -84,9 +84,9 @@ void EffectRackDelegate::paint ( QPainter * painter, const QStyleOptionViewItem
       mask.setColorAt(1, mask_edge);
       mask.setStart(QPointF(0, cr.y()));
       mask.setFinalStop(QPointF(0, cr.y() + cr.height()));
-  
+
       painter->setBrush(tr->efxPipe()->isOn(index.row()) ?
-                        option.palette.mid() :
+                        er->getActiveColor() :
                         option.palette.dark());
       painter->setPen(Qt::NoPen);
       painter->drawRoundedRect(cr, 2, 2);
@@ -160,6 +160,7 @@ EffectRack::EffectRack(QWidget* parent, AudioTrack* t)
       track = t;
       itemheight = 19;
       setFont(MusEConfig::config.fonts[1]);
+      activeColor = QColor(74, 165, 49);
 
       setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
       setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -186,7 +187,7 @@ void EffectRack::updateContents()
       for (int i = 0; i < PipelineDepth; ++i) {
             QString name = track->efxPipe()->name(i);
             item(i)->setText(name);
-            item(i)->setBackground(track->efxPipe()->isOn(i) ? palette().mid() : palette().dark());
+            item(i)->setBackground(track->efxPipe()->isOn(i) ? activeColor : palette().dark());
             item(i)->setToolTip(name == QString("empty") ? tr("effect rack") : name );
             }	
       }
diff --git a/muse2/muse/mixer/rack.h b/muse2/muse/mixer/rack.h
index a2f2a25a..65d112e9 100644
--- a/muse2/muse/mixer/rack.h
+++ b/muse2/muse/mixer/rack.h
@@ -44,7 +44,8 @@ class EffectRack : public QListWidget {
     
       AudioTrack* track;
       int itemheight;
-      
+      QColor activeColor;      
+
       virtual QSize minimumSizeHint() const;
       virtual QSize sizeHint() const;
       
@@ -75,6 +76,8 @@ class EffectRack : public QListWidget {
       
       AudioTrack* getTrack() { return track; } 
       QPoint getDragPos() { return dragPos; }
+      QColor getActiveColor() { return activeColor; }
+
       };
 
 #endif