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

Show correct name in connection dialog. Remove bypass LED

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1289 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-07-07 04:50:56 +00:00
parent f2f6b73644
commit 06f5e33c0e
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2008-07-07 Paul Giblock <drfaygo/at/gmail/dot/com>
* src/gui/controller_connection_dialog.cpp:
Show name instead of type in connection dialog
* src/gui/widgets/controller_view.cpp:
Remove bypass
2008-07-06 Paul Giblock <drfaygo/at/gmail/dot/com>
* plugins/lb302/lb302.cpp:

2
src/gui/controller_connection_dialog.cpp
View File

@@ -190,7 +190,7 @@ controllerConnectionDialog::controllerConnectionDialog( QWidget * _parent,
for( int i = 0; i < engine::getSong()->controllers().size(); ++i )
{
controller * c = engine::getSong()->controllers().at( i );
m_userController->model()->addItem( c->publicName() );
m_userController->model()->addItem( c->name() );
}

11
src/gui/widgets/controller_view.cpp
View File

@@ -57,11 +57,6 @@ controllerView::controllerView( controller * _model, QWidget * _parent ) :
setAttribute( Qt::WA_OpaquePaintEvent, TRUE );
m_bypass = new ledCheckBox( "", this, tr( "Turn the controller off" ) );
m_bypass->move( 3, 2 );
m_bypass->setWhatsThis( tr( "Toggles the controller on or off." ) );
toolTip::add( m_bypass, tr( "On/Off" ) );
QPushButton * ctls_btn = new QPushButton( tr( "Controls" ),
this );
@@ -150,13 +145,13 @@ void controllerView::paintEvent( QPaintEvent * )
controller * c = castModel<controller>();
p.setPen( QColor( 64, 64, 64 ) );
p.drawText( 21, 13, c->publicName() );
p.drawText( 7, 13, c->publicName() );
p.setPen( Qt::white );
p.drawText( 20, 12, c->publicName() );
p.drawText( 6, 12, c->publicName() );
f.setBold( FALSE );
p.setFont( f );
p.drawText( 6, 26, c->name() );
p.drawText( 8, 26, c->name() );
}