hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update mute and solo buttons, add them to instrument windows (#7708)

Browse Source 
* Add mute and solo buttons to instrument windows
* Change mute and solo buttons to optimized CC0 SVG assets
* Icons provided by @StakeoutPunch, button backgrounds provided by
@RebeccaDeField

---------

Co-authored-by: Sotonye Atemie <sakertooth@gmail.com>
Co-authored-by: Rebecca Noel Ati <contactme@rebeccadefield.com>
Co-authored-by: Stakeout Punch <StakeoutPunch@users.noreply.github.com>
This commit is contained in:
Fawn
2025-03-11 12:30:04 -06:00
committed by GitHub
parent 8821d88c09
commit 6233c5b9e4
13 changed files with 242 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/MixerChannelView.cpp
View File

@@ -109,21 +109,21 @@ MixerChannelView::MixerChannelView(QWidget* parent, MixerView* mixerView, int ch
m_muteButton = new PixmapButton(this, tr("Mute"));
m_muteButton->setModel(&mixerChannel->m_muteModel);
m_muteButton->setActiveGraphic(embed::getIconPixmap("led_off"));
m_muteButton->setInactiveGraphic(embed::getIconPixmap("led_green"));
m_muteButton->setActiveGraphic(embed::getIconPixmap("mute_active"));
m_muteButton->setInactiveGraphic(embed::getIconPixmap("mute_inactive"));
m_muteButton->setCheckable(true);
m_muteButton->setToolTip(tr("Mute this channel"));
m_soloButton = new PixmapButton(this, tr("Solo"));
m_soloButton->setModel(&mixerChannel->m_soloModel);
m_soloButton->setActiveGraphic(embed::getIconPixmap("led_red"));
m_soloButton->setInactiveGraphic(embed::getIconPixmap("led_off"));
m_soloButton->setActiveGraphic(embed::getIconPixmap("solo_active"));
m_soloButton->setInactiveGraphic(embed::getIconPixmap("solo_inactive"));
m_soloButton->setCheckable(true);
m_soloButton->setToolTip(tr("Solo this channel"));
auto soloMuteLayout = new QVBoxLayout();
soloMuteLayout->setContentsMargins(0, 0, 0, 0);
soloMuteLayout->setSpacing(0);
soloMuteLayout->setContentsMargins(0, 2, 0, 2);
soloMuteLayout->setSpacing(2);
soloMuteLayout->addWidget(m_soloButton, 0, Qt::AlignHCenter);
soloMuteLayout->addWidget(m_muteButton, 0, Qt::AlignHCenter);

41
src/gui/SampleTrackWindow.cpp
View File

@@ -32,6 +32,7 @@
#include <QVBoxLayout>
#include "EffectRackView.h"
#include "PixmapButton.h"
#include "embed.h"
#include "GuiApplication.h"
#include "Knob.h"
@@ -95,46 +96,66 @@ SampleTrackWindow::SampleTrackWindow(SampleTrackView * tv) :
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, 2, 0);
soloMuteLayout->setSpacing(2);
m_muteBtn = new PixmapButton(this, tr("Mute"));
m_muteBtn->setModel(&m_track->m_mutedModel);
m_muteBtn->setActiveGraphic(embed::getIconPixmap("mute_active"));
m_muteBtn->setInactiveGraphic(embed::getIconPixmap("mute_inactive"));
m_muteBtn->setCheckable(true);
m_muteBtn->setToolTip(tr("Mute this sample track"));
soloMuteLayout->addWidget(m_muteBtn, 0, widgetAlignment);
m_soloBtn = new PixmapButton(this, tr("Solo"));
m_soloBtn->setModel(&m_track->m_soloModel);
m_soloBtn->setActiveGraphic(embed::getIconPixmap("solo_active"));
m_soloBtn->setInactiveGraphic(embed::getIconPixmap("solo_inactive"));
m_soloBtn->setCheckable(true);
m_soloBtn->setToolTip(tr("Solo this sample track"));
soloMuteLayout->addWidget(m_soloBtn, 0, widgetAlignment);
basicControlsLayout->addLayout(soloMuteLayout, 0, 0, 2, 1, widgetAlignment);
// set up volume knob
m_volumeKnob = new Knob(KnobType::Bright26, nullptr, tr("Sample 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->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);
// setup spinbox for selecting Mixer-channel
m_mixerChannelNumber = new MixerChannelLcdSpinBox(2, nullptr, tr("Mixer channel"), m_stv);
basicControlsLayout->addWidget(m_mixerChannelNumber, 0, 3);
basicControlsLayout->addWidget(m_mixerChannelNumber, 0, 4);
basicControlsLayout->setAlignment(m_mixerChannelNumber, widgetAlignment);
label = new QLabel(tr("CHANNEL"), this);
label = new QLabel(tr("CHAN"), this);
label->setStyleSheet(labelStyleSheet);
basicControlsLayout->addWidget(label, 1, 3);
basicControlsLayout->addWidget(label, 1, 4);
basicControlsLayout->setAlignment(label, labelAlignment);
generalSettingsLayout->addLayout(basicControlsLayout);

62
src/gui/instrument/InstrumentTrackWindow.cpp
View File

@@ -139,74 +139,90 @@ 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, 2, 0);
soloMuteLayout->setSpacing(2);
m_muteBtn = new PixmapButton(this, tr("Mute"));
m_muteBtn->setModel(&m_track->m_mutedModel);
m_muteBtn->setActiveGraphic(embed::getIconPixmap("mute_active"));
m_muteBtn->setInactiveGraphic(embed::getIconPixmap("mute_inactive"));
m_muteBtn->setCheckable(true);
m_muteBtn->setToolTip(tr("Mute this instrument"));
soloMuteLayout->addWidget(m_muteBtn, 0, widgetAlignment);
m_soloBtn = new PixmapButton(this, tr("Solo"));
m_soloBtn->setModel(&m_track->m_soloModel);
m_soloBtn->setActiveGraphic(embed::getIconPixmap("solo_active"));
m_soloBtn->setInactiveGraphic(embed::getIconPixmap("solo_inactive"));
m_soloBtn->setCheckable(true);
m_soloBtn->setToolTip(tr("Solo this instrument"));
soloMuteLayout->addWidget(m_soloBtn, 0, widgetAlignment);
basicControlsLayout->addLayout(soloMuteLayout, 0, 0, 2, 1, widgetAlignment);
// 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->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());
@@ -216,11 +232,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 );

33
src/gui/tracks/TrackOperationsWidget.cpp
View File

@@ -84,7 +84,7 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
auto operationsWidget = new QWidget(this);
auto operationsLayout = new QHBoxLayout(operationsWidget);
operationsLayout->setContentsMargins(0, 0, 0, 0);
operationsLayout->setSpacing(0);
operationsLayout->setSpacing(2);
m_trackOps = new QPushButton(operationsWidget);
m_trackOps->setFocusPolicy( Qt::NoFocus );
@@ -124,33 +124,14 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) :
return wrapperWidget;
};
auto muteWidget = buildPixmapButtonWrappedInWidget(operationsWidget, tr("Mute"), "led_off", "led_green", m_muteBtn);
auto soloWidget = buildPixmapButtonWrappedInWidget(operationsWidget, tr("Solo"), "led_red", "led_off", m_soloBtn);
auto muteWidget = buildPixmapButtonWrappedInWidget(operationsWidget, tr("Mute"), "mute_active", "mute_inactive", m_muteBtn);
auto soloWidget = buildPixmapButtonWrappedInWidget(operationsWidget, tr("Solo"), "solo_active", "solo_inactive", m_soloBtn);
operationsLayout->addWidget(m_trackOps, Qt::AlignCenter);
operationsLayout->addSpacing(5);
operationsLayout->addWidget(m_trackOps);
operationsLayout->addWidget(muteWidget);
operationsLayout->addWidget(soloWidget);
if( ConfigManager::inst()->value( "ui",
"compacttrackbuttons" ).toInt() )
{
auto vlayout = new QVBoxLayout();
vlayout->setContentsMargins(0, 0, 0, 0);
vlayout->setSpacing(0);
vlayout->addStretch(1);
vlayout->addWidget(muteWidget);
vlayout->addWidget(soloWidget);
vlayout->addStretch(1);
operationsLayout->addLayout(vlayout);
}
else
{
operationsLayout->addWidget(muteWidget, Qt::AlignCenter);
operationsLayout->addWidget(soloWidget, Qt::AlignCenter);
}
operationsLayout->addStretch(1);
layout->addWidget(operationsWidget, 0, Qt::AlignTop);
layout->addWidget(operationsWidget, 0, Qt::AlignCenter | Qt::AlignLeading);
connect( this, SIGNAL(trackRemovalScheduled(lmms::gui::TrackView*)),
m_trackView->trackContainerView(),