Add pin connector button for all instruments

- Add pin connector action to `TrackOperationsWidget`'s menu. The button is disabled for instruments that don't support the pin connector. - Revert all changes to `ManageVestigeInstrumentView` - Minor changes to how the pin connector view is instantiated and closed
messmerd · Jan 31, 2025 · 15b15cf · 15b15cf
1 parent b96b2f9
commit 15b15cf
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 53 deletions.
diff --git a/include/EffectView.h b/include/EffectView.h
@@ -71,7 +71,7 @@ class EffectView : public PluginView
 
 public slots:
 	void editControls();
-	void editPinConnector();
+	void togglePinConnector();
 	void moveUp();
 	void moveDown();
 	void deletePlugin();
@@ -98,7 +98,7 @@ public slots:
 	QMdiSubWindow * m_subWindow;
 	EffectControlDialog * m_controlView;
 	QPushButton* m_pinConnectorButton = nullptr;
-	PluginPinConnectorView* m_pinConnectorView = nullptr;
+	std::unique_ptr<PluginPinConnectorView> m_pinConnectorView;
 
 	bool m_dragging;
 	QGraphicsOpacityEffect* m_opacityEffect;

diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h
@@ -38,6 +38,7 @@ namespace lmms::gui
 class InstrumentTrackWindow;
 class Knob;
 class MidiCCRackView;
+class PluginPinConnectorView;
 class TrackContainerView;
 class TrackLabelButton;
 
@@ -71,6 +72,7 @@ class InstrumentTrackView : public TrackView
 	// Create a menu for assigning/creating channels for this track
 	QMenu * createMixerMenu( QString title, QString newMixerLabel ) override;
 
+	void addPinConnectorAction(QMenu* menu);
 
 protected:
 	void modelChanged() override;
@@ -81,6 +83,7 @@ class InstrumentTrackView : public TrackView
 private slots:
 	void toggleInstrumentWindow( bool _on );
 	void toggleMidiCCRack();
+	void togglePinConnector();
 	void activityIndicatorPressed();
 	void activityIndicatorReleased();
 
@@ -112,6 +115,7 @@ private slots:
 	QAction * m_midiOutputAction;
 
 	std::unique_ptr<MidiCCRackView> m_midiCCRackView;
+	std::unique_ptr<PluginPinConnectorView> m_pinConnectorView;
 
 	QPoint m_lastPos;
 

diff --git a/include/PluginPinConnector.h b/include/PluginPinConnector.h
@@ -251,7 +251,7 @@ class LMMS_EXPORT PluginPinConnector
 	void loadSettings(const QDomElement& elem) override;
 	auto nodeName() const -> QString override { return "pins"; }
 
-	virtual auto instantiateView(QWidget* parent) const -> gui::PluginPinConnectorView*;
+	virtual auto instantiateView() const -> std::unique_ptr<gui::PluginPinConnectorView>;
 
 	auto getChannelCountText() const -> QString;
 

diff --git a/include/PluginPinConnectorView.h b/include/PluginPinConnectorView.h
@@ -52,7 +52,8 @@ class LMMS_EXPORT PluginPinConnectorView
 	Q_OBJECT
 
 public:
-	PluginPinConnectorView(PluginPinConnector* model, QWidget* parent);
+	PluginPinConnectorView(PluginPinConnector* model);
+	~PluginPinConnectorView() override;
 
 	auto sizeHint() const -> QSize override;
 	auto minimumSizeHint() const -> QSize override;

diff --git a/plugins/Vestige/Vestige.cpp b/plugins/Vestige/Vestige.cpp
@@ -54,7 +54,6 @@
 #include "MainWindow.h"
 #include "PathUtil.h"
 #include "PixmapButton.h"
-#include "PluginPinConnectorView.h"
 #include "Song.h"
 #include "StringPairDrag.h"
 #include "SubWindow.h"
