comparison src/MainWindow.cpp @ 247:852ee50c0de5

Restore "Snap Notes" action (it's still necessary because you can move notes away manually)
author Chris Cannam
date Wed, 02 Apr 2014 08:33:27 +0100
parents 69e6ceb459cd
children e9a0b3fad713
comparison
equal deleted inserted replaced
246:bb32b9fbacf8 247:852ee50c0de5
612 connect(this, SIGNAL(canExportNotes(bool)), action, SLOT(setEnabled(bool))); 612 connect(this, SIGNAL(canExportNotes(bool)), action, SLOT(setEnabled(bool)));
613 menu->addAction(action); 613 menu->addAction(action);
614 m_rightButtonMenu->addAction(action); 614 m_rightButtonMenu->addAction(action);
615 615
616 action = new QAction(tr("Merge Notes"), this); 616 action = new QAction(tr("Merge Notes"), this);
617 action->setShortcut(tr("Ctrl+="));
617 action->setStatusTip(tr("Merge all notes within the selected region into a single note")); 618 action->setStatusTip(tr("Merge all notes within the selected region into a single note"));
618 m_keyReference->registerShortcut(action); 619 m_keyReference->registerShortcut(action);
619 connect(action, SIGNAL(triggered()), this, SLOT(mergeNotes())); 620 connect(action, SIGNAL(triggered()), this, SLOT(mergeNotes()));
620 connect(this, SIGNAL(canSnapNotes(bool)), action, SLOT(setEnabled(bool))); 621 connect(this, SIGNAL(canSnapNotes(bool)), action, SLOT(setEnabled(bool)));
621 menu->addAction(action); 622 menu->addAction(action);
626 m_keyReference->registerShortcut(action); 627 m_keyReference->registerShortcut(action);
627 connect(action, SIGNAL(triggered()), this, SLOT(formNoteFromSelection())); 628 connect(action, SIGNAL(triggered()), this, SLOT(formNoteFromSelection()));
628 connect(this, SIGNAL(canSnapNotes(bool)), action, SLOT(setEnabled(bool))); 629 connect(this, SIGNAL(canSnapNotes(bool)), action, SLOT(setEnabled(bool)));
629 menu->addAction(action); 630 menu->addAction(action);
630 m_rightButtonMenu->addAction(action); 631 m_rightButtonMenu->addAction(action);
631 /* 632
632 action = new QAction(tr("Snap Notes to Pitch Track"), this); 633 action = new QAction(tr("Snap Notes to Pitch Track"), this);
633 action->setShortcut(tr("Ctrl+="));
634 action->setStatusTip(tr("Set notes within the selected region to the median frequency of their underlying pitches, or remove them if there are no underlying pitches")); 634 action->setStatusTip(tr("Set notes within the selected region to the median frequency of their underlying pitches, or remove them if there are no underlying pitches"));
635 m_keyReference->registerShortcut(action); 635 m_keyReference->registerShortcut(action);
636 connect(action, SIGNAL(triggered()), this, SLOT(snapNotesToPitches())); 636 connect(action, SIGNAL(triggered()), this, SLOT(snapNotesToPitches()));
637 connect(this, SIGNAL(canSnapNotes(bool)), action, SLOT(setEnabled(bool))); 637 connect(this, SIGNAL(canSnapNotes(bool)), action, SLOT(setEnabled(bool)));
638 menu->addAction(action); 638 menu->addAction(action);
639 m_rightButtonMenu->addAction(action); 639 m_rightButtonMenu->addAction(action);
640 */
641 } 640 }
642 641
643 void 642 void
644 MainWindow::setupViewMenu() 643 MainWindow::setupViewMenu()
645 { 644 {