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.

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

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
3 changes: 1 addition & 2 deletions data/themes/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
INCLUDE(InstallHelpers)

INSTALL_DATA_SUBDIRS("themes" "*.png;*.css")

INSTALL_DATA_SUBDIRS("themes" "*.png;*.svg;*.css")
88 changes: 88 additions & 0 deletions data/themes/default/mute_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 89 additions & 0 deletions data/themes/default/mute_inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions data/themes/default/solo_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions data/themes/default/solo_inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions include/InstrumentTrackWindow.h
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
3 changes: 3 additions & 0 deletions include/SampleTrackWindow.h
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 "SampleTrack.h"
#include "SerializingObject.h"

Expand Down Expand Up @@ -90,6 +91,8 @@ public slots:
QLineEdit * m_nameLineEdit;
Knob * m_volumeKnob;
Knob * m_panningKnob;
PixmapButton *m_muteBtn;
PixmapButton *m_soloBtn;
MixerChannelLcdSpinBox * m_mixerChannelNumber;

EffectRackView * m_effectRack;
Expand Down
Loading
Loading