Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mute and solo buttons to instrument windows #7708

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add mute and solo buttons to instrument windows #7708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91b747d
Add mute and solo buttons to instrument windows
rubiefawn Feb 13, 2025
809404d
Give the mute and solo buttons their own label
rubiefawn Feb 14, 2025
036b90b
Delete stray whitespace
rubiefawn Feb 14, 2025
bc5de06
Change label to "M&S"
rubiefawn Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/InstrumentTrackWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <QWidget>

#include "ModelView.h"
#include "PixmapButton.h"
#include "SerializingObject.h"
#include "PluginView.h"

Expand Down Expand Up @@ -147,6 +148,8 @@ protected slots:
Knob * m_volumeKnob;
Knob * m_panningKnob;
Knob * m_pitchKnob;
PixmapButton *m_muteBtn;
PixmapButton *m_soloBtn;
QLabel * m_pitchLabel;
LcdSpinBox* m_pitchRangeSpinBox;
QLabel * m_pitchRangeLabel;
Expand Down
2 changes: 1 addition & 1 deletion include/Track.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ public slots:

protected:
BoolModel m_mutedModel;
BoolModel m_soloModel;

private:
BoolModel m_soloModel;
bool m_mutedBeforeSolo;

clipVector m_clips;
Expand Down
69 changes: 45 additions & 24 deletions src/gui/instrument/InstrumentTrackWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,74 +139,95 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
QString labelStyleSheet = "font-size: 10px;";
Qt::Alignment labelAlignment = Qt::AlignHCenter | Qt::AlignTop;
Qt::Alignment widgetAlignment = Qt::AlignHCenter | Qt::AlignCenter;

auto soloMuteLayout = new QVBoxLayout();
soloMuteLayout->setContentsMargins(0, 0, 0, 0);
soloMuteLayout->setSpacing(0);

m_muteBtn = new PixmapButton(this, tr("Mute"));
m_muteBtn->setModel(&m_track->m_mutedModel);
m_muteBtn->setActiveGraphic(embed::getIconPixmap("led_off"));
m_muteBtn->setInactiveGraphic(embed::getIconPixmap("led_green"));
m_muteBtn->setCheckable(true);
m_muteBtn->setToolTip(tr("Mute this instrument"));
soloMuteLayout->addWidget(m_muteBtn, 0, Qt::AlignHCenter);

m_soloBtn = new PixmapButton(this, tr("Solo"));
m_soloBtn->setModel(&m_track->m_soloModel);
m_soloBtn->setActiveGraphic(embed::getIconPixmap("led_red"));
m_soloBtn->setInactiveGraphic(embed::getIconPixmap("led_off"));
m_soloBtn->setCheckable(true);
m_soloBtn->setToolTip(tr("Solo this instrument"));
soloMuteLayout->addWidget(m_soloBtn, 0, Qt::AlignHCenter);

basicControlsLayout->addLayout(soloMuteLayout, 0, 0);

auto label = new QLabel(tr("M&S"), this);
label->setStyleSheet(labelStyleSheet);
basicControlsLayout->addWidget(label, 1, 0);
basicControlsLayout->setAlignment(label, labelAlignment);

// set up volume knob
m_volumeKnob = new Knob( KnobType::Bright26, nullptr, tr( "Volume" ) );
m_volumeKnob->setVolumeKnob( true );
m_volumeKnob->setHintText( tr( "Volume:" ), "%" );

basicControlsLayout->addWidget( m_volumeKnob, 0, 0 );
basicControlsLayout->addWidget(m_volumeKnob, 0, 1);
basicControlsLayout->setAlignment( m_volumeKnob, widgetAlignment );

auto label = new QLabel(tr("VOL"), this);
label->setStyleSheet( labelStyleSheet );
basicControlsLayout->addWidget( label, 1, 0);
basicControlsLayout->setAlignment( label, labelAlignment );

label = new QLabel(tr("VOL"), this);
label->setStyleSheet(labelStyleSheet);
basicControlsLayout->addWidget(label, 1, 1);
basicControlsLayout->setAlignment(label, labelAlignment);

