diff options
| -rw-r--r-- | muse2/muse/mixer/astrip.cpp | 30 | ||||
| -rw-r--r-- | muse2/muse/mixer/astrip.h | 4 | ||||
| -rw-r--r-- | muse2/muse/mixer/strip.cpp | 8 |
3 files changed, 24 insertions, 18 deletions
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 12aefef0..a0d793ee 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -707,31 +707,32 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at) //--------------------------------------------------- QHBoxLayout* ppBox = new QHBoxLayout(0); - stereo = new QToolButton(this); + + stereo = new QToolButton(); stereo->setFont(config.fonts[1]); QIcon stereoSet; - stereoSet.setPixmap(*monoIcon, QIcon::Automatic, QIcon::Normal, QIcon::Off); - stereoSet.setPixmap(*stereoIcon, QIcon::Automatic, QIcon::Normal, QIcon::On); - stereo->setIconSet(stereoSet); + stereoSet.addPixmap(*monoIcon, QIcon::Normal, QIcon::Off); + stereoSet.addPixmap(*stereoIcon, QIcon::Normal, QIcon::On); + stereo->setIcon(stereoSet); - stereo->setToggleButton(true); - QToolTip::add(stereo, tr("1/2 channel")); - stereo->setOn(channel == 2); + stereo->setCheckable(true); + stereo->setToolTip(tr("1/2 channel")); + stereo->setChecked(channel == 2); stereo->setFixedWidth(STRIP_WIDTH/2); - connect(stereo, SIGNAL(toggled(bool)), SLOT(stereoToggled(bool))); + connect(stereo, SIGNAL(clicked(bool)), SLOT(stereoToggled(bool))); // disable mono/stereo for Synthesizer-Plugins if (t->type() == Track::AUDIO_SOFTSYNTH) stereo->setEnabled(false); - pre = new QToolButton(this); + pre = new QToolButton(); pre->setFont(config.fonts[1]); - pre->setToggleButton(true); + pre->setCheckable(true); pre->setText(tr("Pre")); - QToolTip::add(pre, tr("pre fader - post fader")); - pre->setOn(t->prefader()); + pre->setToolTip(tr("pre fader - post fader")); + pre->setChecked(t->prefader()); pre->setFixedWidth(STRIP_WIDTH/2); - connect(pre, SIGNAL(toggled(bool)), SLOT(preToggled(bool))); + connect(pre, SIGNAL(clicked(bool)), SLOT(preToggled(bool))); ppBox->addWidget(stereo); ppBox->addWidget(pre); @@ -762,7 +763,8 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at) // slider, label, meter //--------------------------------------------------- - sliderGrid = new QGridLayout(this); // ddskrjo this + //sliderGrid = new QGridLayout(this); // ddskrjo this + sliderGrid = new QGridLayout(); // ddskrjo this sliderGrid->setRowStretch(0, 100); //slider = new Slider(this); diff --git a/muse2/muse/mixer/astrip.h b/muse2/muse/mixer/astrip.h index bd3a1fa8..b5a8612f 100644 --- a/muse2/muse/mixer/astrip.h +++ b/muse2/muse/mixer/astrip.h @@ -16,9 +16,9 @@ class Slider; class Knob; -class QDialog; +//class QDialog; class QToolButton; -class QAction; +//class QAction; //class QPopupMenu; class PopupMenu; class QButton; diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp index 99347862..7bd564b7 100644 --- a/muse2/muse/mixer/strip.cpp +++ b/muse2/muse/mixer/strip.cpp @@ -162,7 +162,7 @@ Strip::Strip(QWidget* parent, Track* t) iR = 0; oR = 0; - setBackgroundMode(Qt::PaletteMid); + setBackgroundRole(QPalette::Mid); setFrameStyle(Panel | Raised); setLineWidth(2); useSoloIconSet2 = false; @@ -171,8 +171,10 @@ Strip::Strip(QWidget* parent, Track* t) meter[0] = 0; meter[1] = 0; setFixedWidth(STRIP_WIDTH); - layout = new QVBoxLayout(this); + //layout = new QVBoxLayout(this); + layout = new QVBoxLayout(); layout->setMargin(3); + setLayout(layout); //--------------------------------------------- // label @@ -202,6 +204,8 @@ Strip::Strip(QWidget* parent, Track* t) label->setAlignment(Qt::AlignCenter | Qt::TextWordWrap); label->setWordWrap(true); label->setAutoFillBackground(true); + label->setLineWidth(2); + label->setFrameStyle(Sunken | StyledPanel); //label->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum)); label->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum)); |