Skip to content

Commit

Permalink
Fix #302714: make chord symbol playback settings available in Edit St…
Browse files Browse the repository at this point in the history 
…yle dialog
  • Loading branch information
@IsaacWeiss
IsaacWeiss committed Mar 30, 2020
1 parent 1163513 commit 0780eb0
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 130 deletions.
51 changes: 44 additions & 7 deletions mscore/editstyle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
{ Sid::harmonyFretDist, false, harmonyFretDist, 0 },
{ Sid::minHarmonyDistance, false, minHarmonyDistance, 0 },
{ Sid::maxHarmonyBarDistance, false, maxHarmonyBarDistance, 0 },
{ Sid::harmonyPlay, false, harmonyPlay, 0 },
{ Sid::harmonyVoiceLiteral, false, voicingSelectWidget->interpretBox, 0 },
{ Sid::harmonyVoicing, false, voicingSelectWidget->voicingBox, 0 },
{ Sid::harmonyDuration, false, voicingSelectWidget->durationBox, 0 },

{ Sid::tupletVHeadDistance, false, tupletVHeadDistance, resetTupletVHeadDistance },
{ Sid::tupletVStemDistance, false, tupletVStemDistance, resetTupletVStemDistance },
Expand Down Expand Up @@ -420,6 +424,27 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
comboFBFont->setCurrentIndex(0);
connect(comboFBFont, SIGNAL(currentIndexChanged(int)), SLOT(on_comboFBFont_currentIndexChanged(int)));

// chord symbol init
harmonyPlay->setChecked(true);

voicingSelectWidget->interpretBox->clear();
voicingSelectWidget->interpretBox->addItem(tr("Jazz"), int(0));
voicingSelectWidget->interpretBox->addItem(tr("Literal"), int(1));

voicingSelectWidget->voicingBox->clear();
voicingSelectWidget->voicingBox->addItem(tr("Automatic"), int(Voicing::AUTO));
voicingSelectWidget->voicingBox->addItem(tr("Root Only"), int(Voicing::ROOT_ONLY));
voicingSelectWidget->voicingBox->addItem(tr("Close"), int(Voicing::CLOSE));
voicingSelectWidget->voicingBox->addItem(tr("Drop 2"), int(Voicing::DROP_2));
voicingSelectWidget->voicingBox->addItem(tr("Six Note"), int(Voicing::SIX_NOTE));
voicingSelectWidget->voicingBox->addItem(tr("Four Note"), int(Voicing::FOUR_NOTE));
voicingSelectWidget->voicingBox->addItem(tr("Three Note"), int(Voicing::THREE_NOTE));

voicingSelectWidget->durationBox->clear();
voicingSelectWidget->durationBox->addItem(tr("Until Next Chord Symbol"), int(HDuration::UNTIL_NEXT_CHORD_SYMBOL));
voicingSelectWidget->durationBox->addItem(tr("Until End of Measure"), int(HDuration::STOP_AT_MEASURE_END));
voicingSelectWidget->durationBox->addItem(tr("Chord/Rest Duration"), int(HDuration::SEGMENT_DURATION));

