From 06f5e33c0ed78f94a00ff2adcff9552d6270b1ba Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Mon, 7 Jul 2008 04:50:56 +0000 Subject: [PATCH] Show correct name in connection dialog. Remove bypass LED git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1289 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 8 ++++++++ src/gui/controller_connection_dialog.cpp | 2 +- src/gui/widgets/controller_view.cpp | 11 +++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 261c4b608..4dad6ee7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-07 Paul Giblock + + * 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 * plugins/lb302/lb302.cpp: diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp index d8d0e223f..e662a5e34 100644 --- a/src/gui/controller_connection_dialog.cpp +++ b/src/gui/controller_connection_dialog.cpp @@ -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() ); } diff --git a/src/gui/widgets/controller_view.cpp b/src/gui/widgets/controller_view.cpp index 9c73ab6cc..677ef3167 100644 --- a/src/gui/widgets/controller_view.cpp +++ b/src/gui/widgets/controller_view.cpp @@ -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(); 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() ); }