From aa5106f4072dea09b4d297c9f605ba25fb80451f Mon Sep 17 00:00:00 2001 From: Danny McRae Date: Wed, 16 Aug 2006 00:16:44 +0000 Subject: [PATCH] texturized effect plugin widget changed linked channels to default on git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@338 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 13 +++++++-- data/themes/default/effect_plugin.png | Bin 0 -> 7301 bytes src/widgets/ladspa_control.cpp | 4 +-- src/widgets/rack_plugin.cpp | 38 +++++++++++++++++++------- src/widgets/rack_view.cpp | 4 +-- 5 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 data/themes/default/effect_plugin.png diff --git a/ChangeLog b/ChangeLog index 18c0b1bb3..9c272efa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,17 @@ connetions are not saved!) 2006-08-15 Danny McRae + * src/widgets/ladspa_control.cpp: + doubled the number of steps in the knobs + + * src/core/ladspa_control_dialog.cpp: + changed linking to default on + + * data/themes/default/effect_plugin.png: + * src/widgets/rack_plugin.cpp: + * src/widgets/rack_view.cpp: + added some texture to the plugin widget + * src/core/ladspa_control_dialog.cpp: save and restore the channel link state @@ -36,8 +47,6 @@ * src/core/ladspa_control_dialog.cpp: * src/core/ladspa_control.cpp: - added a link channels option to the ladspa controls - - unlinking the channels will currently break automation for all - but the first channel * All of the effects related files: reformatted to respect the 80 characters per line convention diff --git a/data/themes/default/effect_plugin.png b/data/themes/default/effect_plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..7b1d2b28a32a9fb0de7dd287cef3c8a5d9f02b2e GIT binary patch literal 7301 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 literal 0 HcmV?d00001 diff --git a/src/widgets/ladspa_control.cpp b/src/widgets/ladspa_control.cpp index 9235b66f3..1ff341891 100644 --- a/src/widgets/ladspa_control.cpp +++ b/src/widgets/ladspa_control.cpp @@ -75,7 +75,7 @@ ladspaControl::ladspaControl( QWidget * _parent, m_knob->setRange( static_cast( m_port->max ), static_cast( m_port->min ), 1 + static_cast( m_port->max - - m_port->min ) / 200 ); + m_port->min ) / 400 ); m_knob->setInitValue( static_cast( m_port->def ) ); setFixedSize( m_knob->width(), m_knob->height() ); @@ -95,7 +95,7 @@ ladspaControl::ladspaControl( QWidget * _parent, m_knob->setLabel( m_port->name ); m_knob->setRange( m_port->min, m_port->max, ( m_port->max - - m_port->min ) / 200.0f ); + m_port->min ) / 400.0f ); m_knob->setInitValue( m_port->def ); m_knob->setHintText( tr( "Value:" ) + " ", "" ); #ifdef QT4 diff --git a/src/widgets/rack_plugin.cpp b/src/widgets/rack_plugin.cpp index 1769582ba..8f3269e61 100644 --- a/src/widgets/rack_plugin.cpp +++ b/src/widgets/rack_plugin.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #define addSeparator insertSeparator #define addMenu insertItem @@ -81,11 +82,17 @@ rackPlugin::rackPlugin( QWidget * _parent, m_name = m_effect->getName(); - setFixedSize( 210, 58 ); - setPaletteBackgroundColor( QColor( 99, 99, 99 ) ); - - m_grouper = new QGroupBox( 1, Qt::Vertical, "", this ); - m_grouper->setFixedSize( 210, 58 ); + setFixedSize( 210, 60 ); + + QPixmap bg = embed::getIconPixmap( "effect_plugin" ); +#ifdef QT4 + setAutoFillBackground( TRUE ); + QPalette pal; + pal.setBrush( backgroundRole(), bg ); + setPalette( pal ); +#else + setErasePixmap( bg ); +#endif m_bypass = new ledCheckBox( "", this, tr( "Turn the effect off" ), eng(), m_track ); @@ -109,7 +116,7 @@ rackPlugin::rackPlugin( QWidget * _parent, m_wetDry->setLabel( tr( "W/D" ) ); m_wetDry->setRange( 0.0f, 1.0f, 0.01f ); m_wetDry->setInitValue( 1.0f ); - m_wetDry->move( 25, 3 ); + m_wetDry->move( 27, 5 ); m_wetDry->setHintText( tr( "Wet Level:" ) + " ", "" ); #ifdef QT4 m_wetDry->setWhatsThis( @@ -127,7 +134,7 @@ rackPlugin::rackPlugin( QWidget * _parent, m_autoQuit->setLabel( tr( "Decay" ) ); m_autoQuit->setRange( 1.0f, 8000.0f, 100.0f ); m_autoQuit->setInitValue( 1 ); - m_autoQuit->move( 60, 3 ); + m_autoQuit->move( 60, 5 ); m_autoQuit->setHintText( tr( "Time:" ) + " ", "ms" ); #ifdef QT4 m_autoQuit->setWhatsThis( @@ -145,7 +152,7 @@ rackPlugin::rackPlugin( QWidget * _parent, m_gate->setLabel( tr( "Gate" ) ); m_gate->setRange( 0.0f, 1.0f, 0.01f ); m_gate->setInitValue( 0.0f ); - m_gate->move( 95, 3 ); + m_gate->move( 93, 5 ); m_gate->setHintText( tr( "Gate:" ) + " ", "" ); #ifdef QT4 m_gate->setWhatsThis( @@ -160,7 +167,7 @@ rackPlugin::rackPlugin( QWidget * _parent, m_editButton->setText( tr( "Controls" ) ); QFont f = m_editButton->font(); m_editButton->setFont( pointSize<7>( f ) ); - m_editButton->setGeometry( 140, 19, 50, 20 ); + m_editButton->setGeometry( 140, 14, 50, 20 ); connect( m_editButton, SIGNAL( clicked() ), this, SLOT( editControls() ) ); @@ -170,7 +177,18 @@ rackPlugin::rackPlugin( QWidget * _parent, f = m_label->font(); f.setBold( TRUE ); m_label->setFont( pointSize<7>( f ) ); - m_label->setGeometry( 5, 38, 200, 20 ); + m_label->setGeometry( 5, 44, 195, 10 ); + + QPixmap back = QPixmap( bg.convertToImage().copy( 5, 44, + 195, 10 ) ); +#ifdef QT4 + m_label->setAutoFillBackground( TRUE ); + QPalette pal; + pal.setBrush( backgroundRole(), back ); + m_label->setPalette( pal ); +#else + m_label->setErasePixmap( back ); +#endif m_controlView = new ladspaControlDialog( eng()->getMainWindow()->workspace(), diff --git a/src/widgets/rack_view.cpp b/src/widgets/rack_view.cpp index 72db2bc24..6b32b866b 100644 --- a/src/widgets/rack_view.cpp +++ b/src/widgets/rack_view.cpp @@ -51,11 +51,11 @@ rackView::rackView( QWidget * _parent, m_port( _port ), m_ladspa( eng()->getLADSPAManager() ) { - setFixedSize( 230, 180 ); + setFixedSize( 230, 184 ); m_mainLayout = new QVBoxLayout( this ); m_scrollView = new QScrollView( this ); - m_scrollView->setFixedSize( 230, 180 ); + m_scrollView->setFixedSize( 230, 184 ); m_scrollView->setVScrollBarMode( QScrollView::AlwaysOn ); m_mainLayout->addWidget( m_scrollView );