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

Merge pull request #2146 from michaelgregorius/2144-TrackNameInPianoRoll

Browse Source 
Fixes #2144 ("Track name not shown in PianoRoll titlebar")
This commit is contained in:
Colin Wallace
2015-07-01 20:23:08 -07:00
parent 225f2c4551 a98534ac46
commit 122204e06b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/editors/PianoRoll.cpp
View File

@@ -534,7 +534,6 @@ void PianoRoll::setCurrentPattern( Pattern* newPattern )
if( ! hasValidPattern() )
{
//resizeEvent( NULL );
setWindowTitle( tr( "Piano-Roll - no pattern" ) );
update();
emit currentPatternChanged();
@@ -577,8 +576,6 @@ void PianoRoll::setCurrentPattern( Pattern* newPattern )
connect( m_pattern->instrumentTrack(), SIGNAL( midiNoteOff( const Note& ) ), this, SLOT( finishRecordNote( const Note& ) ) );
connect( m_pattern->instrumentTrack()->pianoModel(), SIGNAL( dataChanged() ), this, SLOT( update() ) );
setWindowTitle( tr( "Piano-Roll - %1" ).arg( m_pattern->name() ) );
update();
emit currentPatternChanged();
}
@@ -4264,6 +4261,15 @@ const Pattern* PianoRollWindow::currentPattern() const
void PianoRollWindow::setCurrentPattern(Pattern* pattern)
{
m_editor->setCurrentPattern(pattern);
if ( pattern )
{
setWindowTitle( tr( "Piano-Roll - %1" ).arg( pattern->name() ) );
}
else
{
setWindowTitle( tr( "Piano-Roll - no pattern" ) );
}
}
bool PianoRollWindow::isRecording() const