diff --git a/data/themes/default/style.css b/data/themes/default/style.css index f7a5acc1441..f78df098284 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -387,6 +387,24 @@ lmms--gui--TrackView > QWidget { } +QPushButton#btn { + color: #d1d8e4; + padding: 2 4; + border: 1 solid #000; + border-radius: 3; + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 20%), stop:0.1 rgba(255, 255, 255, 4%), stop:0.9 rgba(0, 0, 0, 4%), stop:1 rgba(0, 0, 0, 40%)); +} + +QPushButton#btn:hover { + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 25%), stop:0.1 rgba(255, 255, 255, 7%), stop:0.9 rgba(255, 255, 255, 4%), stop:1 rgba(0, 0, 0, 35%)); +} + +QPushButton#btn:pressed, +QPushButton#btn:checked { + color: #02ee89; + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 25%), stop:0.1 transparent, stop:0.9 rgba(0, 0, 0, 15%), stop:1 rgba(0, 0, 0, 35%)); +} + /* autoscroll, loop, stop behaviour toggle buttons */ /* track background config */ diff --git a/plugins/Dispersion/CMakeLists.txt b/plugins/Dispersion/CMakeLists.txt index a40e04b8029..190a4ae86f6 100644 --- a/plugins/Dispersion/CMakeLists.txt +++ b/plugins/Dispersion/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(dispersion Dispersion.cpp DispersionControls.cpp DispersionControlDialog.cpp MOCFILES DispersionControls.h DispersionControlDialog.h EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(dispersion Dispersion.cpp DispersionControls.cpp DispersionControlDialog.cpp MOCFILES DispersionControls.h DispersionControlDialog.h EMBEDDED_RESOURCES logo.svg) diff --git a/plugins/Dispersion/DispersionControlDialog.cpp b/plugins/Dispersion/DispersionControlDialog.cpp index 3a717d7aa89..aacb48290b6 100644 --- a/plugins/Dispersion/DispersionControlDialog.cpp +++ b/plugins/Dispersion/DispersionControlDialog.cpp @@ -24,14 +24,14 @@ #include "DispersionControlDialog.h" -#include "DispersionControls.h" +#include + +#include "AutomatableButton.h" +#include "DispersionControls.h" #include "embed.h" #include "Knob.h" #include "LcdSpinBox.h" -#include "PixmapButton.h" - -#include namespace lmms::gui @@ -42,40 +42,36 @@ DispersionControlDialog::DispersionControlDialog(DispersionControls* controls) : EffectControlDialog(controls) { setAutoFillBackground(true); - QPalette pal; - pal.setBrush(backgroundRole(), PLUGIN_NAME::getIconPixmap("artwork")); - setPalette(pal); - auto layout = new QHBoxLayout(this); + layout->setSpacing(5); - LcdSpinBox * m_amountBox = new LcdSpinBox(3, this, "Amount"); - m_amountBox->setModel(&controls->m_amountModel); - m_amountBox->setLabel(tr("AMOUNT")); - m_amountBox->setToolTip(tr("Number of all-pass filters")); + auto amountBox = new LcdSpinBox(3, this, "Amount"); + amountBox->setModel(&controls->m_amountModel); + amountBox->setLabel(tr("AMOUNT")); + amountBox->setToolTip(tr("Number of all-pass filters")); + layout->addWidget(amountBox); - Knob * freqKnob = new Knob(KnobType::Bright26, tr("FREQ"), this); + auto freqKnob = new Knob(KnobType::Bright26, tr("FREQ"), this); freqKnob->setModel(&controls->m_freqModel); - freqKnob->setHintText(tr("Frequency:") , " Hz"); + freqKnob->setHintText(tr("Frequency:") , tr("Hz")); + layout->addWidget(freqKnob); - Knob * resoKnob = new Knob(KnobType::Bright26, tr("RESO"), this); + auto resoKnob = new Knob(KnobType::Bright26, tr("RESO"), this); resoKnob->setModel(&controls->m_resoModel); - resoKnob->setHintText(tr("Resonance:") , " octaves"); + resoKnob->setHintText(tr("Resonance:") , tr("octaves")); + layout->addWidget(resoKnob); - Knob * feedbackKnob = new Knob(KnobType::Bright26, tr("FEED"), this); + auto feedbackKnob = new Knob(KnobType::Bright26, tr("FEED"), this); feedbackKnob->setModel(&controls->m_feedbackModel); feedbackKnob->setHintText(tr("Feedback:") , ""); + layout->addWidget(feedbackKnob); - PixmapButton * dcButton = new PixmapButton(this, tr("DC Offset Removal")); - dcButton->setActiveGraphic(PLUGIN_NAME::getIconPixmap("dc_active")); - dcButton->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("dc_inactive")); + auto dcButton = new AutomatableButton(this, tr("DC Offset Removal")); dcButton->setCheckable(true); + dcButton->setText(tr("DC")); dcButton->setModel(&controls->m_dcModel); dcButton->setToolTip(tr("Remove DC Offset")); - - layout->addWidget(m_amountBox); - layout->addWidget(freqKnob); - layout->addWidget(resoKnob); - layout->addWidget(feedbackKnob); + dcButton->setObjectName("btn"); layout->addWidget(dcButton); } diff --git a/plugins/Dispersion/artwork.png b/plugins/Dispersion/artwork.png deleted file mode 100644 index 17e3b9a1189..00000000000 Binary files a/plugins/Dispersion/artwork.png and /dev/null differ diff --git a/plugins/Dispersion/dc_active.png b/plugins/Dispersion/dc_active.png deleted file mode 100644 index d9c8c937845..00000000000 Binary files a/plugins/Dispersion/dc_active.png and /dev/null differ diff --git a/plugins/Dispersion/dc_inactive.png b/plugins/Dispersion/dc_inactive.png deleted file mode 100644 index 9a0ee069399..00000000000 Binary files a/plugins/Dispersion/dc_inactive.png and /dev/null differ diff --git a/plugins/Dispersion/logo.png b/plugins/Dispersion/logo.png deleted file mode 100644 index 9340da708dd..00000000000 Binary files a/plugins/Dispersion/logo.png and /dev/null differ diff --git a/plugins/Dispersion/logo.svg b/plugins/Dispersion/logo.svg new file mode 100644 index 00000000000..7920fa6b017 --- /dev/null +++ b/plugins/Dispersion/logo.svg @@ -0,0 +1,3 @@ + + +