support for adding markers #123

panels/project.cpp

@@ -778,8 +778,18 @@ bool Project::load_worker(QFile& f, QXmlStreamReader& stream, int type) {
                             // load all clips and clip information
                             while (!(stream.name() == child_search && stream.isEndElement()) && !stream.atEnd()) {
                                 stream.readNextStartElement();
-                                if (stream.name() == "clip" && stream.isStartElement()) {
-                                    //<clip id="0" name="Brock_Drying_Pan.gif" clipin="0" in="44" out="144" track="-1" r="192" g="128" b="128" media="2" stream="0">
+								if (stream.name() == "marker" && stream.isStartElement()) {
+									Marker m;
+									for (int j=0;j<stream.attributes().size();j++) {
+										const QXmlStreamAttribute& attr = stream.attributes().at(j);
+										if (attr.name() == "frame") {
+											m.frame = attr.value().toLong();
+										} else if (attr.name() == "name") {
+											m.name = attr.value().toString();
+										}
+									}
+									s->markers.append(m);
+								} else if (stream.name() == "clip" && stream.isStartElement()) {
                                     int media_id, stream_id;
                                     Clip* c = new Clip(s);
 
@@ -1147,6 +1157,12 @@ void Project::save_folder(QXmlStreamWriter& stream, QTreeWidgetItem* parent, int
                                 stream.writeEndElement(); // clip
                             }
                         }
+						for (int j=0;j<s->markers.size();j++) {
+							stream.writeStartElement("marker");
+							stream.writeAttribute("frame", QString::number(s->markers.at(j).frame));
+							stream.writeAttribute("name", s->markers.at(j).name);
+							stream.writeEndElement();
+						}
                         stream.writeEndElement();
                     }
                 }

panels/timeline.cpp

@@ -24,6 +24,7 @@
 #include <QScreen>
 #include <QPainter>
 #include <QMenu>
+#include <QInputDialog>
 
 long refactor_frame_number(long framenumber, double source_frame_rate, double target_frame_rate) {
     if (source_frame_rate == target_frame_rate) return framenumber;
@@ -1092,18 +1093,12 @@ void Timeline::snap_to_clip(long* l, bool playhead_inclusive) {
 }
 
 void Timeline::set_marker() {
-	/* TODO make undoable */
-	bool found = false;
-	for (int i=0;i<sequence->markers.size();i++) {
-		if (sequence->markers.at(i).frame == sequence->playhead) {
-			found = true;
-			break;
-		}
-	}
-	if (!found) {
-		Marker m;
-		m.frame = sequence->playhead;
-		sequence->markers.append(m);
+	QInputDialog d(this);
+	d.setWindowTitle("Set Marker");
+	d.setLabelText("Set marker name:");
+	d.setInputMode(QInputDialog::TextInput);
+	if (d.exec() == QDialog::Accepted) {
+		undo_stack.push(new AddMarkerAction(sequence, sequence->playhead, d.textValue()));
 	}
 }