@@ -963,16 +962,11 @@ ManageVestigeInstrumentView::ManageVestigeInstrumentView( VestigeInstrument * _i
 	l->addWidget( m_displayAutomatedOnly, 0, 1, 1, 2, Qt::AlignLeft );
 
 
-	m_pinConnectorButton = new QPushButton{m_vi->pinConnector()->getChannelCountText(), this};
-	m_pinConnectorButton->setToolTip(tr("Plugin Pin Connector"));
+	m_closeButton = new QPushButton( tr( "    Close    " ), widget );
+	connect( m_closeButton, SIGNAL( clicked() ), this,
+							SLOT( closeWindow() ) );
 
-	connect(m_pinConnectorButton, &QPushButton::clicked, this, &ManageVestigeInstrumentView::togglePinConnector);
-
-	connect(m_vi->pinConnector(), &PluginPinConnector::propertiesChanged, this, [&]() {
-		m_pinConnectorButton->setText(m_vi->pinConnector()->getChannelCountText());
-	});
-
-	l->addWidget(m_pinConnectorButton, 0, 2, 1, 2, Qt::AlignLeft);
+	l->addWidget( m_closeButton, 0, 2, 1, 7, Qt::AlignLeft );
 
 
 	for( int i = 0; i < 10; i++ )
@@ -1048,21 +1042,6 @@ ManageVestigeInstrumentView::ManageVestigeInstrumentView( VestigeInstrument * _i
 
 
 
-void ManageVestigeInstrumentView::togglePinConnector()
-{
-	if (!m_pinConnector)
-	{
-		m_pinConnector = m_vi->pinConnector()->instantiateView(m_vi->m_subWindow);
-	}
-	else
-	{
-		m_pinConnector->toggleVisibility();
-	}
-}
-
-
-
-
 void ManageVestigeInstrumentView::closeWindow()
 {
 	m_vi->m_subWindow->hide();
@@ -1145,13 +1124,6 @@ ManageVestigeInstrumentView::~ManageVestigeInstrumentView()
 		m_vi->m_scrollArea = nullptr;
 	}
 
-	if (m_pinConnector != nullptr)
-	{
-		m_pinConnector->closeWindow();
-		delete m_pinConnector;
-		m_pinConnector = nullptr;
-	}
-
 	if ( m_vi->m_subWindow != nullptr ) {
 		m_vi->m_subWindow->setAttribute(Qt::WA_DeleteOnClose);
 		m_vi->m_subWindow->close();

diff --git a/plugins/Vestige/Vestige.h b/plugins/Vestige/Vestige.h
@@ -51,7 +51,6 @@ namespace gui
 class CustomTextKnob;
 class ManageVestigeInstrumentView;
 class PixmapButton;
-class PluginPinConnectorView;
 class VestigeInstrumentView;
 } // namespace gui
 
@@ -123,7 +122,6 @@ protected slots:
 	void displayAutomatedOnly();
 	void setParameter( lmms::Model * action );
 	void syncParameterText();
-	void togglePinConnector();
 	void closeWindow();
 
 
@@ -140,8 +138,7 @@ protected slots:
 	QGridLayout * l;
 	QPushButton * m_syncButton;
 	QPushButton * m_displayAutomatedOnly;
-	QPushButton* m_pinConnectorButton;
-	PluginPinConnectorView* m_pinConnector = nullptr;
+	QPushButton * m_closeButton;
 	CustomTextKnob ** vstKnobs;
 
 } ;

diff --git a/src/core/PluginPinConnector.cpp b/src/core/PluginPinConnector.cpp
@@ -198,11 +198,11 @@ void PluginPinConnector::updateAllRoutedChannels()
 	}
 }
 
-auto PluginPinConnector::instantiateView(QWidget* parent) const -> gui::PluginPinConnectorView*
+auto PluginPinConnector::instantiateView() const -> std::unique_ptr<gui::PluginPinConnectorView>
 {
 	// This method does not modify the pin connector, but it needs the view to store
 	// a mutable pointer to the pin connector, hence the const_cast.
-	return new gui::PluginPinConnectorView{const_cast<PluginPinConnector*>(this), parent};
+	return std::make_unique<gui::PluginPinConnectorView>(const_cast<PluginPinConnector*>(this));
 }
 
 auto PluginPinConnector::getChannelCountText() const -> QString

diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
@@ -134,7 +134,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 		});
 
 		m_pinConnectorButton->setGeometry(144 + 32, 12, 28, 28);
-		connect(m_pinConnectorButton, &QPushButton::clicked, this, &EffectView::editPinConnector);
+		connect(m_pinConnectorButton, &QPushButton::clicked, this, &EffectView::togglePinConnector);
 	}
 
 	m_opacityEffect = new QGraphicsOpacityEffect(this);
@@ -150,12 +150,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 
 EffectView::~EffectView()
 {
-	if (m_pinConnectorView != nullptr)
-	{
-		m_pinConnectorView->closeWindow();
-		delete m_pinConnectorView;
-		m_pinConnectorView = nullptr;
-	}
+	m_pinConnectorView.reset();
 	delete m_subWindow;
 }
 
@@ -183,14 +178,17 @@ void EffectView::editControls()
 
 
 
