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

More Controller improvements

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1012 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-05-22 06:08:59 +00:00
parent 1781974657
commit cf0839c7c2
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@
* src/core/lfo_controller.cpp:
Add more wave shapes to LFO controller
* src/gui/widgets/controller_view.cpp:
Set sub-window's icon to the icon of the controllerDialog
* src/gui/widgets/controller_rack_view.cpp:
Add icon to window
2008-05-21 Paul Giblock <drfaygo/at/gmail/dot/com>
* plugins/sf2_player/Makefile.am:

23
src/gui/lfo_controller_dialog.cpp
View File

@@ -55,7 +55,7 @@ const int LFO_SHAPES_X = 6;
const int LFO_SHAPES_Y = 16;
const int LFO_GRAPH_X = 6;
const int LFO_GRAPH_Y = ENV_KNOBS_LBL_Y+14;
const int LFO_GRAPH_Y = ENV_KNOBS_LBL_Y+15;
const int LFO_KNOB_Y = LFO_GRAPH_Y-2;
const int LFO_BASE_KNOB_X = LFO_SHAPES_X + 64;
const int LFO_SPEED_KNOB_X = LFO_BASE_KNOB_X+KNOB_X_SPACING;
@@ -65,6 +65,8 @@ 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" ) );
setWindowTitle( tr( "LFO (name)" ) );
setFixedSize( 256, 64 );
toolTip::add( this, tr( "LFO Controller" ) );
@@ -126,7 +128,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
pixmapButton * triangle_wave_btn =
new pixmapButton( this, NULL );
triangle_wave_btn->move( LFO_SHAPES_X + 14, LFO_SHAPES_Y );
triangle_wave_btn->move( LFO_SHAPES_X + 15, LFO_SHAPES_Y );
triangle_wave_btn->setActiveGraphic(
embed::getIconPixmap( "triangle_wave_active" ) );
triangle_wave_btn->setInactiveGraphic(
@@ -136,7 +138,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
"for current oscillator." ) );
pixmapButton * saw_wave_btn = new pixmapButton( this, NULL );
saw_wave_btn->move( LFO_SHAPES_X + 28, LFO_SHAPES_Y );
saw_wave_btn->move( LFO_SHAPES_X + 30, LFO_SHAPES_Y );
saw_wave_btn->setActiveGraphic( embed::getIconPixmap(
"saw_wave_active" ) );
saw_wave_btn->setInactiveGraphic( embed::getIconPixmap(
@@ -146,7 +148,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
"current oscillator." ) );
pixmapButton * sqr_wave_btn = new pixmapButton( this, NULL );
sqr_wave_btn->move( LFO_SHAPES_X + 42, LFO_SHAPES_Y );
sqr_wave_btn->move( LFO_SHAPES_X + 45, LFO_SHAPES_Y );
sqr_wave_btn->setActiveGraphic( embed::getIconPixmap(
"square_wave_active" ) );
sqr_wave_btn->setInactiveGraphic( embed::getIconPixmap(
@@ -157,7 +159,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
pixmapButton * moog_saw_wave_btn =
new pixmapButton( this, NULL );
moog_saw_wave_btn->move( LFO_SHAPES_X, LFO_SHAPES_Y + 14 );
moog_saw_wave_btn->move( LFO_SHAPES_X, LFO_SHAPES_Y + 15 );
moog_saw_wave_btn->setActiveGraphic(
embed::getIconPixmap( "moog_saw_wave_active" ) );
moog_saw_wave_btn->setInactiveGraphic(
@@ -167,7 +169,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
"for current oscillator." ) );
pixmapButton * exp_wave_btn = new pixmapButton( this, NULL );
exp_wave_btn->move( LFO_SHAPES_X + 14, LFO_SHAPES_Y + 14 );
exp_wave_btn->move( LFO_SHAPES_X + 15, LFO_SHAPES_Y + 15 );
exp_wave_btn->setActiveGraphic( embed::getIconPixmap(
"exp_wave_active" ) );
exp_wave_btn->setInactiveGraphic( embed::getIconPixmap(
@@ -177,7 +179,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
"wave for current oscillator." ) );
pixmapButton * white_noise_btn = new pixmapButton( this, NULL );
white_noise_btn->move( LFO_SHAPES_X + 28, LFO_SHAPES_Y + 14 );
white_noise_btn->move( LFO_SHAPES_X + 30, LFO_SHAPES_Y + 15 );
white_noise_btn->setActiveGraphic(
embed::getIconPixmap( "white_noise_wave_active" ) );
white_noise_btn->setInactiveGraphic(
@@ -187,11 +189,12 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
"current oscillator." ) );
pixmapButton * uwb = new pixmapButton( this, NULL );
uwb->move( LFO_SHAPES_X + 42, LFO_SHAPES_Y + 14 );
uwb->move( LFO_SHAPES_X + 45, LFO_SHAPES_Y + 15 );
uwb->setActiveGraphic( embed::getIconPixmap(
"usr_shape_active" ) );
"usr_wave_active" ) );
uwb->setInactiveGraphic( embed::getIconPixmap(
"usr_shape_inactive" ) );
"usr_wave_inactive" ) );
uwb->setEnabled( false );
toolTip::add( uwb, tr( "Click here if you want a user-defined "
"wave-shape for current oscillator." ) );

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

@@ -33,7 +33,7 @@
#include <QtGui/QMdiArea>
#include "song.h"
//#include "effect_view.h"
#include "embed.h"
#include "main_window.h"
#include "group_box.h"
#include "controller_rack_view.h"
@@ -46,6 +46,8 @@ controllerRackView::controllerRackView( ) :
modelView( NULL )
{
setFixedSize( 250, 250 );
setWindowIcon( embed::getIconPixmap( "controller" ) );
setWindowTitle( tr( "Controller Rack" ) );
m_scrollArea = new QScrollArea( this );
m_scrollArea->setFixedSize( 230, 184 );

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

@@ -70,11 +70,13 @@ controllerView::controllerView( controller * _model, QWidget * _parent ) :
connect( ctls_btn, SIGNAL( clicked() ),
this, SLOT( editControls() ) );
m_controllerDlg = getController()->createDialog( NULL );
m_controllerDlg = getController()->createDialog( engine::getMainWindow()->workspace() );
m_subWindow = engine::getMainWindow()->workspace()->addSubWindow(
m_controllerDlg );
m_subWindow->setWindowIcon( m_controllerDlg->windowIcon() );
connect( m_controllerDlg, SIGNAL( closed() ),
this, SLOT( closeControls() ) );