Changeset 551
- Timestamp:
- 10/09/08 06:47:50 (1 month ago)
- Files:
-
- trunk/gui/src/PatternEditor/PatternEditorPanel.cpp (modified) (8 diffs)
- trunk/gui/src/PatternEditor/PatternEditorPanel.h (modified) (2 diffs)
- trunk/gui/src/PatternEditor/PianoRollEditor.cpp (modified) (2 diffs)
- trunk/gui/src/PatternEditor/PianoRollEditor.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/gui/src/PatternEditor/PatternEditorPanel.cpp
r525 r551 269 269 270 270 271 272 m_pPianoRollScrollView= new QScrollArea( NULL );271 /* 272 = new QScrollArea( NULL ); 273 273 m_pPianoRollScrollView->setFrameShape( QFrame::NoFrame ); 274 274 m_pPianoRollScrollView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); … … 282 282 283 283 m_pPianoRollScrollView->hide(); 284 */ 284 285 //~ EDITOR 285 286 … … 414 415 415 416 pGrid->addWidget( m_pEditorScrollView, 2, 1 ); 416 pGrid->addWidget( m_pPianoRollScrollView, 2, 1 );417 // pGrid->addWidget( m_pPianoRollScrollView, 2, 1 ); 417 418 418 419 pGrid->addWidget( m_pPatternEditorVScrollBar, 2, 2 ); … … 533 534 534 535 // piano roll Editor 535 m_pPianoRollScrollView->horizontalScrollBar()->setValue( m_pPatternEditorHScrollBar->value() );536 m_pPianoRollScrollView->verticalScrollBar()->setValue( m_pPatternEditorVScrollBar->value() );536 // m_pPianoRollScrollView->horizontalScrollBar()->setValue( m_pPatternEditorHScrollBar->value() ); 537 // m_pPianoRollScrollView->verticalScrollBar()->setValue( m_pPatternEditorVScrollBar->value() ); 537 538 538 539 … … 689 690 { 690 691 UNUSED( ev ); 691 QScrollArea *pScrollArea = NULL; 692 692 QScrollArea *pScrollArea = m_pEditorScrollView; 693 694 /* 693 695 if ( m_pPianoRollScrollView->isVisible() ) { 694 696 pScrollArea = m_pPianoRollScrollView; … … 697 699 pScrollArea = m_pEditorScrollView; 698 700 } 699 701 */ 700 702 701 703 m_pPatternEditorHScrollBar->setMinimum( pScrollArea->horizontalScrollBar()->minimum() ); … … 748 750 749 751 750 m_pPianoRollScrollView->hide();752 // m_pPianoRollScrollView->hide(); 751 753 m_pEditorScrollView->show(); 752 754 m_pInstrListScrollView->show(); … … 767 769 768 770 769 m_pPianoRollScrollView->show();771 // m_pPianoRollScrollView->show(); 770 772 m_pEditorScrollView->hide(); 771 773 m_pInstrListScrollView->hide(); 772 774 773 m_pPianoRollEditor->selectedInstrumentChangedEvent(); // force an update775 // m_pPianoRollEditor->selectedInstrumentChangedEvent(); // force an update 774 776 775 777 // force a re-sync of extern scrollbars trunk/gui/src/PatternEditor/PatternEditorPanel.h
r525 r551 40 40 class LCDCombo; 41 41 class DrumPatternEditor; 42 class PianoRollEditor;42 //class PianoRollEditor; 43 43 44 44 … … 116 116 117 117 // piano roll editor 118 QScrollArea* m_pPianoRollScrollView;119 PianoRollEditor *m_pPianoRollEditor;118 // QScrollArea* m_pPianoRollScrollView; 119 // PianoRollEditor *m_pPianoRollEditor; 120 120 121 121 // ruler trunk/gui/src/PatternEditor/PianoRollEditor.cpp
r377 r551 21 21 */ 22 22 23 /* 23 24 #include "PianoRollEditor.h" 24 25 … … 221 222 } 222 223 224 */ trunk/gui/src/PatternEditor/PianoRollEditor.h
r377 r551 20 20 * 21 21 */ 22 22 /* 23 23 #ifndef PIANO_ROLL_EDITOR_H 24 24 #define PIANO_ROLL_EDITOR_H … … 70 70 71 71 #endif 72 */
