fix #33896

musescore · Nov 23, 2014 · 5382ede · 5382ede
1 parent d5b29fd
commit 5382ede
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 28 deletions.
diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -1916,20 +1916,6 @@ TimeSigMap* Score::sigmap() const
       return rootScore()->_sigmap;
       }
 
-//---------------------------------------------------------
-//   metaTags
-//---------------------------------------------------------
-
-const QMap<QString, QString>& Score::metaTags() const
-      {
-      return _metaTags;
-      }
-
-QMap<QString, QString>& Score::metaTags()
-      {
-      return _metaTags;
-      }
-
 //---------------------------------------------------------
 //   metaTag
 //---------------------------------------------------------

diff --git a/libmscore/score.h b/libmscore/score.h
@@ -891,8 +891,10 @@ class Score : public QObject {
       QByteArray readToBuffer();
       void writeSegments(Xml& xml, int strack, int etrack, Segment* first, Segment* last, bool, bool, bool);
 
-      const QMap<QString, QString>& metaTags() const;
-      QMap<QString, QString>& metaTags();
+      const QMap<QString, QString>& metaTags() const   { return _metaTags; }
+      QMap<QString, QString>& metaTags()               { return _metaTags; }
+      void setMetaTags(const QMap<QString,QString>& t) { _metaTags = t; }
+
       Q_INVOKABLE QString metaTag(const QString& s) const;
       Q_INVOKABLE void setMetaTag(const QString& tag, const QString& val);
 

diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -3853,4 +3853,15 @@ void ChangeLayoutMode::flip()
       score->setLayoutAll(true);
       }
 
+//---------------------------------------------------------
+//   ChangeMetaTags::flip
+//---------------------------------------------------------
+
+void ChangeMetaTags::flip()
+      {
+      QMap<QString,QString> t = score->metaTags();
+      score->setMetaTags(metaTags);
+      metaTags = t;
+      }
+
 }
diff --git a/libmscore/undo.h b/libmscore/undo.h
@@ -1442,6 +1442,21 @@ class ChangeLayoutMode : public UndoCommand {
       UNDO_NAME("ChangeLayoutMode")
       };
 
+//---------------------------------------------------------
+//   ChangeMetaTags
+//---------------------------------------------------------
+
+class ChangeMetaTags : public UndoCommand {
+      Score* score;
+      QMap<QString,QString> metaTags;
+
+      void flip();
+
+   public:
+      ChangeMetaTags(Score* s, const QMap<QString,QString>& m) : score(s), metaTags(m) {}
+      UNDO_NAME("ChangeMetaTags")
+      };
+
 
 }     // namespace Ms
 #endif

diff --git a/mscore/metaedit.cpp b/mscore/metaedit.cpp
@@ -34,6 +34,7 @@ MetaEditDialog::MetaEditDialog(Score* s, QWidget* parent)
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       score = s;
+      dirty = false;
 
       level->setValue(score->mscVersion());
       version->setText(score->mscoreVersion());
@@ -43,10 +44,10 @@ MetaEditDialog::MetaEditDialog(Score* s, QWidget* parent)
       QMapIterator<QString, QString> i(s->metaTags());
       while (i.hasNext()) {
             i.next();
-            // xml.tag(QString("metaTag name=\"%1\"").arg(i.key()), i.value());
             QLabel* label = new QLabel;
             label->setText(i.key());
             QLineEdit* text = new QLineEdit(i.value(), 0);
+            connect(text, SIGNAL(textChanged(const QString&)), SLOT(setDirty()));
             grid->addWidget(label, idx, 0);
             grid->addWidget(text, idx, 1);
             ++idx;
@@ -72,6 +73,7 @@ void MetaEditDialog::newClicked()
             grid->addWidget(label, idx, 0);
             grid->addWidget(text, idx, 1);
             }
+      dirty = true;
       }
 
 //---------------------------------------------------------
@@ -80,17 +82,17 @@ void MetaEditDialog::newClicked()
 
 void MetaEditDialog::accept()
       {
-      int idx = grid->rowCount();
-
-      QMap<QString, QString>& m(score->metaTags());
-      m.clear();
-
-      for (int i = 0; i < idx; ++i) {
-            QLayoutItem* labelItem = grid->itemAtPosition(i, 0);
-            QLayoutItem* dataItem  = grid->itemAtPosition(i, 1);
-            QLabel* label = static_cast<QLabel*>(labelItem->widget());
-            QLineEdit* le = static_cast<QLineEdit*>(dataItem->widget());
-            m.insert(label->text(), le->text());
+      if (dirty) {
+            int idx = grid->rowCount();
+            QMap<QString, QString> m;
+            for (int i = 0; i < idx; ++i) {
+                  QLayoutItem* labelItem = grid->itemAtPosition(i, 0);
+                  QLayoutItem* dataItem  = grid->itemAtPosition(i, 1);
+                  QLabel* label = static_cast<QLabel*>(labelItem->widget());
+                  QLineEdit* le = static_cast<QLineEdit*>(dataItem->widget());
+                  m.insert(label->text(), le->text());
+                  }
+            score->undo(new ChangeMetaTags(score, m));
             }
       QDialog::accept();
       }

diff --git a/mscore/metaedit.h b/mscore/metaedit.h
@@ -36,8 +36,11 @@ class MetaEditDialog : public QDialog, public Ui::MetaEditDialog {
 
       Score* score;
 
+      bool dirty;
+
    private slots:
       void newClicked();
+      void setDirty() { dirty = true; }
 
    public slots:
       virtual void accept();