diff --git a/src/GuiPreferencesDialog.cpp b/src/GuiPreferencesDialog.cpp index 34d1ea4..ad12dfb 100644 --- a/src/GuiPreferencesDialog.cpp +++ b/src/GuiPreferencesDialog.cpp @@ -133,6 +133,8 @@ void GuiPreferencesOptionPage::init(CSong* song, CSettings* settings, CGLView * bool GuiPreferencesOptionPage::apply() { + Cfg::experimentalNoteLength = ui()->showNoteLengthCheck->isChecked(); + m_settings->setValue("Score/ShowNoteLength", Cfg::experimentalNoteLength); m_song->cfg_timingMarkersFlag = ui()->timingMarkersCheck->isChecked(); m_settings->setValue("Score/TimingMarkers", m_song->cfg_timingMarkersFlag ); m_settings->setNoteNamesEnabled( ui()->showNoteNamesCheck->isChecked()); @@ -149,6 +151,7 @@ bool GuiPreferencesOptionPage::apply() void GuiPreferencesOptionPage::reset() { + ui()->showNoteLengthCheck->setChecked(Cfg::experimentalNoteLength); ui()->timingMarkersCheck->setChecked(m_song->cfg_timingMarkersFlag); ui()->showNoteNamesCheck->setChecked(m_settings->isNoteNamesEnabled()); ui()->courtesyAccidentalsCheck->setChecked(m_settings->displayCourtesyAccidentals()); diff --git a/src/GuiPreferencesDialog.ui b/src/GuiPreferencesDialog.ui index 96a1507..2755d88 100644 --- a/src/GuiPreferencesDialog.ui +++ b/src/GuiPreferencesDialog.ui @@ -26,37 +26,17 @@ - - + + - Courtesy Accidentals + Show Note Names - - - - - 0 - 0 - - - - QComboBox::AdjustToContents - - - - - - - Follow stop point: - - - - - + + - Qt::Horizontal + Qt::Orientation::Horizontal @@ -66,10 +46,40 @@ + + + + Follow Through Errors + + + + + + + Show color coded notes on the score + + + Color Coded Notes + + + - Qt::Horizontal + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal @@ -92,68 +102,72 @@ - - + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + - Show Note Names + Follow stop point: - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - Follow Through Errors + Courtesy Accidentals + + + + + + + + 0 + 0 + + + + QComboBox::SizeAdjustPolicy::AdjustToContents - - - Show color coded notes on the score - + - Color Coded Notes + Show note length - - - Qt::Horizontal + + + (experimental) - - - 40 - 20 - - - + diff --git a/src/QtWindow.cpp b/src/QtWindow.cpp index 9fb452a..94d520e 100644 --- a/src/QtWindow.cpp +++ b/src/QtWindow.cpp @@ -155,6 +155,7 @@ QtWindow::QtWindow(CSettings *settings, QtUtilities::QtSettings *qtSettings, QWi m_song->setLatencyFix(m_settings->value("Midi/Latency", 0).toInt()); + Cfg::experimentalNoteLength = m_settings->value("Score/ShowNoteLength", Cfg::experimentalNoteLength).toBool(); m_song->cfg_timingMarkersFlag = m_settings->value("Score/TimingMarkers", m_song->cfg_timingMarkersFlag ).toBool(); m_song->cfg_stopPointMode = static_cast (m_settings->value("Score/StopPointMode", m_song->cfg_stopPointMode ).toInt()); m_song->cfg_rhythmTapping = static_cast (m_settings->value("Score/RtyhemTappingMode", m_song->cfg_rhythmTapping ).toInt());