hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

use default context menu for Fader. Connection dialog improvements

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1059 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-06-02 22:50:52 +00:00
parent fc0e68d7b2
commit 66c050d803
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -19,7 +19,11 @@
* src/core/midi/midi_controller.cpp:
name midiControllers after their channel/controller
* src/gui/widgets/fader.cpp:
Use default context menu
* src/gui/controller_connection_dialog.cpp:
don't choose the controller if the user didn't actually choose anything
2008-06-02 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>

10
src/gui/controller_connection_dialog.cpp
View File

@@ -260,12 +260,16 @@ void controllerConnectionDialog::selectController( void )
{
if( m_midiGroupBox->model()->value() > 0 )
{
m_controller = m_midiController->copyToMidiController(
engine::getSong() );
if( m_midiControllerSpinBox->model()->value() > 0 )
{
m_controller = m_midiController->copyToMidiController(
engine::getSong() );
}
}
else
{
if( m_userGroupBox->model()->value() > 0 )
if( m_userGroupBox->model()->value() > 0 &&
engine::getSong()->controllers().size() )
{
m_controller = engine::getSong()->controllers().at(
m_userController->model()->value() );

5
src/gui/widgets/fader.cpp
View File

@@ -89,10 +89,7 @@ void fader::contextMenuEvent( QContextMenuEvent * _ev )
if( !model()->nullTrack() )
{
captionMenu contextMenu( accessibleName() );
contextMenu.addAction( embed::getIconPixmap( "automation" ),
tr( "&Open in automation editor" ),
model()->getAutomationPattern(),
SLOT( openInAutomationEditor() ) );
addDefaultActions( &contextMenu );
contextMenu.exec( QCursor::pos() );
_ev->accept();
}