From 1fe51e45eebbfc2ac198ed4778c9afdb9eaf2ed0 Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Wed, 21 Dec 2011 17:54:10 +0000 Subject: merged again --- muse2/muse/mixer/amixer.cpp | 2 +- muse2/muse/mixer/astrip.cpp | 32 ++++++++++++++++++++------------ muse2/muse/mixer/mstrip.cpp | 32 ++++++++++++++++++++------------ 3 files changed, 41 insertions(+), 25 deletions(-) (limited to 'muse2/muse/mixer') diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp index 439a92b9..25171450 100644 --- a/muse2/muse/mixer/amixer.cpp +++ b/muse2/muse/mixer/amixer.cpp @@ -538,7 +538,7 @@ void AudioMixerApp::updateMixer(UpdateAction action) void AudioMixerApp::configChanged() { - songChanged(SC_CONFIG); + songChanged(-1); // Catch when fonts change, do full rebuild. } //--------------------------------------------------------- diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 9c393a1a..ecb2f507 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -895,7 +895,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at) 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()); + ///record->setIconSize(record_on_Icon->size()); connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool))); } @@ -906,7 +906,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at) mute->setToolTip(tr("mute")); mute->setChecked(t->mute()); mute->setIcon(t->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn)); - mute->setIconSize(muteIconOn->size()); + ///mute->setIconSize(muteIconOn->size()); mute->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool))); @@ -918,7 +918,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at) solo->setIcon(t->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff)); else solo->setIcon(t->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff)); - solo->setIconSize(soloIconOn->size()); + ///solo->setIconSize(soloIconOn->size()); solo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool))); if (type == MusECore::Track::AUDIO_OUTPUT) { @@ -938,7 +938,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at) off->setToolTip(tr("off")); off->setChecked(t->off()); off->setIcon(t->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon)); - off->setIconSize(exit1Icon->size()); + ///off->setIconSize(exit1Icon->size()); connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool))); grid->addWidget(off, _curGridRow, 0); @@ -955,8 +955,10 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at) if (type != MusECore::Track::AUDIO_AUX) { iR = new QToolButton(); iR->setFont(MusEGlobal::config.fonts[1]); - iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - iR->setText(tr("iR")); + iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum)); + ///iR->setText(tr("iR")); + iR->setIcon(QIcon(*routesInIcon)); + iR->setIconSize(routesInIcon->size()); iR->setCheckable(false); iR->setToolTip(tr("input routing")); grid->addWidget(iR, _curGridRow, 0); @@ -965,8 +967,10 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at) oR = new QToolButton(); oR->setFont(MusEGlobal::config.fonts[1]); - oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - oR->setText(tr("oR")); + oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum)); + ///oR->setText(tr("oR")); + oR->setIcon(QIcon(*routesOutIcon)); + oR->setIconSize(routesOutIcon->size()); oR->setCheckable(false); oR->setToolTip(tr("output routing")); grid->addWidget(oR, _curGridRow++, 1); @@ -1045,9 +1049,11 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at) void AudioStrip::iRoutePressed() { - MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); - iR->setDown(false); + //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); + RoutePopupMenu* pup = new RoutePopupMenu(); pup->exec(QCursor::pos(), track, false); + delete pup; + iR->setDown(false); } //--------------------------------------------------------- @@ -1056,9 +1062,11 @@ void AudioStrip::iRoutePressed() void AudioStrip::oRoutePressed() { - MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); - oR->setDown(false); + //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); + RoutePopupMenu* pup = new RoutePopupMenu(); pup->exec(QCursor::pos(), track, true); + delete pup; + oR->setDown(false); } } // namespace MusEGui diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp index dc495aa6..031eaa4b 100644 --- a/muse2/muse/mixer/mstrip.cpp +++ b/muse2/muse/mixer/mstrip.cpp @@ -300,7 +300,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t) 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()); + ///record->setIconSize(record_on_Icon->size()); connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool))); mute = new QToolButton(); @@ -308,7 +308,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t) mute->setToolTip(tr("mute")); mute->setChecked(track->mute()); mute->setIcon(track->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn)); - mute->setIconSize(muteIconOn->size()); + ///mute->setIconSize(muteIconOn->size()); mute->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool))); @@ -322,7 +322,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t) solo->setIcon(track->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff)); else solo->setIcon(track->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff)); - solo->setIconSize(soloIconOn->size()); + ///solo->setIconSize(soloIconOn->size()); connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool))); /* @@ -368,7 +368,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t) off->setToolTip(tr("off")); off->setChecked(track->off()); off->setIcon(track->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon)); - off->setIconSize(exit1Icon->size()); + ///off->setIconSize(exit1Icon->size()); connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool))); grid->addWidget(off, _curGridRow, 0); @@ -382,16 +382,20 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t) iR = new QToolButton(); iR->setFont(MusEGlobal::config.fonts[1]); - iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - iR->setText(tr("iR")); + iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum)); + ///iR->setText(tr("iR")); + iR->setIcon(QIcon(*routesMidiInIcon)); + iR->setIconSize(routesMidiInIcon->size()); iR->setCheckable(false); iR->setToolTip(tr("input routing")); grid->addWidget(iR, _curGridRow, 0); connect(iR, SIGNAL(pressed()), SLOT(iRoutePressed())); oR = new QToolButton(); oR->setFont(MusEGlobal::config.fonts[1]); - oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - oR->setText(tr("oR")); + oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum)); + ///oR->setText(tr("oR")); + oR->setIcon(QIcon(*routesMidiOutIcon)); + oR->setIconSize(routesMidiOutIcon->size()); oR->setCheckable(false); // TODO: Works OK, but disabled for now, until we figure out what to do about multiple out routes and display values... // Enabled (for Midi Port to Audio Input routing). p4.0.14 Tim. @@ -994,9 +998,11 @@ void MidiStrip::setReverbSend(double val) void MidiStrip::iRoutePressed() { - MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); - iR->setDown(false); + //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); + RoutePopupMenu* pup = new RoutePopupMenu(); pup->exec(QCursor::pos(), track, false); + delete pup; + iR->setDown(false); } //--------------------------------------------------------- @@ -1005,9 +1011,11 @@ void MidiStrip::iRoutePressed() void MidiStrip::oRoutePressed() { - MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); - oR->setDown(false); + //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu(); + RoutePopupMenu* pup = new RoutePopupMenu(); pup->exec(QCursor::pos(), track, true); + delete pup; + oR->setDown(false); } } // namespace MusEGui -- cgit v1.2.3