Commit 24505f36 authored by Maik Qualmann's avatar Maik Qualmann

revert Remove "Mark as Face tag" action. Replace "Remove face tag" with "Delete

parent 3e403c56
Pipeline #10652 failed with stage
in 60 minutes
......@@ -144,14 +144,24 @@ void TagFolderView::addCustomContextMenuActions(ContextMenuHelper& cmh, Album* a
cmh.addExportMenu();
cmh.addSeparator();
if (tag->id() != FaceTags::unconfirmedPersonTagId() &&
tag->id() != FaceTags::unknownPersonTagId())
if (d->showDeleteFaceTagsAction)
{
cmh.addActionDeleteFaceTag(tagModificationHelper(), tag);
cmh.addSeparator();
}
else
{
cmh.addActionDeleteTag(tagModificationHelper(), tag);
cmh.addSeparator();
cmh.addActionEditTag(tagModificationHelper(), tag);
// If the tag is no face tag, add the option to set it as face tag.
if (!FaceTags::isPerson(tag->id()) && !tag->isRoot())
{
cmh.addActionTagToFaceTag(tagModificationHelper(), tag);
}
}
cmh.addActionEditTag(tagModificationHelper(), tag);
connect(&cmh, SIGNAL(signalAddNewTagFromABCMenu(QString)),
this, SLOT(slotTagNewFromABCMenu(QString)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment