Skip to content
Snippets Groups Projects
Commit 14dd897e authored by SeeLook's avatar SeeLook :musical_note:
Browse files

Taction for transpose main score

parent a8667de2
No related branches found
No related tags found
No related merge requests found
Pipeline #3826 skipped
......@@ -73,6 +73,7 @@ TmainScoreObject::TmainScoreObject(QObject* parent) :
m_zoomOutAct = new Taction(tr("Zoom score out"), QStringLiteral("zoom-out"), this);
m_zoomInAct = new Taction(tr("Zoom score in"), QStringLiteral("zoom-in"), this);
m_transposeAct = new Taction(tr("Transpose"), QStringLiteral("transpose"), this);
m_playAct = new Taction(qTR("TtoolBar", "Play"), QStringLiteral("playMelody"), this);
m_playAct->setBgColor(QColor(0, 255, 0));
......@@ -159,7 +160,8 @@ void TmainScoreObject::setScoreObject(TscoreObject* scoreObj) {
m_scoreObj->clearScoreAct()->setBgColor(QColor(255, 140, 0)); // orange
#if !defined (Q_OS_ANDROID)
m_scoreActions.prepend(m_scoreObj->editModeAct());
m_scoreActions << m_scoreObj->insertNoteAct() << m_scoreObj->deleteNoteAct() << m_scoreObj->clearScoreAct() << m_notesMenuAct;
m_scoreActions << m_scoreObj->insertNoteAct() << m_scoreObj->deleteNoteAct()
<< m_scoreObj->clearScoreAct() << m_transposeAct << m_notesMenuAct;
#else
m_scoreActions << m_randMelodyAct << m_openXmlAct << m_saveXmlAct;
#endif
......@@ -583,7 +585,8 @@ void TmainScoreObject::isExamChangedSlot() {
if (m_scoreObj) {
#if !defined (Q_OS_ANDROID)
m_scoreActions.prepend(m_scoreObj->editModeAct());
m_scoreActions << m_scoreObj->insertNoteAct() << m_scoreObj->deleteNoteAct() << m_scoreObj->clearScoreAct() << m_notesMenuAct;
m_scoreActions << m_scoreObj->insertNoteAct() << m_scoreObj->deleteNoteAct()
<< m_scoreObj->clearScoreAct() << m_transposeAct << m_notesMenuAct;
#else
if (!GLOB->isExam())
m_scoreActions << m_randMelodyAct << m_openXmlAct << m_saveXmlAct;
......
......@@ -63,6 +63,7 @@ class TmainScoreObject : public QObject
Q_PROPERTY(Taction* saveXmlAct READ saveXmlAct)
Q_PROPERTY(Taction* randMelodyAct READ randMelodyAct)
Q_PROPERTY(Taction* notesMenuAct READ notesMenuAct)
Q_PROPERTY(Taction* transposeAct READ transposeAct)
Q_PROPERTY(QList<QObject*> melodyActions READ melodyActions NOTIFY melodyActionsChanged)
Q_PROPERTY(QString keyNameText READ keyNameText NOTIFY keyNameTextChanged)
Q_PROPERTY(QQuickItem* mainScoreItem READ mainScoreItem WRITE setMainScoreItem)
......@@ -86,6 +87,7 @@ public:
Taction* nextNoteAct() { return m_nextNoteAct; }
Taction* prevNoteAct() { return m_prevNoteAct; }
Taction* transposeAct() { return m_transposeAct; }
Taction* playAct() { return m_playAct; }
Taction* openXmlAct() { return m_openXmlAct; }
......@@ -198,6 +200,7 @@ private:
Taction *m_playAct;
Taction *m_showNamesAct, *m_extraAccidsAct;
Taction *m_zoomOutAct, *m_zoomInAct;
Taction *m_transposeAct;
Taction *m_openXmlAct, *m_saveXmlAct, *m_randMelodyAct;
Taction *m_nextNoteAct, *m_prevNoteAct;
Taction *m_notesMenuAct = nullptr;
......
......@@ -18,6 +18,7 @@ Score {
property alias extraAccidsAct: mainObj.extraAccidsAct
property alias zoomInAct: mainObj.zoomInAct
property alias zoomOutAct: mainObj.zoomOutAct
property alias transposeAct: mainObj.transposeAct
property alias openXmlAct: mainObj.openXmlAct
property alias saveXmlAct: mainObj.saveXmlAct
property alias playAct: mainObj.playAct
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment