From f6937d12c041db1345555d2630eadb7272bbb9f2 Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Wed, 10 Nov 2010 06:43:16 +0000
Subject: Fixed solo button icons.
---
muse2/muse/icons.cpp | 8 ++++----
muse2/muse/mixer/astrip.cpp | 8 ++++++--
muse2/muse/mixer/mstrip.cpp | 4 ++++
3 files changed, 14 insertions(+), 6 deletions(-)
(limited to 'muse2')
diff --git a/muse2/muse/icons.cpp b/muse2/muse/icons.cpp
index 592ddcbd..57c76cac 100644
--- a/muse2/muse/icons.cpp
+++ b/muse2/muse/icons.cpp
@@ -514,10 +514,10 @@ void initIcons()
soloblksqIconOff = new QPixmap(solobutton_off_blksq_xpm);
soloIconSet1 = new QIcon();
soloIconSet2 = new QIcon();
- soloIconSet1->setPixmap(*soloIconOn, QIcon::Automatic, QIcon::Normal, QIcon::On);
- soloIconSet1->setPixmap(*soloIconOff, QIcon::Automatic, QIcon::Normal, QIcon::Off);
- soloIconSet2->setPixmap(*soloblksqIconOn, QIcon::Automatic, QIcon::Normal, QIcon::On);
- soloIconSet2->setPixmap(*soloblksqIconOff, QIcon::Automatic, QIcon::Normal, QIcon::Off);
+ soloIconSet1->addPixmap(*soloIconOn, QIcon::Normal, QIcon::On);
+ soloIconSet1->addPixmap(*soloIconOff, QIcon::Normal, QIcon::Off);
+ soloIconSet2->addPixmap(*soloblksqIconOn, QIcon::Normal, QIcon::On);
+ soloIconSet2->addPixmap(*soloblksqIconOff, QIcon::Normal, QIcon::Off);
redLedIcon = new QPixmap(redled_xpm);
darkRedLedIcon = new QPixmap(darkredled_xpm);
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index c98f72fa..7ede1a2e 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -175,13 +175,15 @@ void AudioStrip::songChanged(int val)
{
if(!useSoloIconSet2)
{
- solo->setIconSet(*soloIconSet2);
+ solo->setIcon(*soloIconSet2);
+ solo->setIconSize(soloIconOn->size());
useSoloIconSet2 = true;
}
}
else if(useSoloIconSet2)
{
- solo->setIconSet(*soloIconSet1);
+ solo->setIcon(*soloIconSet1);
+ solo->setIconSize(soloblksqIconOn->size());
useSoloIconSet2 = false;
}
@@ -839,11 +841,13 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
if((bool)t->internalSolo())
{
solo->setIcon(*soloIconSet2);
+ solo->setIconSize(soloIconOn->size());
useSoloIconSet2 = true;
}
else
{
solo->setIcon(*soloIconSet1);
+ solo->setIconSize(soloblksqIconOn->size());
useSoloIconSet2 = false;
}
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index f6e3a26e..cf232965 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -307,11 +307,13 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
if((bool)t->internalSolo())
{
solo->setIcon(*soloIconSet2);
+ solo->setIconSize(soloIconOn->size());
useSoloIconSet2 = true;
}
else
{
solo->setIcon(*soloIconSet1);
+ solo->setIconSize(soloblksqIconOn->size());
useSoloIconSet2 = false;
}
@@ -479,12 +481,14 @@ void MidiStrip::songChanged(int val)
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);
--
cgit v1.2.3