Warning, /graphics/digikam/project/patches/Remove_Mark_as_Face_tag_action_Replace_Remove_face_tag_with_Delete.patch is written in an unsupported language. File is not indexed.
0001 diff --git a/core/libs/tags/widgets/tagfolderview.cpp b/core/libs/tags/widgets/tagfolderview.cpp 0002 index ecf960cb20..2ab64647f2 100644 0003 --- a/core/libs/tags/widgets/tagfolderview.cpp 0004 +++ b/core/libs/tags/widgets/tagfolderview.cpp 0005 @@ -144,14 +144,24 @@ void TagFolderView::addCustomContextMenuActions(ContextMenuHelper& cmh, Album* a 0006 cmh.addExportMenu(); 0007 cmh.addSeparator(); 0008 0009 - if (tag->id() != FaceTags::unconfirmedPersonTagId() && 0010 - tag->id() != FaceTags::unknownPersonTagId()) 0011 + if (d->showDeleteFaceTagsAction) 0012 + { 0013 + cmh.addActionDeleteFaceTag(tagModificationHelper(), tag); 0014 + cmh.addSeparator(); 0015 + } 0016 + else 0017 { 0018 cmh.addActionDeleteTag(tagModificationHelper(), tag); 0019 cmh.addSeparator(); 0020 - cmh.addActionEditTag(tagModificationHelper(), tag); 0021 + // If the tag is no face tag, add the option to set it as face tag. 0022 + if (!FaceTags::isPerson(tag->id()) && !tag->isRoot()) 0023 + { 0024 + cmh.addActionTagToFaceTag(tagModificationHelper(), tag); 0025 + } 0026 } 0027 0028 + cmh.addActionEditTag(tagModificationHelper(), tag); 0029 + 0030 connect(&cmh, SIGNAL(signalAddNewTagFromABCMenu(QString)), 0031 this, SLOT(slotTagNewFromABCMenu(QString))); 0032