Fixed long-standing problem with themes (Ora/Bespin etc) and button icons.

Fixed midi strip blank automation box at bottom, too high. 
Repaired some non-virtual paintEvent(), resizeEvent(), event() etc. 

6 files changed, 137 insertions, 131 deletions

diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 156017e8..bf31d820 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -4,6 +4,7 @@
 //  $Id: astrip.cpp,v 1.23.2.17 2009/11/16 01:55:55 terminator356 Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -172,28 +173,19 @@ void AudioStrip::songChanged(int val)
             mute->blockSignals(true);
             mute->setChecked(src->mute());
             mute->blockSignals(false);
+            mute->setIcon(src->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn));
+            //mute->setIconSize(muteIconOn->size());  
             updateOffState();
             }
       if (solo && (val & SC_SOLO)) {
-            if((bool)track->internalSolo())
-            {
-              if(!useSoloIconSet2)
-              {
-                solo->setIcon(*soloIconSet2);
-                solo->setIconSize(soloIconOn->size());  
-                useSoloIconSet2 = true;
-              }  
-            }  
-            else if(useSoloIconSet2)
-            {
-              solo->setIcon(*soloIconSet1);
-              solo->setIconSize(soloblksqIconOn->size());  
-              useSoloIconSet2 = false;
-            }  
-            
             solo->blockSignals(true);
             solo->setChecked(track->solo());
             solo->blockSignals(false);
+            if(track->internalSolo())
+              solo->setIcon(track->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff));
+            else
+              solo->setIcon(track->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff));
+            //solo->setIconSize(soloIconOn->size());  
             }
       if (val & SC_RECFLAG)
             setRecordFlag(track->recordFlag());
@@ -232,19 +224,31 @@ void AudioStrip::songChanged(int val)
             if(track->automationType() == AUTO_TOUCH || track->automationType() == AUTO_WRITE)
                   {
                   palette.setColor(QPalette::Button, QColor(215, 76, 39)); // red
-                  //QColor c(Qt::red);
-                  //gradient.setColorAt(0, c);
-                  //gradient.setColorAt(1, c.darker());
-                  //palette.setBrush(QPalette::Button, gradient);
+                  //palette.setColor(QPalette::Window, QColor(215, 76, 39)); // red
+                  /*QLinearGradient gradient(autoType->geometry().topLeft(), autoType->geometry().bottomLeft());
+                  QColor c(Qt::red);
+                  //QColor c(215, 76, 39);       // red
+                  gradient.setColorAt(0, c.darker());
+                  gradient.setColorAt(0.5, c);
+                  gradient.setColorAt(1, c.darker());
+                  palette.setBrush(QPalette::Button, gradient);
+                  //palette.setBrush(autoType->backgroundRole(), gradient);
+                  //palette.setBrush(QPalette::Window, gradient);   */
                   autoType->setPalette(palette);
                   }
             else if(track->automationType() == AUTO_READ)
                   {
                   palette.setColor(QPalette::Button, QColor(100, 172, 49)); // green
-                  //QColor c(Qt::green);
-                  //gradient.setColorAt(0, c);
-                  //gradient.setColorAt(1, c.darker());
-                  //palette.setBrush(QPalette::Button, gradient);
+                  //palette.setColor(QPalette::Window, QColor(100, 172, 49)); // green
+                  /*QLinearGradient gradient(autoType->geometry().topLeft(), autoType->geometry().bottomLeft());
+                  QColor c(Qt::green);
+                  //QColor c(100, 172, 49);     // green
+                  gradient.setColorAt(0, c.darker());
+                  gradient.setColorAt(0.5, c);
+                  gradient.setColorAt(1, c.darker());
+                  palette.setBrush(QPalette::Button, gradient);
+                  //palette.setBrush(autoType->backgroundRole(), gradient);
+                  //palette.setBrush(QPalette::Window, gradient);  */
                   autoType->setPalette(palette);
                   }
             else  
@@ -354,6 +358,8 @@ void AudioStrip::updateOffState()
             off->blockSignals(true);
             off->setChecked(track->off());
             off->blockSignals(false);
+            off->setIcon(track->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon));
+            //off->setIconSize(exit1Icon->size());  
             }
       }
 
@@ -623,6 +629,8 @@ void AudioStrip::updateChannels()
       stereo->blockSignals(true);
       stereo->setChecked(channel == 2);
       stereo->blockSignals(false);
+      stereo->setIcon(channel == 2 ? QIcon(*stereoIcon) : QIcon(*monoIcon));
+      //stereo->setIconSize(stereoIcon->size());  
       }
 
 //---------------------------------------------------------
