Turn on the user controller LED when a controller is selected

LMMS · Apr 15, 2018 · 2a03050 · 2a03050
1 parent eb14417
commit 2a03050
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h
@@ -66,6 +66,7 @@ public slots:
 	void selectController();
 	void midiToggled();
 	void userToggled();
+	void userSelected();
 	void autoDetectToggled();
 	void enableAutoDetect( QAction * _a );
 

diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/ControllerConnectionDialog.cpp
@@ -188,13 +188,16 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent,
 
 	m_userController = new ComboBox( m_userGroupBox, "Controller" );
 	m_userController->setGeometry( 10, 24, 200, 22 );
-
 	for( int i = 0; i < Engine::getSong()->controllers().size(); ++i )
 	{
 		Controller * c = Engine::getSong()->controllers().at( i );
 		m_userController->model()->addItem( c->name() );
 	}
-
+	connect( m_userController->model(), SIGNAL( dataUnchanged() ),
+			this, SLOT( userSelected() ) );
+	connect( m_userController->model(), SIGNAL( dataChanged() ),
+			this, SLOT( userSelected() ) );
+
 
 	// Mapping functions
 	m_mappingBox = new TabWidget( tr( "MAPPING FUNCTION" ), this );
@@ -383,15 +386,22 @@ void ControllerConnectionDialog::midiToggled()
 
 
 
+void ControllerConnectionDialog::userSelected()
+{
+	m_userGroupBox->model()->setValue( 1 );
+	userToggled();
+}
+
+
+
+
 void ControllerConnectionDialog::userToggled()
 {
 	int enabled = m_userGroupBox->model()->value();
 	if( enabled != 0 && m_midiGroupBox->model()->value() != 0 )
 	{
 		m_midiGroupBox->model()->setValue( 0 );
 	}
-
-	m_userController->setEnabled( enabled );
 }