tdf#150604 related: Label Navigator context menu delete entry

specific to the content entry type

Change-Id: I44ff745d8e61bcf24fee351cfa4148ae3ad31dcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139628
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

2 files changed, 190 insertions, 39 deletions

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 4db128600edc..68691799573f 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1564,7 +1564,17 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
     bool bRemoveCopyEntry = true;
     bool bRemoveEditEntry = true;
     bool bRemoveUnprotectEntry = true;
-    bool bRemoveDeleteEntry = true;
+    bool bRemoveDeleteChapterEntry = true,
+         bRemoveDeleteTableEntry = true,
+         bRemoveDeleteFrameEntry = true,
+         bRemoveDeleteImageEntry = true,
+         bRemoveDeleteOLEObjectEntry = true,
+         bRemoveDeleteBookmarkEntry = true,
+         bRemoveDeleteHyperlinkEntry = true,
+         bRemoveDeleteIndexEntry= true,
+         bRemoveDeleteCommentEntry = true,
+         bRemoveDeleteDrawingObjectEntry = true,
+         bRemoveDeleteFieldEntry = true;
     bool bRemoveRenameEntry = true;
     bool bRemoveSelectEntry = true;
     bool bRemoveToggleExpandEntry = true;
@@ -1692,7 +1702,47 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
                      ContentTypeId::REGION == nContentType ||
                      ContentTypeId::INDEX == nContentType ||
                      ContentTypeId::DRAWOBJECT == nContentType);
-
+            // Choose which Delete entry to show.
+            if (bDeletable)
+            {
+                switch (nContentType)
+                {
+                    case ContentTypeId::OUTLINE:
+                        bRemoveDeleteChapterEntry = false;
+                    break;
+                    case ContentTypeId::TABLE:
+                        bRemoveDeleteTableEntry = false;
+                    break;
+                    case ContentTypeId::FRAME:
+                        bRemoveDeleteFrameEntry = false;
+                    break;
+                    case ContentTypeId::GRAPHIC:
+                        bRemoveDeleteImageEntry = false;
+                    break;
+                    case ContentTypeId::OLE:
+                        bRemoveDeleteOLEObjectEntry = false;
+                    break;
+                    case ContentTypeId::BOOKMARK:
+                        bRemoveDeleteBookmarkEntry = false;
+                    break;
+                    case ContentTypeId::URLFIELD:
+                        bRemoveDeleteHyperlinkEntry = false;
+                    break;
+                    case ContentTypeId::INDEX:
+                        bRemoveDeleteIndexEntry = false;
+                    break;
+                    case ContentTypeId::POSTIT:
+                        bRemoveDeleteCommentEntry = false;
+                    break;
+                    case ContentTypeId::DRAWOBJECT:
+                        bRemoveDeleteDrawingObjectEntry = false;
+                    break;
+                    case ContentTypeId::TEXTFIELD:
+                        bRemoveDeleteFieldEntry = false;
+                    break;
+                    default: break;
+                }
+            }
             if (ContentTypeId::FOOTNOTE == nContentType || ContentTypeId::ENDNOTE == nContentType)
             {
                 void* pUserData = weld::fromId<void*>(m_xTreeView->get_id(*xEntry));
@@ -1713,7 +1763,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
                 }
                 bRemoveCopyEntry = false;
             }