@@ -753,15 +761,11 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
 
       stereo  = new QToolButton();
       stereo->setFont(MusEConfig::config.fonts[1]);
-      QIcon stereoSet;
-      stereoSet.addPixmap(*monoIcon, QIcon::Normal, QIcon::Off);
-      stereoSet.addPixmap(*stereoIcon, QIcon::Normal, QIcon::On);
-      stereo->setIcon(stereoSet);
-      stereo->setIconSize(monoIcon->size());  
-
       stereo->setCheckable(true);
       stereo->setToolTip(tr("1/2 channel"));
       stereo->setChecked(channel == 2);
+      stereo->setIcon(channel == 2 ? QIcon(*stereoIcon) : QIcon(*monoIcon));
+      stereo->setIconSize(monoIcon->size());  
       stereo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       connect(stereo, SIGNAL(clicked(bool)), SLOT(stereoToggled(bool)));
 
@@ -868,47 +872,33 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
             record->setCheckable(true);
             record->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
             record->setBackgroundRole(QPalette::Mid);
-            QIcon iconSet;
-            iconSet.addPixmap(*record_on_Icon, QIcon::Normal, QIcon::On);
-            iconSet.addPixmap(*record_off_Icon, QIcon::Normal, QIcon::Off);
-            record->setIcon(iconSet);
-            record->setIconSize(record_on_Icon->size());  
             record->setToolTip(tr("record"));
             record->setChecked(t->recordFlag());
+            record->setIcon(t->recordFlag() ? QIcon(*record_on_Icon) : QIcon(*record_off_Icon));
+            record->setIconSize(record_on_Icon->size());  
             connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool)));
             }
 
       Track::TrackType type = t->type();
 
       mute  = new QToolButton();
-      QIcon muteSet;
-      muteSet.addPixmap(*muteIconOn, QIcon::Normal, QIcon::Off);
-      muteSet.addPixmap(*muteIconOff, QIcon::Normal, QIcon::On);
-      mute->setIcon(muteSet);
-      mute->setIconSize(muteIconOn->size());  
       mute->setCheckable(true);
       mute->setToolTip(tr("mute"));
       mute->setChecked(t->mute());
+      mute->setIcon(t->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn));
+      mute->setIconSize(muteIconOn->size());  
       mute->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
 
       solo  = new QToolButton();
       
-      if((bool)t->internalSolo())
-      {
-        solo->setIcon(*soloIconSet2);
-        solo->setIconSize(soloIconOn->size());  
-        useSoloIconSet2 = true;
-      }  
-      else  
-      {
-        solo->setIcon(*soloIconSet1);
-        solo->setIconSize(soloblksqIconOn->size());  
-        useSoloIconSet2 = false;
-      }  
-              
       solo->setCheckable(true);
       solo->setChecked(t->solo());
+      if(t->internalSolo())
+        solo->setIcon(t->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff));
+      else
+        solo->setIcon(t->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff));
+      solo->setIconSize(soloIconOn->size());  
       solo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
       if (type == Track::AUDIO_OUTPUT) {
@@ -922,16 +912,13 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
             }
 
       off  = new MusEWidget::TransparentToolButton(this);
-      QIcon iconSet;
-      iconSet.addPixmap(*exit1Icon, QIcon::Normal, QIcon::On);
-      iconSet.addPixmap(*exitIcon, QIcon::Normal, QIcon::Off);
-      off->setIcon(iconSet);
-      off->setIconSize(exit1Icon->size());  
       off->setBackgroundRole(QPalette::Mid);
       off->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       off->setCheckable(true);
       off->setToolTip(tr("off"));
       off->setChecked(t->off());
+      off->setIcon(t->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon));
+      off->setIconSize(exit1Icon->size());  
       connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool)));
 
       grid->addWidget(off, _curGridRow, 0);
@@ -972,6 +959,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       autoType = new MusEWidget::ComboBox();
       autoType->setFont(MusEConfig::config.fonts[1]);
       autoType->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+      //autoType->setAutoFillBackground(true);
       
       autoType->addAction(tr("Off"), AUTO_OFF);
       autoType->addAction(tr("Read"), AUTO_READ);