// set up panning knob
m_panningKnob = new Knob( KnobType::Bright26, nullptr, tr( "Panning" ) );
m_panningKnob->setHintText( tr( "Panning:" ), "" );

basicControlsLayout->addWidget( m_panningKnob, 0, 1 );
basicControlsLayout->addWidget(m_panningKnob, 0, 2);
basicControlsLayout->setAlignment( m_panningKnob, widgetAlignment );

label = new QLabel( tr( "PAN" ), this );
label->setStyleSheet( labelStyleSheet );
basicControlsLayout->addWidget( label, 1, 1);
basicControlsLayout->addWidget(label, 1, 2);
basicControlsLayout->setAlignment( label, labelAlignment );


basicControlsLayout->setColumnStretch(2, 1);

basicControlsLayout->setColumnStretch(3, 1);

// set up pitch knob
m_pitchKnob = new Knob( KnobType::Bright26, nullptr, tr( "Pitch" ) );
m_pitchKnob->setHintText( tr( "Pitch:" ), " " + tr( "cents" ) );

basicControlsLayout->addWidget( m_pitchKnob, 0, 3 );
basicControlsLayout->addWidget(m_pitchKnob, 0, 4);
basicControlsLayout->setAlignment( m_pitchKnob, widgetAlignment );

m_pitchLabel = new QLabel( tr( "PITCH" ), this );
m_pitchLabel->setStyleSheet( labelStyleSheet );
basicControlsLayout->addWidget( m_pitchLabel, 1, 3);
basicControlsLayout->addWidget(m_pitchLabel, 1, 4);
basicControlsLayout->setAlignment( m_pitchLabel, labelAlignment );


// set up pitch range knob
m_pitchRangeSpinBox= new LcdSpinBox( 2, nullptr, tr( "Pitch range (semitones)" ) );

basicControlsLayout->addWidget( m_pitchRangeSpinBox, 0, 4 );
basicControlsLayout->addWidget(m_pitchRangeSpinBox, 0, 5);
basicControlsLayout->setAlignment( m_pitchRangeSpinBox, widgetAlignment );

m_pitchRangeLabel = new QLabel( tr( "RANGE" ), this );
m_pitchRangeLabel->setStyleSheet( labelStyleSheet );
basicControlsLayout->addWidget( m_pitchRangeLabel, 1, 4);
basicControlsLayout->addWidget(m_pitchRangeLabel, 1, 5);
basicControlsLayout->setAlignment( m_pitchRangeLabel, labelAlignment );


basicControlsLayout->setColumnStretch(5, 1);

basicControlsLayout->setColumnStretch(6, 1);

// setup spinbox for selecting Mixer-channel
m_mixerChannelNumber = new MixerChannelLcdSpinBox(2, nullptr, tr("Mixer channel"), m_itv);

basicControlsLayout->addWidget( m_mixerChannelNumber, 0, 6 );
basicControlsLayout->addWidget(m_mixerChannelNumber, 0, 7);
basicControlsLayout->setAlignment( m_mixerChannelNumber, widgetAlignment );

label = new QLabel( tr( "CHANNEL" ), this );
label = new QLabel(tr("CHAN"), this);
label->setStyleSheet( labelStyleSheet );
basicControlsLayout->addWidget( label, 1, 6);
basicControlsLayout->addWidget(label, 1, 7);
basicControlsLayout->setAlignment( label, labelAlignment );

auto saveSettingsBtn = new QPushButton(embed::getIconPixmap("project_save"), QString());
Expand All @@ -216,11 +237,11 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :

saveSettingsBtn->setToolTip(tr("Save current instrument track settings in a preset file"));

basicControlsLayout->addWidget( saveSettingsBtn, 0, 7 );
basicControlsLayout->addWidget(saveSettingsBtn, 0, 8);

label = new QLabel( tr( "SAVE" ), this );
label->setStyleSheet( labelStyleSheet );
basicControlsLayout->addWidget( label, 1, 7);
basicControlsLayout->addWidget(label, 1, 8);
basicControlsLayout->setAlignment( label, labelAlignment );

generalSettingsLayout->addLayout( basicControlsLayout );
Expand Down
Loading