diff options
| author | Scott Clarke <scott.clarke@codethink.co.uk> | 2019-06-19 16:29:54 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-07 09:44:10 +0200 |
| commit | 6986ebd4a0020e515a115acbe7f1f738a4fd83f4 (patch) | |
| tree | e746c25a54af0ae41a67e0cb538309d32b5a802f /sw/uiconfig | |
| parent | 7ade0c7d03594bfa5c067f32230a1e4ed93d7fbb (diff) | |
tdf#119228 Add UI elements to resolve and unresolve comments
Change-Id: I22403299d034a638724077744070b3add64cacf2
Co-authored-by: Jim MacArthur <jim.macarthur@codethink.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/75861
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/uiconfig')
| -rw-r--r-- | sw/uiconfig/sglobal/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | sw/uiconfig/sglobal/popupmenu/annotation.xml | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/popupmenu/annotation.xml | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/annotationmenu.ui | 16 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 7 |
6 files changed, 27 insertions, 0 deletions
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index a07aea1118a2..75c79dd05940 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -144,6 +144,7 @@ <menu:menu menu:id=".uno:EditCommentsMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:ReplyComment" menu:style="text"/> + <menu:menuitem menu:id=".uno:ResolveComment" menu:style="text"/> <menu:menuitem menu:id=".uno:DeleteComment" menu:style="text"/> <menu:menuitem menu:id=".uno:DeleteAuthor" menu:style="text"/> <menu:menuitem menu:id=".uno:DeleteAllNotes" menu:style="text"/> diff --git a/sw/uiconfig/sglobal/popupmenu/annotation.xml b/sw/uiconfig/sglobal/popupmenu/annotation.xml index 2ddcf03e8591..4724bde64c89 100644 --- a/sw/uiconfig/sglobal/popupmenu/annotation.xml +++ b/sw/uiconfig/sglobal/popupmenu/annotation.xml @@ -19,6 +19,7 @@ </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ReplyComment"/> + <menu:menuitem menu:id=".uno:ResolveComment"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:DeleteComment"/> <menu:menuitem menu:id=".uno:DeleteAuthor"/> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index af3eee70c760..d9cfbf8f7f3a 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -144,6 +144,7 @@ <menu:menu menu:id=".uno:EditCommentsMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:ReplyComment" menu:style="text"/> + <menu:menuitem menu:id=".uno:ResolveComment" menu:style="text"/> <menu:menuitem menu:id=".uno:DeleteComment" menu:style="text"/> <menu:menuitem menu:id=".uno:DeleteAuthor" menu:style="text"/> <menu:menuitem menu:id=".uno:DeleteAllNotes" menu:style="text"/> diff --git a/sw/uiconfig/swriter/popupmenu/annotation.xml b/sw/uiconfig/swriter/popupmenu/annotation.xml index 2ddcf03e8591..e455091a41b1 100644 --- a/sw/uiconfig/swriter/popupmenu/annotation.xml +++ b/sw/uiconfig/swriter/popupmenu/annotation.xml @@ -20,6 +20,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:ReplyComment"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:ResolveComment"/> <menu:menuitem menu:id=".uno:DeleteComment"/> <menu:menuitem menu:id=".uno:DeleteAuthor"/> <menu:menuitem menu:id=".uno:DeleteAllNotes"/> diff --git a/sw/uiconfig/swriter/ui/annotationmenu.ui b/sw/uiconfig/swriter/ui/annotationmenu.ui index edec7f13542a..c21c6bb555a5 100644 --- a/sw/uiconfig/swriter/ui/annotationmenu.ui +++ b/sw/uiconfig/swriter/ui/annotationmenu.ui @@ -20,6 +20,22 @@ </object> </child> <child> + <object class="GtkMenuItem" id="resolve"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="annotationmenu|resolve">Resolve</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="unresolve"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="annotationmenu|unresolve">Unresolve</property> + <property name="use_underline">True</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="delete"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index ed968f364d14..023642de8d30 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -323,6 +323,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuComments-ResolveComment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ResolveComment</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuComments-DeleteAuthor"> <property name="visible">True</property> <property name="can_focus">False</property> |