-void EffectView::editPinConnector()
+void EffectView::togglePinConnector()
 {
 	auto pc = effect()->pinConnector();
 	if (!pc) { return; }
 
 	if (!m_pinConnectorView)
 	{
-		m_pinConnectorView = pc->instantiateView(this);
+		m_pinConnectorView = pc->instantiateView();
+		connect(pc, &PluginPinConnector::destroyed, [this]() {
+			m_pinConnectorView.reset();
+		});
 	}
 	else
 	{

diff --git a/src/gui/PluginPinConnectorView.cpp b/src/gui/PluginPinConnectorView.cpp
@@ -86,8 +86,8 @@ class PluginPinConnectorView::MatrixView : public QWidget
 };
 
 
-PluginPinConnectorView::PluginPinConnectorView(PluginPinConnector* model, QWidget* parent)
-	: QWidget{parent}
+PluginPinConnectorView::PluginPinConnectorView(PluginPinConnector* model)
+	: QWidget{}
 	, ModelView{model, this}
 	, m_inView{new MatrixView{this, model->in(), true}}
 	, m_outView{new MatrixView{this, model->out(), false}}
@@ -145,6 +145,11 @@ PluginPinConnectorView::PluginPinConnectorView(PluginPinConnector* model, QWidge
 	show();
 }
 
+PluginPinConnectorView::~PluginPinConnectorView()
+{
+	closeWindow();
+}
+
 auto PluginPinConnectorView::sizeHint() const -> QSize
 {
 	const auto inSize = m_inView->size();

diff --git a/src/gui/tracks/InstrumentTrackView.cpp b/src/gui/tracks/InstrumentTrackView.cpp
@@ -45,6 +45,8 @@
 #include "MainWindow.h"
 #include "MidiClient.h"
 #include "MidiPortMenu.h"
+#include "PluginPinConnector.h"
+#include "PluginPinConnectorView.h"
 #include "TrackLabelButton.h"
 
 
@@ -205,6 +207,33 @@ void InstrumentTrackView::toggleMidiCCRack()
 
 
 
+void InstrumentTrackView::togglePinConnector()
+{
+	const auto it = this->model();
+	if (!it) { return; }
+
+	const auto inst = it->instrument();
+	if (!inst) { return; }
+
+	auto pc = inst->pinConnector();
+	if (!pc) { return; }
+
+	if (!m_pinConnectorView)
+	{
+		m_pinConnectorView = pc->instantiateView();
+		connect(pc, &PluginPinConnector::destroyed, [this]() {
+			m_pinConnectorView.reset();
+		});
+	}
+	else
+	{
+		m_pinConnectorView->toggleVisibility();
+	}
+}
+
+
+
+
 InstrumentTrackWindow * InstrumentTrackView::topLevelInstrumentTrackWindow()
 {
 	InstrumentTrackWindow * w = nullptr;
@@ -396,6 +425,34 @@ QMenu * InstrumentTrackView::createMixerMenu(QString title, QString newMixerLabe
 	return mixerMenu;
 }
 
+void InstrumentTrackView::addPinConnectorAction(QMenu* menu)
+{
+	assert(menu != nullptr);
+	const auto addAction = [=, this](const PluginPinConnector* pc = nullptr) {
+		if (pc)
+		{
+			auto pcAction = menu->addAction(embed::getIconPixmap("tool"), tr("Pin connector"),
+				this, &InstrumentTrackView::togglePinConnector);
+
+			pcAction->setToolTip(pc->getChannelCountText());
+		}
+		else
+		{
+			auto pcAction = menu->addAction(embed::getIconPixmap("tool"), tr("Pin connector"));
+			pcAction->setDisabled(true);
+		}
+	};
+
+	const auto it = this->model();
+	if (!it) { addAction(); return; }
+
+	const auto inst = it->instrument();
+	if (!inst) { addAction(); return; }
+
+	const auto pc = inst->pinConnector();
+	addAction(pc);
+}
+
 QPixmap InstrumentTrackView::determinePixmap(InstrumentTrack* instrumentTrack)
 {
 	if (instrumentTrack)

diff --git a/src/gui/tracks/TrackOperationsWidget.cpp b/src/gui/tracks/TrackOperationsWidget.cpp
@@ -375,6 +375,7 @@ void TrackOperationsWidget::updateMenu()
 	{
 		toMenu->addSeparator();
 		toMenu->addMenu(trackView->midiMenu());
+		trackView->addPinConnectorAction(toMenu);
 	}
 	if( dynamic_cast<AutomationTrackView *>( m_trackView ) )
 	{