From 17215343e40e68854d6a5b150ed29248f8111b51 Mon Sep 17 00:00:00 2001 From: Fawn Date: Sat, 5 Apr 2025 20:45:40 -0600 Subject: [PATCH] Upgrade Stereo Matrix plugin assets to SVG (#7803) Upgrade Stereo Matrix plugin assets to SVG * Use QHBoxLayout for StereoMatrix --- plugins/StereoMatrix/CMakeLists.txt | 2 +- .../StereoMatrixControlDialog.cpp | 51 ++++++++---------- plugins/StereoMatrix/artwork.png | Bin 5071 -> 0 bytes plugins/StereoMatrix/artwork.svg | 29 ++++++++++ plugins/StereoMatrix/logo.png | Bin 774 -> 0 bytes plugins/StereoMatrix/logo.svg | 3 ++ 6 files changed, 55 insertions(+), 30 deletions(-) delete mode 100644 plugins/StereoMatrix/artwork.png create mode 100644 plugins/StereoMatrix/artwork.svg delete mode 100644 plugins/StereoMatrix/logo.png create mode 100644 plugins/StereoMatrix/logo.svg diff --git a/plugins/StereoMatrix/CMakeLists.txt b/plugins/StereoMatrix/CMakeLists.txt index 4e6de02ca..2990f8ec8 100644 --- a/plugins/StereoMatrix/CMakeLists.txt +++ b/plugins/StereoMatrix/CMakeLists.txt @@ -1,4 +1,4 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(stereomatrix StereoMatrix.cpp StereoMatrixControls.cpp StereoMatrixControlDialog.cpp StereoMatrix.h StereoMatrixControls.h StereoMatrixControlDialog.h MOCFILES StereoMatrixControls.h StereoMatrixControlDialog.h EMBEDDED_RESOURCES artwork.png logo.png) +BUILD_PLUGIN(stereomatrix StereoMatrix.cpp StereoMatrixControls.cpp StereoMatrixControlDialog.cpp StereoMatrix.h StereoMatrixControls.h StereoMatrixControlDialog.h MOCFILES StereoMatrixControls.h StereoMatrixControlDialog.h EMBEDDED_RESOURCES artwork.svg logo.svg) diff --git a/plugins/StereoMatrix/StereoMatrixControlDialog.cpp b/plugins/StereoMatrix/StereoMatrixControlDialog.cpp index da9a3aa9e..1530a0d25 100644 --- a/plugins/StereoMatrix/StereoMatrixControlDialog.cpp +++ b/plugins/StereoMatrix/StereoMatrixControlDialog.cpp @@ -23,10 +23,9 @@ */ - - #include "StereoMatrixControlDialog.h" +#include #include "embed.h" #include "Knob.h" #include "StereoMatrixControls.h" @@ -35,38 +34,32 @@ namespace lmms::gui { -StereoMatrixControlDialog::StereoMatrixControlDialog( - StereoMatrixControls * _controls ) : - EffectControlDialog( _controls ) +StereoMatrixControlDialog::StereoMatrixControlDialog(StereoMatrixControls* controls) : + EffectControlDialog(controls) { - - setFixedSize( 160, 185 ); - - setAutoFillBackground( true ); QPalette pal; - pal.setBrush( backgroundRole(), - PLUGIN_NAME::getIconPixmap( "artwork" ) ); - setPalette( pal ); + setAutoFillBackground(true); + setFixedSize(160, 185); + pal.setBrush(backgroundRole(), PLUGIN_NAME::getIconPixmap("artwork")); + setPalette(pal); - auto llKnob = new Knob(KnobType::Bright26, this); - llKnob->setModel( &_controls->m_llModel ); - llKnob->setHintText( tr( "Left to Left Vol:" ) , "" ); - llKnob->move( 10, 79 ); + auto layout = new QHBoxLayout(this); - auto lrKnob = new Knob(KnobType::Bright26, this); - lrKnob->setModel( &_controls->m_lrModel ); - lrKnob->setHintText( tr( "Left to Right Vol:" ) , "" ); - lrKnob->move( 48, 79 ); + const auto makeKnob = [this, layout]( + FloatModel *model, + const QString &txt_before + ) { + auto k = new Knob(KnobType::Bright26, this); + k->setModel(model); + k->setHintText(txt_before, ""); + layout->addWidget(k, 0, Qt::AlignHCenter); + return k; + }; - auto rlKnob = new Knob(KnobType::Bright26, this); - rlKnob->setModel( &_controls->m_rlModel ); - rlKnob->setHintText( tr( "Right to Left Vol:" ) , "" ); - rlKnob->move( 85, 79 ); - - auto rrKnob = new Knob(KnobType::Bright26, this); - rrKnob->setModel( &_controls->m_rrModel ); - rrKnob->setHintText( tr( "Right to Right Vol:" ) , "" ); - rrKnob->move( 123, 79 ); + makeKnob(&controls->m_llModel, tr("Left to Left Vol:")); + makeKnob(&controls->m_lrModel, tr("Left to Right Vol:")); + makeKnob(&controls->m_rlModel, tr("Right to Left Vol:")); + makeKnob(&controls->m_rrModel, tr("Right to Right Vol:")); } diff --git a/plugins/StereoMatrix/artwork.png b/plugins/StereoMatrix/artwork.png deleted file mode 100644 index f76567fd2c913e8bad12848008abf2a7eb6f37ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5071 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 VKv>;L7B`^-bTsrKHR?8q{{iI8yo~?= diff --git a/plugins/StereoMatrix/artwork.svg b/plugins/StereoMatrix/artwork.svg new file mode 100644 index 000000000..b54fa8530 --- /dev/null +++ b/plugins/StereoMatrix/artwork.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/StereoMatrix/logo.png b/plugins/StereoMatrix/logo.png deleted file mode 100644 index 9340da708dd79ed97111eb535f51b81a91d6a15b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 774 zcmV+h1Nr=kP)7WEc)VQ)zLm`B#lSD% z0Wg;#IH?7|3b0p&fj_`2;A{cm@zx+(Ge?s$@EN$6LtMjg>;+(boCbaXw;ja=b6mQ?gRp67Yf18(18niCN0v&eY^{Cr&#;#IcF{ks?!* z&o!_q>9xbSw`QytRI!M?zP_o#K-8ExJaV?vi znPt?~0KhTu23U+Gy8^Tw;^SzWSet9n + +