diff options
Diffstat (limited to 'src/gui/editors')
| -rw-r--r-- | src/gui/editors/eventlist/EventView.cpp | 6 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotationView.cpp | 2 | ||||
| -rw-r--r-- | src/gui/editors/notation/NoteCharacterNames.cpp | 6 | ||||
| -rw-r--r-- | src/gui/editors/notation/NoteCharacterNames.h | 6 | ||||
| -rw-r--r-- | src/gui/editors/notation/NoteStyle.cpp | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index d7f874b..b1f7f87 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -203,7 +203,7 @@ EventView::EventView(RosegardenGUIDoc *doc, std::string timing = rec->getDefaultTimeAdjust(); if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE) { adjust->setCurrentItem(0); - } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) { + } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) { adjust->setCurrentItem(3); } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_START) { adjust->setCurrentItem(1); @@ -744,7 +744,7 @@ EventView::slotEditTriggerVelocity() void EventView::slotTriggerTimeAdjustChanged(int option) { - std::string adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH; + std::string adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH; switch (option) { @@ -758,7 +758,7 @@ EventView::slotTriggerTimeAdjustChanged(int option) adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_END; break; case 3: - adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH; + adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH; break; default: diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index a9bfc4c..7c9f498 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -6055,7 +6055,7 @@ NotationView::slotMakeOrnament() style->getName(), getDocument()->getComposition().getNextTriggerSegmentId(), true, - BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH, + BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH, Marks::NoMark)); //!!! addCommandToHistory(command); diff --git a/src/gui/editors/notation/NoteCharacterNames.cpp b/src/gui/editors/notation/NoteCharacterNames.cpp index fb4f96e..bcd450c 100644 --- a/src/gui/editors/notation/NoteCharacterNames.cpp +++ b/src/gui/editors/notation/NoteCharacterNames.cpp @@ -45,8 +45,8 @@ const CharName SEMIBREVIS_WHITE = "MUSICAL SYMBOL SEMIBREVIS WHITE"; const CharName SEMIBREVIS_BLACK = "MUSICAL SYMBOL SEMIBREVIS BLACK"; const CharName TRIANGLE_NOTEHEAD_UP_WHITE = "MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE"; const CharName TRIANGLE_NOTEHEAD_UP_BLACK = "MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK"; -const CharName STQUARE_NOTEHEAD_WHITE = "MUSICAL SYMBOL STQUARE NOTEHEAD WHITE"; -const CharName STQUARE_NOTEHEAD_BLACK = "MUSICAL SYMBOL STQUARE NOTEHEAD BLACK"; +const CharName SQUARE_NOTEHEAD_WHITE = "MUSICAL SYMBOL SQUARE NOTEHEAD WHITE"; +const CharName SQUARE_NOTEHEAD_BLACK = "MUSICAL SYMBOL SQUARE NOTEHEAD BLACK"; // These two names are not valid Unicode names. They describe flags // that should be used to compose multi-flag notes, rather than used @@ -70,7 +70,7 @@ const CharName WHOLE_REST = "MUSICAL SYMBOL WHOLE REST"; // Unicode-4 glyph 1D13 const CharName WHOLE_REST_ON_STAFF = "MUSICAL SYMBOL WHOLE REST ON STAFF"; const CharName HALF_REST = "MUSICAL SYMBOL HALF REST"; // Unicode-4 glyph 1D13C const CharName HALF_REST_ON_STAFF = "MUSICAL SYMBOL HALF REST ON STAFF"; -const CharName TQUARTER_REST = "MUSICAL SYMBOL TQUARTER REST"; +const CharName QUARTER_REST = "MUSICAL SYMBOL QUARTER REST"; const CharName EIGHTH_REST = "MUSICAL SYMBOL EIGHTH REST"; const CharName SIXTEENTH_REST = "MUSICAL SYMBOL SIXTEENTH REST"; const CharName THIRTY_SECOND_REST = "MUSICAL SYMBOL THIRTY-SECOND REST"; diff --git a/src/gui/editors/notation/NoteCharacterNames.h b/src/gui/editors/notation/NoteCharacterNames.h index be062df..9022ecd 100644 --- a/src/gui/editors/notation/NoteCharacterNames.h +++ b/src/gui/editors/notation/NoteCharacterNames.h @@ -49,8 +49,8 @@ extern const CharName SEMIBREVIS_WHITE; extern const CharName SEMIBREVIS_BLACK; extern const CharName TRIANGLE_NOTEHEAD_UP_WHITE; extern const CharName TRIANGLE_NOTEHEAD_UP_BLACK; -extern const CharName STQUARE_NOTEHEAD_WHITE; -extern const CharName STQUARE_NOTEHEAD_BLACK; +extern const CharName SQUARE_NOTEHEAD_WHITE; +extern const CharName SQUARE_NOTEHEAD_BLACK; extern const CharName FLAG_PARTIAL; extern const CharName FLAG_PARTIAL_FINAL; @@ -66,7 +66,7 @@ extern const CharName WHOLE_REST; extern const CharName WHOLE_REST_ON_STAFF; extern const CharName HALF_REST; extern const CharName HALF_REST_ON_STAFF; -extern const CharName TQUARTER_REST; +extern const CharName QUARTER_REST; extern const CharName EIGHTH_REST; extern const CharName SIXTEENTH_REST; extern const CharName THIRTY_SECOND_REST; diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp index 1e316fd..0b3332d 100644 --- a/src/gui/editors/notation/NoteStyle.cpp +++ b/src/gui/editors/notation/NoteStyle.cpp @@ -225,8 +225,8 @@ NoteStyle::getNoteHeadCharName(Note::Type type) } else if (desc.shape == Rectangle) { - name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK - : NoteCharacterNames::STQUARE_NOTEHEAD_WHITE; + name = desc.filled ? NoteCharacterNames::SQUARE_NOTEHEAD_BLACK + : NoteCharacterNames::SQUARE_NOTEHEAD_WHITE; } else if (desc.shape == Number) { @@ -327,7 +327,7 @@ NoteStyle::getRestCharName(Note::Type type, bool restOutsideStave) case Note::Quaver: return NoteCharacterNames::EIGHTH_REST; case Note::Crotchet: - return NoteCharacterNames::TQUARTER_REST; + return NoteCharacterNames::QUARTER_REST; case Note::Minim: return restOutsideStave ? NoteCharacterNames::HALF_REST |