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

made LMMS compile + cleanups

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1027 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-05-26 09:45:04 +00:00
parent eb3e3b84d1
commit fe80dc9e2a
3 changed files with 9 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2008-05-26 Paul Giblock <drfaygo/at/gmail/dot/com>
* include/controller_view.h:
* src/gui/widgets/controller_view.cpp:
made LMMS compile + cleanups
2008-05-26 Paul Giblock <drfaygo/at/gmail/dot/com>
* include/automatable_model.h:

1
include/controller_view.h
View File

@@ -77,7 +77,6 @@ signals:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
virtual void mouseDoubleClickEvent( QMouseEvent * event );
virtual void modelChanged( void );

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

@@ -64,7 +64,7 @@ controllerView::controllerView( controller * _model, QWidget * _parent ) :
QPushButton * ctls_btn = new QPushButton( tr( "Controls" ),
this );
QFont f = ctls_btn->font();
QFont f = ctls_btn->font();
ctls_btn->setFont( pointSize<7>( f ) );
ctls_btn->setGeometry( 140, 2, 50, 14 );
connect( ctls_btn, SIGNAL( clicked() ),
@@ -82,23 +82,6 @@ controllerView::controllerView( controller * _model, QWidget * _parent ) :
m_subWindow->hide();
/*
if( getEffect()->getControls()->getControlCount() > 0 )
{
QPushButton * ctls_btn = new QPushButton( tr( "Controls" ),
this );
QFont f = ctls_btn->font();
ctls_btn->setFont( pointSize<7>( f ) );
ctls_btn->setGeometry( 140, 14, 50, 20 );
connect( ctls_btn, SIGNAL( clicked() ),
this, SLOT( editControls() ) );
}
m_controlView = getEffect()->getControls()->createView();
connect( m_controlView, SIGNAL( closed() ),
this, SLOT( closeEffects() ) );
*/
setModel( _model );
}
@@ -129,30 +112,7 @@ void controllerView::editControls( void )
}
}
/*
//engine::getMainWindow()->workspace()->addSubWindow( NULL );
controller * c = castModel<controller>();
if( m_controllerDlg == NULL )
m_controllerDlg = c->createDialog( NULL );
m_subWindow = engine::getMainWindow()->workspace()->addSubWindow( m_controllerDlg );
m_subWindow->show();
m_subWindow->raise();
}
*/
/*
void effectView::displayHelp( void )
{
QWhatsThis::showText( mapToGlobal( rect().bottomRight() ),
whatsThis() );
}
*/
void controllerView::closeControls( void )
@@ -163,28 +123,9 @@ void controllerView::closeControls( void )
void controllerView::contextMenuEvent( QContextMenuEvent * )
{
/*
QPointer<captionMenu> contextMenu = new captionMenu(
getEffect()->publicName() );
contextMenu->addAction( embed::getIconPixmap( "arp_up_on" ),
tr( "Move &up" ),
this, SLOT( moveUp() ) );
contextMenu->addAction( embed::getIconPixmap( "arp_down_on" ),
tr( "Move &down" ),
this, SLOT( moveDown() ) );
contextMenu->addSeparator();
contextMenu->addAction( embed::getIconPixmap( "cancel" ),
tr( "&Remove this plugin" ),
this, SLOT( deletePlugin() ) );
contextMenu->addSeparator();
contextMenu->addAction( embed::getIconPixmap( "help" ),
tr( "&Help" ),
this, SLOT( displayHelp() ) );
contextMenu->exec( QCursor::pos() );
delete contextMenu;
*/
}
@@ -206,14 +147,9 @@ void controllerView::paintEvent( QPaintEvent * )
void controllerView::modelChanged( void )
{
/*
m_bypass->setModel( &getEffect()->m_enabledModel );
m_wetDry->setModel( &getEffect()->m_wetDryModel );
m_autoQuit->setModel( &getEffect()->m_autoQuitModel );
m_gate->setModel( &getEffect()->m_gateModel );
*/
}