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

1345 moved LedCheckBox to MISC tab

Browse Source
This commit is contained in:
Dave French
2015-01-10 19:05:40 +00:00
parent af22d39612
commit 83baea6605
4 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/widgets/InstrumentMidiIOView.cpp
View File

@@ -37,7 +37,9 @@
#include "MidiClient.h"
#include "Mixer.h"
#include "ToolTip.h"
#include "InstrumentTrack.h"
#include "LedCheckbox.h"
#include "QLabel"
InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
@@ -201,3 +203,29 @@ void InstrumentMidiIOView::modelChanged()
}
}
InstrumentMiscView::InstrumentMiscView(InstrumentTrack *it, QWidget *parent) :
QWidget( parent )
{
QVBoxLayout* layout = new QVBoxLayout( this );
layout->setMargin( 5 );
QHBoxLayout* masterPitchLayout = new QHBoxLayout( this );
//setup checkbox for use master pitch
m_useMasterPitchBox = new LedCheckBox( this, tr( "Use master pitch" ),LedCheckBox::Green );
m_useMasterPitchBox->setModel( &it->m_useMasterPitchModel );
m_useMasterPitchBox->setToolTip( "Master Pitch" );
masterPitchLayout->addWidget( m_useMasterPitchBox );
QLabel *label = new QLabel ( tr ("Use Master Pitch " ), this );
masterPitchLayout->addWidget( label );
layout->addLayout( masterPitchLayout );
layout->addStretch();
}
InstrumentMiscView::~InstrumentMiscView()
{
}

12
src/tracks/InstrumentTrack.cpp
View File

@@ -1217,13 +1217,6 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
basicControlsLayout->addWidget( m_pitchRangeSpinBox );
basicControlsLayout->addStretch();
//setup checkbox for use master pitch
m_useMasterPitchBox = new LedCheckBox( this, tr( "Use master pitch" ),LedCheckBox::Green );
m_useMasterPitchBox->setModel( &m_track->m_useMasterPitchModel );
m_useMasterPitchBox->setToolTip( "Master Pitch" );
basicControlsLayout->addWidget( m_useMasterPitchBox );
basicControlsLayout->addStretch();
// setup spinbox for selecting FX-channel
m_effectChannelNumber = new fxLineLcdSpinBox( 2, NULL, tr( "FX channel" ) );
@@ -1273,10 +1266,15 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
// FX tab
m_effectView = new EffectRackView( m_track->m_audioPort.effects(), m_tabWidget );
// MISC tab
m_miscView = new InstrumentMiscView( m_track, m_tabWidget );
m_tabWidget->addTab( m_ssView, tr( "ENV/LFO" ), 1 );
m_tabWidget->addTab( instrumentFunctions, tr( "FUNC" ), 2 );
m_tabWidget->addTab( m_effectView, tr( "FX" ), 3 );
m_tabWidget->addTab( m_midiView, tr( "MIDI" ), 4 );
m_tabWidget->addTab( m_miscView, tr( "MISC" ), 5 );
// setup piano-widget
m_pianoView = new PianoView( this );