@@ -983,20 +971,30 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       //QLinearGradient gradient(autoType->geometry().topLeft(), autoType->geometry().bottomLeft());
       if(t->automationType() == AUTO_TOUCH || t->automationType() == AUTO_WRITE)
             {
-            palette.setColor(QPalette::Button, QColor(Qt::red));
-            //QColor c(Qt::red);
-            //gradient.setColorAt(0, c);
-            //gradient.setColorAt(1, c.darker());
-            //palette.setBrush(QPalette::Button, gradient);
+            palette.setColor(QPalette::Button, QColor(215, 76, 39));  // red
+            /* QLinearGradient gradient(autoType->geometry().topLeft(), autoType->geometry().bottomLeft());
+            QColor c(Qt::red);
+            //QColor c(215, 76, 39);       // red
+            gradient.setColorAt(0, c.darker());
+            gradient.setColorAt(0.5, c);
+            gradient.setColorAt(1, c.darker());
+            palette.setBrush(QPalette::Button, gradient);
+            //palette.setBrush(autoType->backgroundRole(), gradient);
+            //palette.setBrush(QPalette::Window, gradient);  */
             autoType->setPalette(palette);
             }
       else if(t->automationType() == AUTO_READ)
             {
-            palette.setColor(QPalette::Button, QColor(Qt::green));
-            //QColor c(Qt::green);
-            //gradient.setColorAt(0, c);
-            //gradient.setColorAt(1, c.darker());
-            //palette.setBrush(QPalette::Button, gradient);
+            palette.setColor(QPalette::Button, QColor(100, 172, 49));  // green
+            /*QLinearGradient gradient(autoType->geometry().topLeft(), autoType->geometry().bottomLeft());
+            QColor c(Qt::green);
+            //QColor c(100, 172, 49);     // green
+            gradient.setColorAt(0, c.darker());
+            gradient.setColorAt(0.5, c);
+            gradient.setColorAt(1, c.darker());
+            palette.setBrush(QPalette::Button, gradient);
+            //palette.setBrush(autoType->backgroundRole(), gradient);
+            //palette.setBrush(QPalette::Window, gradient);  */
             autoType->setPalette(palette);
             }
       else  
diff --git a/muse2/muse/mixer/astrip.h b/muse2/muse/mixer/astrip.h
index 72e88cca..3e2b6c1d 100644
--- a/muse2/muse/mixer/astrip.h
+++ b/muse2/muse/mixer/astrip.h
@@ -4,6 +4,7 @@
 //  $Id: astrip.h,v 1.8.2.6 2009/11/14 03:37:48 terminator356 Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index c6832e6b..c920d6c6 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -4,6 +4,7 @@
 //  $Id: mstrip.cpp,v 1.9.2.13 2009/11/14 03:37:48 terminator356 Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -296,48 +297,32 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       record->setBackgroundRole(QPalette::Mid);
       record->setCheckable(true);
       record->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
-      
-      QIcon iconSet;
-      iconSet.addPixmap(*record_on_Icon, QIcon::Normal, QIcon::On);
-      iconSet.addPixmap(*record_off_Icon, QIcon::Normal, QIcon::Off);
-      record->setIcon(iconSet);
-      record->setIconSize(record_on_Icon->size());  
       record->setToolTip(tr("record"));
       record->setChecked(track->recordFlag());
+      record->setIcon(track->recordFlag() ? QIcon(*record_on_Icon) : QIcon(*record_off_Icon));
+      record->setIconSize(record_on_Icon->size());  
       connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool)));
 
       mute  = new QToolButton();
-      QIcon muteSet;
-      muteSet.addPixmap(*muteIconOn, QIcon::Normal, QIcon::Off);
-      muteSet.addPixmap(*muteIconOff, QIcon::Normal, QIcon::On);
-      mute->setIcon(muteSet);
-      mute->setIconSize(muteIconOn->size());  
       mute->setCheckable(true);
       mute->setToolTip(tr("mute"));
       mute->setChecked(track->mute());
+      mute->setIcon(track->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn));
+      mute->setIconSize(muteIconOn->size());  
       mute->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
 
       solo  = new QToolButton();
-
-      if((bool)t->internalSolo())
-      {
-        solo->setIcon(*soloIconSet2);
-        solo->setIconSize(soloIconOn->size());  
-        useSoloIconSet2 = true;
-      }  
-      else  
-      {
-        solo->setIcon(*soloIconSet1);
-        solo->setIconSize(soloblksqIconOn->size());  
-        useSoloIconSet2 = false;
-      }  
-      
       //solo->setToolTip(tr("pre fader listening"));
       solo->setToolTip(tr("solo mode"));
       solo->setCheckable(true);
-      solo->setChecked(t->solo());
+      solo->setChecked(track->solo());
       solo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+      if(track->internalSolo())
