merged with trunk

3 files changed, 20 insertions, 38 deletions

diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index ccd47661..6b8043b9 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -781,6 +781,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
 
       stereo  = new QToolButton();
       ///stereo->setFont(MusEGlobal::config.fonts[1]);
+      stereo->setFocusPolicy(Qt::NoFocus);
       stereo->setCheckable(true);
       stereo->setToolTip(tr("1/2 channel"));
       stereo->setChecked(channel == 2);
@@ -795,6 +796,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
 
       pre = new QToolButton();
       ///pre->setFont(MusEGlobal::config.fonts[1]);
+      pre->setFocusPolicy(Qt::NoFocus);
       pre->setCheckable(true);
       pre->setText(tr("Pre"));
       pre->setToolTip(tr("pre fader - post fader"));
@@ -895,6 +897,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
 
       if (track->canRecord()) {
             record  = new MusEGui::TransparentToolButton(this);
+	    record->setFocusPolicy(Qt::NoFocus);
             record->setCheckable(true);
             record->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
             record->setBackgroundRole(QPalette::Mid);
@@ -908,6 +911,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
       MusECore::Track::TrackType type = t->type();
 
       mute  = new QToolButton();
+      mute->setFocusPolicy(Qt::NoFocus);
       mute->setCheckable(true);
       mute->setToolTip(tr("mute"));
       mute->setChecked(t->mute());
@@ -917,7 +921,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
       connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
 
       solo  = new QToolButton();
-      
+      solo->setFocusPolicy(Qt::NoFocus);
       solo->setCheckable(true);
       solo->setChecked(t->solo());
       if(t->internalSolo())
@@ -938,6 +942,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
             }
 
       off  = new MusEGui::TransparentToolButton(this);
+      off->setFocusPolicy(Qt::NoFocus);
       off->setBackgroundRole(QPalette::Mid);
       off->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       off->setCheckable(true);
@@ -960,6 +965,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
 
       if (type != MusECore::Track::AUDIO_AUX) {
             iR = new QToolButton();
+	    iR->setFocusPolicy(Qt::NoFocus);
             ///iR->setFont(MusEGlobal::config.fonts[1]);
             iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
             ///iR->setText(tr("iR"));
@@ -972,6 +978,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
             }
       
       oR = new QToolButton();
+      oR->setFocusPolicy(Qt::NoFocus);
       ///oR->setFont(MusEGlobal::config.fonts[1]);
       oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
       ///oR->setText(tr("oR"));
@@ -987,6 +994,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
       //---------------------------------------------------
 
       autoType = new MusEGui::ComboBox();
+      autoType->setFocusPolicy(Qt::NoFocus);
       ///autoType->setFont(MusEGlobal::config.fonts[1]);
       autoType->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       //autoType->setAutoFillBackground(true);
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index 80663c29..61bd9ba5 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -297,6 +297,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
       //---------------------------------------------------
 
       record  = new MusEGui::TransparentToolButton(this);
+      record->setFocusPolicy(Qt::NoFocus);
       record->setBackgroundRole(QPalette::Mid);
       record->setCheckable(true);
       record->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
@@ -307,6 +308,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
       connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool)));
 
       mute  = new QToolButton();
+      mute->setFocusPolicy(Qt::NoFocus);
       mute->setCheckable(true);
       mute->setToolTip(tr("mute"));
       mute->setChecked(track->mute());
@@ -316,7 +318,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
       connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
 
       solo  = new QToolButton();
-      //solo->setToolTip(tr("pre fader listening"));
+      solo->setFocusPolicy(Qt::NoFocus);
       solo->setToolTip(tr("solo mode"));
       solo->setCheckable(true);
       solo->setChecked(track->solo());
@@ -328,43 +330,8 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
       ///solo->setIconSize(soloIconOn->size());  
       connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
       
-      /*
-      // Changed by Tim. p3.3.21
-      //QToolTip::add(record, tr("record"));
-      //smBox1->addStretch(100);
-      //smBox1->addWidget(record);
-      QLabel* dev_ch_label = new QLabel();
-      ///dev_ch_label->setMinimumWidth(STRIP_WIDTH/2);
-      
-      // Special here: Must make label same size as the 'exit' button would be IF this were an audio strip...
-      // (The 'exit1' icon is BIGGER than the 'record on' icon.)
-      MusEGui::TransparentToolButton* off  = new MusEGui::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());  
-      dev_ch_label->setMinimumHeight(off->height());  
-      delete off;
-      
-      //dev_ch_label->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
-      ///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 = track->outPort();
-      int channel = track->outChannel();
-      QString dcs;
-      dcs.sprintf("%d-%d", port + 1, channel + 1);
-      dev_ch_label->setText(dcs);
-      //dev_ch_label->setBackgroundColor(QColor(0, 160, 255)); // Med blue
-      //dev_ch_label->setFont(MusEGlobal::config.fonts[6]);
-      dev_ch_label->setFont(MusEGlobal::config.fonts[1]);
-      // Dealing with a horizontally constrained label. Ignore vertical. Use a minimum readable point size.
-      //autoAdjustFontSize(dev_ch_label, dev_ch_label->text(), false, true, MusEGlobal::config.fonts[6].pointSize(), 5);
-      QToolTip::add(dev_ch_label, tr("output port and channel"));
-      */
-      
       off  = new MusEGui::TransparentToolButton(this);
+      off->setFocusPolicy(Qt::NoFocus);
       off->setBackgroundRole(QPalette::Mid);
       off->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       off->setCheckable(true);
@@ -384,6 +351,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
       //---------------------------------------------------
 
       iR = new QToolButton();
+      iR->setFocusPolicy(Qt::NoFocus);
       ///iR->setFont(MusEGlobal::config.fonts[1]);
       iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
       ///iR->setText(tr("iR"));
@@ -393,7 +361,9 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
       iR->setToolTip(tr("input routing"));
       grid->addWidget(iR, _curGridRow, 0);
       connect(iR, SIGNAL(pressed()), SLOT(iRoutePressed()));
+      
       oR = new QToolButton();
+      oR->setFocusPolicy(Qt::NoFocus);
       ///oR->setFont(MusEGlobal::config.fonts[1]);
       oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
       ///oR->setText(tr("oR"));
@@ -412,6 +382,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
       //---------------------------------------------------
 
       autoType = new MusEGui::ComboBox();
+      autoType->setFocusPolicy(Qt::NoFocus);
       ///autoType->setFont(MusEGlobal::config.fonts[1]);
       autoType->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       autoType->setEnabled(false);
diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp
index 0ba03beb..3df46dd5 100644
--- a/muse2/muse/mixer/rack.cpp
+++ b/muse2/muse/mixer/rack.cpp
@@ -182,6 +182,7 @@ EffectRack::EffectRack(QWidget* parent, MusECore::AudioTrack* t)
       setSpacing(0);
 
       setAcceptDrops(true);
+      setFocusPolicy(Qt::NoFocus);
       }
 
 void EffectRack::updateContents()
@@ -683,6 +684,8 @@ void EffectRack::initPlugin(MusECore::Xml xml, int idx)
                                   //printf("instantiated!\n");
                                   MusEGlobal::audio->msgAddPlugin(track, idx, plugi);
                                   MusEGlobal::song->update(SC_RACK);
+                                  if (plugi->guiVisible())
+                                    plugi->gui()->setWindowTitle(plugi->titlePrefix() + plugi->name());
                                   return;
                                   }
                               }