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

Enough controller stuff for tonight

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1025 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-05-26 09:25:49 +00:00
parent f2d2420fc7
commit 836cb05316
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/themes/default/controller_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

2
data/themes/default/style.css
View File

@@ -38,7 +38,7 @@ QMenu::item {
QMenu::item:selected {
color: white;
font-weight:bold;
background-color: rgba(0, 0, 0, 160);
background-color: rgb(54,57,66);
margin:3px;
}

1
include/controller_view.h
View File

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

6
src/core/controller.cpp
View File

@@ -49,7 +49,11 @@ controller::controller( ControllerTypes _type, model * _parent ) :
m_type( _type )
{
if( _type != DummyController )
{
s_controllers.append( this );
m_name = QString( tr( "Controller %1" ) )
.arg( s_controllers.size() );
}
}
@@ -186,7 +190,7 @@ void controller::loadSettings( const QDomElement & _this )
"settings-node!\n" );
}
setName( _this.attribute( "muted" ) );
setName( _this.attribute( "name" ) );
}

6
src/gui/lfo_controller_dialog.cpp
View File

@@ -65,8 +65,12 @@ const int LFO_PHASE_KNOB_X = LFO_AMOUNT_KNOB_X+KNOB_X_SPACING;
lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent ) :
controllerDialog( _model, _parent )
{
setWindowIcon( embed::getIconPixmap( "controller" ) );
QString title = tr( "LFO" );
title.append( " (" );
title.append( _model->name() );
title.append( ")" );
setWindowTitle( tr( "LFO (name)" ) );
setWindowIcon( embed::getIconPixmap( "controller" ) );
setFixedSize( 256, 64 );
toolTip::add( this, tr( "LFO Controller" ) );

4
src/gui/widgets/controller_rack_view.cpp
View File

@@ -182,11 +182,11 @@ void controllerRackView::update( void )
{
controllerView * v = new controllerView( s->m_controllers[i], w );
m_controllerViews.append( v );
v->move( 0, i*20 );
v->move( 0, i*32 );
v->show();
}
w->setFixedSize( 210, i*20 );
w->setFixedSize( 210, i*32 );
/*
for( QVector<effect *>::iterator it = fxChain()->m_effects.begin();