← Back to branch summary

~ubuntu-branches/ubuntu/precise/lmms/precise-updates

« back to all changes in this revision

Viewing changes to plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Артём Попов
  • Date: 2011-02-14 20:58:36 UTC
  • mfrom: (1.1.10 upstream) (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110214205836-2u41xus1d2mj8nfz
Tags: 0.4.10-1ubuntu1
https://launchpad.net/bugs/718801
* Merge from debian unstable (LP: #718801).  Remaining changes:
  - Replace build-dep on libwine-dev with wine1.2-dev to build
    against the newer Wine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
39
39
                                PeakControllerEffectControls * _controls ) :
40
40
        EffectControlDialog( _controls )
41
41
{
42
 
        setAutoFillBackground( TRUE );
 
42
        setAutoFillBackground( true );
43
43
        QPalette pal;
44
44
        pal.setBrush( backgroundRole(),
45
45
                                PLUGIN_NAME::getIconPixmap( "artwork" ) );
46
46
        setPalette( pal );
47
 
        setFixedSize( 120, 104 );
 
47
        setFixedSize( 144, 110 );
48
48
 
49
49
        QVBoxLayout * tl = new QVBoxLayout( this );
50
50
        tl->addSpacing( 25 );
61
61
        m_amountKnob->setModel( &_controls->m_amountModel );
62
62
        m_amountKnob->setHintText( tr( "Modulation amount:" ) + " ", "" );
63
63
 
 
64
        m_attackKnob = new knob( knobBright_26, this );
 
65
        m_attackKnob->setLabel( tr( "ATTACK" ) );
 
66
        m_attackKnob->setModel( &_controls->m_attackModel );
 
67
        m_attackKnob->setHintText( tr( "Attack:" ) + " ", "" );
 
68
 
64
69
        m_decayKnob = new knob( knobBright_26, this );
65
70
        m_decayKnob->setLabel( tr( "DECAY" ) );
66
71
        m_decayKnob->setModel( &_controls->m_decayModel );
67
 
        m_decayKnob->setHintText( tr( "Release decay (not implemented):" ) + " ", "" );
 
72
        m_decayKnob->setHintText( tr( "Release:" ) + " ", "" );
68
73
 
69
74
        l->addWidget( m_baseKnob );
70
75
        l->addWidget( m_amountKnob );
 
76
        l->addWidget( m_attackKnob );
71
77
        l->addWidget( m_decayKnob );
72
78
        tl->addLayout( l );
73
79