// keep in sync with implementation in Page::replaceTextMacros (page.cpp)
// jumping thru hoops here to make the job of translators easier, yet have a nice display
QString toolTipHeaderFooter
Expand Down Expand Up @@ -890,9 +915,16 @@ QVariant EditStyle::getValue(Sid idx)
return v;
}
else if (!strcmp("bool", type)) {
QVariant v = sw.widget->property("checked");
if (!v.isValid())
unhandledType(&sw);
QVariant v;
if (sw.idx == Sid::harmonyVoiceLiteral) {
QComboBox* cb = qobject_cast<QComboBox*>(sw.widget);
v = cb->currentIndex();
}
else {
v = sw.widget->property("checked");
if (!v.isValid())
unhandledType(&sw);
}
return v;
}
else if (!strcmp("int", type)) {
Expand Down Expand Up @@ -979,10 +1011,15 @@ void EditStyle::setValues()
unhandledType(&sw);
}
else if (!strcmp("bool", type)) {
if (!sw.widget->setProperty("checked", val))
unhandledType(&sw);
if (sw.idx == Sid::measureNumberSystem && !val.toBool())
showIntervalMeasureNumber->setChecked(true);
if (sw.idx == Sid::harmonyVoiceLiteral) {
voicingSelectWidget->interpretBox->setCurrentIndex(val.toBool()); // 0 = jazz, 1 = literal
}
else {
if (!sw.widget->setProperty("checked", val))
unhandledType(&sw);
if (sw.idx == Sid::measureNumberSystem && !val.toBool())
showIntervalMeasureNumber->setChecked(true);
}
}
else if (!strcmp("int", type)) {
if (qobject_cast<QComboBox*>(sw.widget)) {
Expand Down
251 changes: 128 additions & 123 deletions mscore/editstyle.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9191,8 +9191,122 @@
<property name="title">
<string>Chord Symbols</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_36">
<item>
<layout class="QGridLayout" name="gridLayout_46">
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_24">
<property name="title">
<string>Positioning</string>
</property>
<layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="0">
<widget class="QLabel" name="label_79">
<property name="text">
<string>Distance to fretboard diagram:</string>
</property>
<property name="buddy">
<cstring>harmonyFretDist</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_1001">
<property name="text">
<string>Minimum chord spacing:</string>
</property>
<property name="buddy">
<cstring>minHarmonyDistance</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="maxHarmonyBarDistance">
<property name="suffix">
<string>sp</string>
</property>
<property name="minimum">
<double>-50.000000000000000</double>
</property>
<property name="maximum">
<double>50.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
<property name="value">
<double>3.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_1002">
<property name="text">
<string>Maximum barline distance:</string>
</property>
<property name="buddy">
<cstring>maxHarmonyBarDistance</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="minHarmonyDistance">
<property name="suffix">
<string>sp</string>
</property>
<property name="minimum">
<double>-50.000000000000000</double>
</property>
<property name="maximum">
<double>10.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>0.500000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="harmonyFretDist">
<property name="enabled">
<bool>true</bool>
</property>
<property name="suffix">
<string extracomment="spatium unit">sp</string>
</property>
<property name="minimum">
<double>-10000.000000000000000</double>
</property>
<property name="maximum">
<double>10000.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
<property name="value">
<double>0.500000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="1">
<widget class="QGroupBox" name="harmonyPlay">
<property name="title">
<string>Play</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_47">
<item row="0" column="0">
<widget class="Ms::VoicingSelect" name="harmonyVoicingWidget" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_25">
<property name="title">
<string>Appearance</string>
Expand Down Expand Up @@ -9267,7 +9381,7 @@
</layout>
</widget>
</item>
<item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="formattingGroup">
<property name="title">
<string>Formatting</string>
Expand Down Expand Up @@ -9425,7 +9539,7 @@
</layout>
</widget>
</item>
<item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_23">
<property name="title">
<string>Note Spelling</string>
Expand Down Expand Up @@ -9547,119 +9661,7 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_24">
<property name="title">
<string>Positioning</string>
</property>
<layout class="QGridLayout" name="gridLayout_15">
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="minHarmonyDistance">
<property name="suffix">
<string>sp</string>
</property>
<property name="minimum">
<double>-50.000000000000000</double>
</property>
<property name="maximum">
<double>10.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>0.500000000000000</double>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_79">
<property name="text">
<string>Distance to fretboard diagram:</string>
</property>
<property name="buddy">
<cstring>harmonyFretDist</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="harmonyFretDist">
<property name="enabled">
<bool>true</bool>
</property>
<property name="suffix">
<string extracomment="spatium unit">sp</string>
</property>
<property name="minimum">
<double>-10000.000000000000000</double>
</property>
<property name="maximum">
<double>10000.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
<property name="value">
<double>0.500000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_1001">
<property name="text">
<string>Minimum chord spacing:</string>
</property>
<property name="buddy">
<cstring>minHarmonyDistance</cstring>
</property>
</widget>
</item>
<item row="2" column="5">
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_1002">
<property name="text">
<string>Maximum barline distance:</string>
</property>
<property name="buddy">
<cstring>maxHarmonyBarDistance</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="maxHarmonyBarDistance">
<property name="suffix">
<string>sp</string>
</property>
<property name="minimum">
<double>-50.000000000000000</double>
</property>
<property name="maximum">
<double>50.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
<property name="value">
<double>3.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_27">
<property name="title">
<string extracomment="Capodastro">Capo</string>
Expand Down Expand Up @@ -10201,8 +10203,7 @@
<number>0</number>
</property>
<item row="0" column="1">
<widget class="Awl::ColorLabel" name="textStyleFrameForeground">
</widget>
<widget class="Awl::ColorLabel" name="textStyleFrameForeground"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_205">
Expand Down Expand Up @@ -10287,8 +10288,7 @@
<widget class="QDoubleSpinBox" name="textStyleFramePadding"/>
</item>
<item row="1" column="1">
<widget class="Awl::ColorLabel" name="textStyleFrameBackground">
</widget>
<widget class="Awl::ColorLabel" name="textStyleFrameBackground"/>
</item>
<item row="3" column="2">
<widget class="QToolButton" name="resetTextStyleFramePadding">
Expand Down Expand Up @@ -10348,8 +10348,7 @@
</widget>
</item>
<item row="6" column="1">
<widget class="Awl::ColorLabel" name="textStyleColor">
</widget>
<widget class="Awl::ColorLabel" name="textStyleColor"/>
</item>
<item row="7" column="1">
<widget class="Ms::OffsetSelect" name="textStyleOffset" native="true"/>
Expand Down Expand Up @@ -10532,6 +10531,12 @@
<header>inspector/offsetSelect.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>Ms::VoicingSelect</class>
<extends>QWidget</extends>
<header>inspector/voicingSelect.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>pageList</tabstop>
Expand Down

0 comments on commit 0780eb0

Please sign in to comment.