+        solo->setIcon(track->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff));
+      else
+        solo->setIcon(track->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff));
+      solo->setIconSize(soloIconOn->size());  
       connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
       
       /*
@@ -363,8 +348,8 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       ///dev_ch_label->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum));
       dev_ch_label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       dev_ch_label->setAlignment(Qt::AlignCenter);
-      int port = t->outPort();
-      int channel = t->outChannel();
+      int port = track->outPort();
+      int channel = track->outChannel();
       QString dcs;
       dcs.sprintf("%d-%d", port + 1, channel + 1);
       dev_ch_label->setText(dcs);
@@ -377,16 +362,13 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       */
       
       off  = new MusEWidget::TransparentToolButton(this);
-      QIcon iconOff;
-      iconOff.addPixmap(*exit1Icon, QIcon::Normal, QIcon::On);
-      iconOff.addPixmap(*exitIcon, QIcon::Normal, QIcon::Off);
-      off->setIcon(iconOff);
-      off->setIconSize(exit1Icon->size());  
       off->setBackgroundRole(QPalette::Mid);
       off->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       off->setCheckable(true);
       off->setToolTip(tr("off"));
-      off->setChecked(t->off());
+      off->setChecked(track->off());
+      off->setIcon(track->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon));
+      off->setIconSize(exit1Icon->size());  
       connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool)));
 
       grid->addWidget(off, _curGridRow, 0);
@@ -436,6 +418,8 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       //autoType->setCurrentItem(t->automationType());
       //autoType->setToolTip(tr("automation type"));      
       //connect(autoType, SIGNAL(activated(int)), SLOT(setAutomationType(int)));
+      autoType->addAction(" ", AUTO_OFF);  // Just a dummy text to fix sizing problems. REMOVE later if full automation added.
+      autoType->setCurrentItem(AUTO_OFF);    //
 
       grid->addWidget(autoType, _curGridRow++, 0, 1, 2);
       connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
@@ -461,8 +445,9 @@ void MidiStrip::updateOffState()
             solo->setEnabled(val);
       if (mute)
             mute->setEnabled(val);
-      if (autoType)
-            autoType->setEnabled(val);
+      // TODO: Disabled for now.
+      //if (autoType)
+      //      autoType->setEnabled(val);
       if (iR)
             iR->setEnabled(val);
       // TODO: Disabled for now.
@@ -472,6 +457,8 @@ void MidiStrip::updateOffState()
             off->blockSignals(true);
             off->setChecked(track->off());
             off->blockSignals(false);
+            off->setIcon(track->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon));
+            //off->setIconSize(exit1Icon->size());  
             }
       }
 
@@ -483,30 +470,23 @@ void MidiStrip::songChanged(int val)
       {
       if (mute && (val & SC_MUTE)) {      // mute && off
             mute->blockSignals(true);
-            mute->setChecked(track->isMute());
-            updateOffState();
+            //mute->setChecked(track->isMute());  
+            mute->setChecked(track->mute());
             mute->blockSignals(false);
+            mute->setIcon(track->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn));
+            //mute->setIconSize(muteIconOn->size());  
+            updateOffState();
             }
       if (solo && (val & SC_SOLO)) 
       {
-            if((bool)track->internalSolo())
-            {
-              if(!useSoloIconSet2)
-              {
-                solo->setIcon(*soloIconSet2);
-                solo->setIconSize(soloIconOn->size());  
-                useSoloIconSet2 = true;
-              }  
-            }  
-            else if(useSoloIconSet2)
-            {
-              solo->setIcon(*soloIconSet1);
-              solo->setIconSize(soloblksqIconOn->size());  
-              useSoloIconSet2 = false;
-            }  
             solo->blockSignals(true);
             solo->setChecked(track->solo());
             solo->blockSignals(false);
+            if(track->internalSolo())
+              solo->setIcon(track->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff));
+            else
+              solo->setIcon(track->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff));
+            //solo->setIconSize(soloIconOn->size());  
       }      
       
       if (val & SC_RECFLAG)
diff --git a/muse2/muse/mixer/mstrip.h b/muse2/muse/mixer/mstrip.h
index d8e947f9..0535eaa8 100644
--- a/muse2/muse/mixer/mstrip.h
+++ b/muse2/muse/mixer/mstrip.h
@@ -4,6 +4,7 @@
 //  $Id: mstrip.h,v 1.4.2.4 2009/10/25 19:26:29 lunar_shuttle Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index e9f92e9b..59149222 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -4,6 +4,7 @@
 //  $Id: strip.cpp,v 1.6.2.5 2009/11/14 03:37:48 terminator356 Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -38,6 +39,7 @@
 #include "strip.h"
 #include "meter.h"
 #include "utils.h"
