Mercurial > hg > sonic-visualiser
comparison main/PreferencesDialog.cpp @ 1283:ca5dcee081ef project-file-rework
Merge from branch piper
author | Chris Cannam |
---|---|
date | Tue, 25 Oct 2016 11:06:00 +0100 |
parents | 0c6cdcf53641 |
children | a264b51728cf |
comparison
equal
deleted
inserted
replaced
1280:2f3dc5f839d2 | 1283:ca5dcee081ef |
---|---|
78 m_windowTypeSelector = new WindowTypeSelector(m_windowType); | 78 m_windowTypeSelector = new WindowTypeSelector(m_windowType); |
79 | 79 |
80 connect(m_windowTypeSelector, SIGNAL(windowTypeChanged(WindowType)), | 80 connect(m_windowTypeSelector, SIGNAL(windowTypeChanged(WindowType)), |
81 this, SLOT(windowTypeChanged(WindowType))); | 81 this, SLOT(windowTypeChanged(WindowType))); |
82 | 82 |
83 QCheckBox *vampProcessSeparation = new QCheckBox; | |
84 m_runPluginsInProcess = prefs->getRunPluginsInProcess(); | |
85 vampProcessSeparation->setCheckState(m_runPluginsInProcess ? Qt::Unchecked : | |
86 Qt::Checked); | |
87 connect(vampProcessSeparation, SIGNAL(stateChanged(int)), | |
88 this, SLOT(vampProcessSeparationChanged(int))); | |
89 | |
83 QComboBox *smoothing = new QComboBox; | 90 QComboBox *smoothing = new QComboBox; |
84 | 91 |
85 int sm = prefs->getPropertyRangeAndValue("Spectrogram Y Smoothing", &min, &max, | 92 int sm = prefs->getPropertyRangeAndValue("Spectrogram Y Smoothing", &min, &max, |
86 &deflt); | 93 &deflt); |
87 m_spectrogramSmoothing = sm; | 94 m_spectrogramSmoothing = sm; |
470 | 477 |
471 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel | 478 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel |
472 ("Window Type"))), | 479 ("Window Type"))), |
473 row, 0); | 480 row, 0); |
474 subgrid->addWidget(m_windowTypeSelector, row++, 1, 2, 2); | 481 subgrid->addWidget(m_windowTypeSelector, row++, 1, 2, 2); |
482 | |
475 subgrid->setRowStretch(row, 10); | 483 subgrid->setRowStretch(row, 10); |
476 row++; | 484 row++; |
485 | |
486 subgrid->addWidget(new QLabel(tr("Run Vamp plugins in separate process:")), | |
487 row, 0); | |
488 subgrid->addWidget(vampProcessSeparation, row++, 1, 1, 1); | |
477 | 489 |
478 subgrid->setRowStretch(row, 10); | 490 subgrid->setRowStretch(row, 10); |
479 | 491 |
480 m_tabOrdering[AnalysisTab] = m_tabs->count(); | 492 m_tabOrdering[AnalysisTab] = m_tabs->count(); |
481 m_tabs->addTab(frame, tr("Anal&ysis")); | 493 m_tabs->addTab(frame, tr("Anal&ysis")); |
626 | 638 |
627 void | 639 void |
628 PreferencesDialog::resampleOnLoadChanged(int state) | 640 PreferencesDialog::resampleOnLoadChanged(int state) |
629 { | 641 { |
630 m_resampleOnLoad = (state == Qt::Checked); | 642 m_resampleOnLoad = (state == Qt::Checked); |
643 m_applyButton->setEnabled(true); | |
644 m_changesOnRestart = true; | |
645 } | |
646 | |
647 void | |
648 PreferencesDialog::vampProcessSeparationChanged(int state) | |
649 { | |
650 m_runPluginsInProcess = (state == Qt::Unchecked); | |
631 m_applyButton->setEnabled(true); | 651 m_applyButton->setEnabled(true); |
632 m_changesOnRestart = true; | 652 m_changesOnRestart = true; |
633 } | 653 } |
634 | 654 |
635 void | 655 void |
745 prefs->setPropertyBoxLayout(Preferences::PropertyBoxLayout | 765 prefs->setPropertyBoxLayout(Preferences::PropertyBoxLayout |
746 (m_propertyLayout)); | 766 (m_propertyLayout)); |
747 prefs->setTuningFrequency(m_tuningFrequency); | 767 prefs->setTuningFrequency(m_tuningFrequency); |
748 prefs->setResampleQuality(m_resampleQuality); | 768 prefs->setResampleQuality(m_resampleQuality); |
749 prefs->setResampleOnLoad(m_resampleOnLoad); | 769 prefs->setResampleOnLoad(m_resampleOnLoad); |
770 prefs->setRunPluginsInProcess(m_runPluginsInProcess); | |
750 prefs->setShowSplash(m_showSplash); | 771 prefs->setShowSplash(m_showSplash); |
751 prefs->setTemporaryDirectoryRoot(m_tempDirRoot); | 772 prefs->setTemporaryDirectoryRoot(m_tempDirRoot); |
752 prefs->setBackgroundMode(Preferences::BackgroundMode(m_backgroundMode)); | 773 prefs->setBackgroundMode(Preferences::BackgroundMode(m_backgroundMode)); |
753 prefs->setTimeToTextMode(Preferences::TimeToTextMode(m_timeToTextMode)); | 774 prefs->setTimeToTextMode(Preferences::TimeToTextMode(m_timeToTextMode)); |
754 prefs->setShowHMS(m_showHMS); | 775 prefs->setShowHMS(m_showHMS); |