project/patches/Remove_the_way_to_make_face_tags_into_normal_tags.patch

0001 diff --git a/core/libs/tags/widgets/tagfolderview.cpp b/core/libs/tags/widgets/tagfolderview.cpp
0002 index cfe5950aa8..7cf5187f8b 100644
0003 --- a/core/libs/tags/widgets/tagfolderview.cpp
0004 +++ b/core/libs/tags/widgets/tagfolderview.cpp
0005 @@ -292,25 +292,24 @@ void TagFolderView::setContexMenuItems(ContextMenuHelper& cmh, const QList<TAlbu
0006      cmh.addExportMenu();
0007      cmh.addSeparator();
0008
0009 -//    if (d->showDeleteFaceTagsAction)
0010 -//    {
0011 -//        cmh.addActionDeleteFaceTags(tagModificationHelper(), albums);
0012 -//    }
0013 -//    else
0014 -//    {
0015 -//        cmh.addActionDeleteTags(tagModificationHelper(), albums);
0016 -//        // If one of the selected tags is no face tag, add the action to mark them as face tags.
0017 -//        foreach (TAlbum* const tag, albums)
0018 -//        {
0019 -//            if (!FaceTags::isPerson(tag->id()))
0020 -//            {
0021 -//                cmh.addSeparator();
0022 -//                cmh.addActionTagToFaceTag(tagModificationHelper(), tag);
0023 -//                break;
0024 -//            }
0025 -//        }
0026 -//    }
0027 -    cmh.addActionDeleteTags(tagModificationHelper(), albums);
0028 +    if (d->showDeleteFaceTagsAction)
0029 +    {
0030 +        cmh.addActionDeleteFaceTags(tagModificationHelper(), albums);
0031 +    }
0032 +    else
0033 +    {
0034 +        cmh.addActionDeleteTags(tagModificationHelper(), albums);
0035 +        // If one of the selected tags is no face tag, add the action to mark them as face tags.
0036 +        foreach (TAlbum* const tag, albums)
0037 +        {
0038 +            if (!FaceTags::isPerson(tag->id()))
0039 +            {
0040 +                cmh.addSeparator();
0041 +                cmh.addActionTagToFaceTag(tagModificationHelper(), tag);
0042 +                break;
0043 +            }
0044 +        }
0045 +    }
0046
0047      cmh.addSeparator();
0048  }