X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcommands%2Faddmarkercommand.cpp;h=46a7d9c17364f344a7d0b793d88e66be02d742b7;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=bc6d73207d874b55f167ede86b9f01a4b3b1a52c;hpb=020035a721ab682e4171443afaf10b5efa189586;p=kdenlive diff --git a/src/commands/addmarkercommand.cpp b/src/commands/addmarkercommand.cpp index bc6d7320..46a7d9c1 100644 --- a/src/commands/addmarkercommand.cpp +++ b/src/commands/addmarkercommand.cpp @@ -21,28 +21,29 @@ #include -AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent) : +AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const CommentedTime &oldMarker, const CommentedTime &newMarker, const QString &id, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), - m_oldcomment(oldcomment), - m_comment(comment), - m_id(id), - m_pos(pos) + m_oldMarker(oldMarker), + m_newMarker(newMarker), + m_id(id) { - if (m_comment.isEmpty()) setText(i18n("Delete marker")); - else if (m_oldcomment.isEmpty()) setText(i18n("Add marker")); - else setText(i18n("Edit marker")); + if (m_newMarker.markerType() < 0) + setText(i18n("Delete marker")); + else if (m_oldMarker.comment().isEmpty()) + setText(i18n("Add marker")); + else + setText(i18n("Edit marker")); } - // virtual void AddMarkerCommand::undo() { - m_view->addMarker(m_id, m_pos, m_oldcomment); + m_view->addMarker(m_id, m_oldMarker); } // virtual void AddMarkerCommand::redo() { - m_view->addMarker(m_id, m_pos, m_comment); + m_view->addMarker(m_id, m_newMarker); }