+#include "icons.h"
 
 namespace MusEMixer {
 
@@ -51,6 +53,8 @@ void Strip::setRecordFlag(bool flag)
             record->blockSignals(true);
             record->setChecked(flag);
             record->blockSignals(false);
+            record->setIcon(flag ? QIcon(*record_on_Icon) : QIcon(*record_off_Icon));
+            //record->setIconSize(record_on_Icon->size());  
             }
       }
 
@@ -75,7 +79,11 @@ void Strip::recordToggled(bool val)
                   }
             audio->msgSetRecord((AudioOutput*)track, val);
             if (!((AudioOutput*)track)->recFile())
+            {  
                   record->setChecked(false);
+                  record->setIcon(QIcon(*record_off_Icon));
+                  //record->setIconSize(record_on_Icon->size());  
+            }      
             return;
             }
       song->setRecordFlag(track, val);
@@ -148,8 +156,18 @@ void Strip::setLabelText()
       
       label->setText(track->name());
       QPalette palette;
-      palette.setColor(label->backgroundRole(), c);
+      //palette.setColor(label->backgroundRole(), c);
+      QLinearGradient gradient(label->geometry().topLeft(), label->geometry().bottomLeft());
+      //gradient.setColorAt(0, c.darker());
+      //gradient.setColorAt(0, c);
+      //gradient.setColorAt(1, c.darker());
+      gradient.setColorAt(0, c.lighter());
+      gradient.setColorAt(1, c);
+      //palette.setBrush(QPalette::Button, gradient);
+      //palette.setBrush(QPalette::Window, gradient);
+      palette.setBrush(label->backgroundRole(), gradient);
       label->setPalette(palette);
+      
       //label->setStyleSheet(QString("background-color: ") + c.name());
 }
 
@@ -186,18 +204,16 @@ Strip::Strip(QWidget* parent, Track* t)
       iR            = 0;
       oR            = 0;
       
-      setBackgroundRole(QPalette::Mid);
+      ///setBackgroundRole(QPalette::Mid);
       setFrameStyle(Panel | Raised);
       setLineWidth(2);
       
       // NOTE: Workaround for freakin' improper disabled button text colour (at least with Oxygen colours). 
       // Just set the parent palette.
-      QPalette pal(palette());
-      pal.setColor(QPalette::Disabled, QPalette::ButtonText, 
-                   pal.color(QPalette::Disabled, QPalette::WindowText));
-      setPalette(pal);
-      
-      useSoloIconSet2 = false;
+      //QPalette pal(palette());
+      //pal.setColor(QPalette::Disabled, QPalette::ButtonText, 
+      //             pal.color(QPalette::Disabled, QPalette::WindowText));
+      //setPalette(pal);
       
       track    = t;
       meter[0] = 0;
@@ -233,7 +249,7 @@ Strip::Strip(QWidget* parent, Track* t)
       // Therefore 'fake' set the size of the label now.
       // Added by Tim. p3.3.9
       //label->setGeometry(label->x(), label->y(), STRIP_WIDTH - 2*frameWidth() - 2*layout->margin(), label->height());
-      label->setGeometry(label->x(), label->y(), STRIP_WIDTH - 2*grid->margin(), label->height());
+      ///label->setGeometry(label->x(), label->y(), STRIP_WIDTH - 2*grid->margin(), label->height());
       
       label->setTextFormat(Qt::PlainText);
       
@@ -279,5 +295,14 @@ void Strip::setAutomationType(int t)
       track->setAutomationType(AutomationType(t));
       song->update(SC_AUTOMATION);
       }
+      
+void Strip::resizeEvent(QResizeEvent* ev)
+{
+  //printf("Strip::resizeEvent\n");  
+  QFrame::resizeEvent(ev);
+  setLabelText();  
+  setLabelFont();
+}  
+      
 
 } // namespace MusEMixer
diff --git a/muse2/muse/mixer/strip.h b/muse2/muse/mixer/strip.h
index ea4d2693..f5749177 100644
--- a/muse2/muse/mixer/strip.h
+++ b/muse2/muse/mixer/strip.h
@@ -4,6 +4,7 @@
 //  $Id: strip.h,v 1.3.2.2 2009/11/14 03:37:48 terminator356 Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -62,7 +63,6 @@ class Strip : public QFrame {
       QGridLayout* grid;
       int _curGridRow;
       MusEWidget::Meter* meter[MAX_CHANNELS];
-      bool useSoloIconSet2;
       
       QToolButton* record;
       QToolButton* solo;
@@ -72,6 +72,7 @@ class Strip : public QFrame {
       QGridLayout* sliderGrid;
       MusEWidget::ComboBox* autoType;
       void setLabelText();
+      virtual void resizeEvent(QResizeEvent*);
 
    private slots:
       void recordToggled(bool);