-            else if (!bReadonly && (bEditable || bDeletable))
+            else if (!bReadonly && bEditable)
             {
                 if(ContentTypeId::INDEX == nContentType)
                 {
@@ -1724,7 +1774,6 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
                         bRemoveEditEntry = false;
 
                     xPop->set_active(OString::number(405), SwEditShell::IsTOXBaseReadonly(*pBase));
-                    bRemoveDeleteEntry = false;
                 }
                 else if(ContentTypeId::TABLE == nContentType)
                 {
@@ -1736,31 +1785,14 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
                     bool bProt = m_pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
                     xPop->set_sensitive(OString::number(403), !bFull);
                     xPop->set_sensitive(OString::number(404), bProt);
-                    bRemoveDeleteEntry = false;
-                }
-                else if(ContentTypeId::DRAWOBJECT == nContentType)
-                {
-                    bRemoveDeleteEntry = false;
                 }
                 else if(ContentTypeId::REGION == nContentType)
                 {
                     bRemoveSelectEntry = false;
                     bRemoveEditEntry = false;
                 }
-                else
-                {
-                    if (bEditable && bDeletable)
-                    {
-                        bRemoveEditEntry = false;
-                        bRemoveDeleteEntry = false;
-                    }
-                    else if (bEditable)
-                        bRemoveEditEntry = false;
-                    else if (bDeletable)
-                    {
-                        bRemoveDeleteEntry = false;
-                    }
-                }
+                else if (bEditable)
+                    bRemoveEditEntry = false;
                 //Rename object
                 if (bRenamable)
                     bRemoveRenameEntry = false;
@@ -1807,7 +1839,6 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
 
     if (bRemoveChapterEntries)
     {
-        xPop->remove(OString::number(806));
         xPop->remove(OString::number(801));
         xPop->remove(OString::number(802));
         xPop->remove(OString::number(803));
@@ -1824,8 +1855,41 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
         xPop->remove(OString::number(602));
     }
 
-    if (bRemoveDeleteEntry)
-        xPop->remove(OString::number(501));
+    if (bRemoveDeleteChapterEntry)
+        xPop->remove("deletechapter");
+    if (bRemoveDeleteTableEntry)
+        xPop->remove("deletetable");
+    if (bRemoveDeleteFrameEntry)
+        xPop->remove("deleteframe");
+    if (bRemoveDeleteImageEntry)
+        xPop->remove("deleteimage");
+    if (bRemoveDeleteOLEObjectEntry)
+        xPop->remove("deleteoleobject");
+    if (bRemoveDeleteBookmarkEntry)
+        xPop->remove("deletebookmark");
+    if (bRemoveDeleteHyperlinkEntry)
+        xPop->remove("deletehyperlink");
+    if (bRemoveDeleteIndexEntry)
+        xPop->remove("deleteindex");
+    if (bRemoveDeleteCommentEntry)
+        xPop->remove("deletecomment");
+    if (bRemoveDeleteDrawingObjectEntry)
+        xPop->remove("deletedrawingobject");
+    if (bRemoveDeleteFieldEntry)
+        xPop->remove("deletefield");
+
+    bool bRemoveDeleteEntry =
+            bRemoveDeleteChapterEntry ||
+            bRemoveDeleteTableEntry ||
+            bRemoveDeleteFrameEntry ||
+            bRemoveDeleteImageEntry ||
+            bRemoveDeleteOLEObjectEntry ||
+            bRemoveDeleteBookmarkEntry ||
+            bRemoveDeleteHyperlinkEntry ||
+            bRemoveDeleteIndexEntry ||
+            bRemoveDeleteCommentEntry ||
+            bRemoveDeleteDrawingObjectEntry ||
+            bRemoveDeleteFieldEntry;
 
     if (bRemoveRenameEntry)
         xPop->remove(OString::number(502));
@@ -4439,6 +4503,21 @@ void SwContentTree::ExecuteContextMenuAction(const OString& rSelectedPopupEntry)
         Display(true);
         return;
     }
+    else if (rSelectedPopupEntry == "deletechapter" ||
+             rSelectedPopupEntry == "deletetable" ||
+             rSelectedPopupEntry == "deleteframe" ||
+             rSelectedPopupEntry == "deleteimage" ||
+             rSelectedPopupEntry == "deleteoleobject" ||
+             rSelectedPopupEntry == "deletebookmark" ||
+             rSelectedPopupEntry == "deletehyperlink" ||
+             rSelectedPopupEntry == "deleteindex" ||
+             rSelectedPopupEntry == "deletecomment" ||
+             rSelectedPopupEntry == "deletedrawingobject" ||
+             rSelectedPopupEntry == "deletefield")
+    {
+        EditEntry(*xFirst, EditEntryMode::DELETE);
+        return;
+    }
 
     auto nSelectedPopupEntry = rSelectedPopupEntry.toUInt32();
     switch (nSelectedPopupEntry)
@@ -4534,11 +4613,6 @@ void SwContentTree::ExecuteContextMenuAction(const OString& rSelectedPopupEntry)
             m_pActiveShell->SetTOXBaseReadonly(*pBase, !SwEditShell::IsTOXBaseReadonly(*pBase));
         }
         break;
-        case 4:
-        break;
-        case 501:
-            EditEntry(*xFirst, EditEntryMode::DELETE);
-        break;
         case 502 :
             EditEntry(*xFirst, EditEntryMode::RENAME);
         break;
@@ -4615,10 +4689,6 @@ void SwContentTree::ExecuteContextMenuAction(const OString& rSelectedPopupEntry)
             m_pActiveShell->LeaveAddMode();
         }
         break;
-        case 806:
-            // Delete outline selections
-            EditEntry(*xFirst, EditEntryMode::DELETE);
-            break;
         case 900:
         {
             SwContent* pCnt = weld::fromId<SwContent*>(m_xTreeView->get_id(*xFirst));
diff --git a/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui b/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
index 7a2c972df971..09e844553f24 100644
--- a/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
+++ b/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
@@ -54,10 +54,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="806">
+      <object class="GtkMenuItem" id="deletechapter">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE">Delete</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_CHAPTER">Delete Chapter</property>
         <property name="use-underline">True</property>
         <accelerator key="Delete" signal="activate"/>
       </object>
@@ -139,10 +139,91 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="501">
+      <object class="GtkMenuItem" id="deletetable">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_ENTRY">_Delete</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_TABLE">Delete Table</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deleteframe">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_FRAME">Delete Frame</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deleteimage">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_IMAGE">Delete Image</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deleteoleobject">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_OLE_OBJECT">Delete OLE object</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deletebookmark">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_BOOKMARK">Delete Bookmark</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deletehyperlink">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_HYPERLINK">Delete Hyperlink</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deleteindex">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_INDEX">Delete Index</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deletecomment">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_COMMENT">Delete Comment</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deletedrawingobject">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_DRAWING_OBJECT">Delete Drawing object</property>
+        <property name="use-underline">True</property>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="deletefield">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes" context="navigatorcontextmenu|STR_DELETE_FIELD">Delete Field</property>
         <property name="use-underline">True</property>
         <accelerator key="Delete" signal="activate"/>
       </object>