diff options
author | andreas kainz <kainz.a@gmail.com> | 2019-12-06 23:12:59 +0100 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2019-12-07 10:55:57 +0100 |
commit | d139529dff85282772d334edcebdccf23d2d9c97 (patch) | |
tree | b0e958eeeb62f277effdc63df152f5736d2306c0 /sw | |
parent | 1695775228a14ba7ee8e94401362ee6f12c4c14e (diff) |
tdf#101977 add new track changes uno commands to writer NB+ menubar
Change-Id: I06e48f37af435d9927b764de1a972687bbd7bf2a
Reviewed-on: https://gerrit.libreoffice.org/84671
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/uiconfig/swriter/menubar/menubar.xml | 2 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 90 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 142 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 70 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_single.ui | 26 |
5 files changed, 275 insertions, 55 deletions
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 81d7ad9d96f0..bd57b91564da 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -130,8 +130,10 @@ <menu:menuitem menu:id=".uno:PreviousTrackedChange"/> <menu:menuitem menu:id=".uno:NextTrackedChange"/> <menu:menuitem menu:id=".uno:AcceptTrackedChange"/> + <menu:menuitem menu:id=".uno:AcceptTrackedChangeToNext"/> <menu:menuitem menu:id=".uno:AcceptAllTrackedChanges"/> <menu:menuitem menu:id=".uno:RejectTrackedChange"/> + <menu:menuitem menu:id=".uno:RejectTrackedChangeToNext"/> <menu:menuitem menu:id=".uno:RejectAllTrackedChanges"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:CommentChangeTracking"/> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index f4bb5355d892..0cc64ef83294 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -1547,11 +1547,14 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-WordCountDialog"> + <object class="GtkMenuItem" id="MenuReview-MoreDictionaries"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WordCountDialog</property> + <property name="action_name">.uno:MoreDictionaries</property> </object> + <packing> + <property name="bottom_attach">0</property> + </packing> </child> <child> <object class="GtkSeparatorMenuItem" id="MenuReview-separator1"> @@ -1587,31 +1590,31 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-Hyphenate"> + <object class="GtkMenuItem" id="MenuReview-ChineseConversion"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Hyphenate</property> + <property name="action_name">.uno:ChineseConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-ChineseConversion"> + <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChineseConversion</property> + <property name="action_name">.uno:HangulHanjaConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion"> + <object class="GtkMenuItem" id="MenuReview-Hyphenate"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HangulHanjaConversion</property> + <property name="action_name">.uno:Hyphenate</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-MoreDictionaries"> + <object class="GtkMenuItem" id="MenuReview-WordCountDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MoreDictionaries</property> + <property name="action_name">.uno:WordCountDialog</property> </object> </child> <child> @@ -1642,27 +1645,69 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuReview-separator4"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-PreviousTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-NextTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NextTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChangeToNext"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChangeToNext</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-InsertAnnotation"> + <object class="GtkMenuItem" id="MenuReview-AcceptAllTrackedChanges"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:AcceptAllTrackedChanges</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RejectTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectTrackedChange</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuReview-ShowAnnotations"> + <object class="GtkMenuItem" id="MenuReview-RejectTrackedChangeToNext"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> + <property name="action_name">.uno:RejectTrackedChangeToNext</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuReview-separator5"> + <object class="GtkMenuItem" id="MenuReview-RejectAllTrackedChanges"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectAllTrackedChanges</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1688,6 +1733,19 @@ <property name="action_name">.uno:MergeDocuments</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RedactDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RedactDoc</property> + </object> + </child> </object> <object class="GtkMenu" id="Menu Table"> <property name="visible">True</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index fb4e9b1a1967..5d13265d1a1d 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -1540,168 +1540,226 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="SpellingAndGrammarDialogD"> + <object class="GtkMenuItem" id="MenuReview-SpellingAndGrammarDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellingAndGrammarDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="SpellOnlineD"> + <object class="GtkMenuItem" id="MenuReview-SpellOnline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SpellOnline</property> </object> </child> <child> - <object class="GtkMenuItem" id="ThesaurusDialogD"> + <object class="GtkMenuItem" id="MenuReview-ThesaurusDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ThesaurusDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="WordCountDialogD"> + <object class="GtkMenuItem" id="MenuReview-MoreDictionaries"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WordCountDialog</property> + <property name="action_name">.uno:MoreDictionaries</property> </object> + <packing> + <property name="bottom_attach">0</property> + </packing> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator58"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetLanguageSelectionMenuD"> + <object class="GtkMenuItem" id="MenuReview-SetLanguageSelectionMenu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SetLanguageSelectionMenu</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetLanguageParagraphMenuD"> + <object class="GtkMenuItem" id="MenuReview-SetLanguageParagraphMenu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SetLanguageParagraphMenu</property> </object> </child> <child> - <object class="GtkMenuItem" id="SetLanguageAllTextMenuD"> + <object class="GtkMenuItem" id="MenuReview-SetLanguageAllTextMenu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SetLanguageAllTextMenu</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator90"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="HyphenateD"> + <object class="GtkMenuItem" id="MenuReview-ChineseConversion"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Hyphenate</property> + <property name="action_name">.uno:ChineseConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChineseConversionD"> + <object class="GtkMenuItem" id="MenuReview-HangulHanjaConversion"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChineseConversion</property> + <property name="action_name">.uno:HangulHanjaConversion</property> </object> </child> <child> - <object class="GtkMenuItem" id="HangulHanjaConversionD"> + <object class="GtkMenuItem" id="MenuReview-Hyphenate"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HangulHanjaConversion</property> + <property name="action_name">.uno:Hyphenate</property> </object> </child> <child> - <object class="GtkMenuItem" id="MoreDictionariesD"> + <object class="GtkMenuItem" id="MenuReview-WordCountDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MoreDictionaries</property> + <property name="action_name">.uno:WordCountDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator64"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="TrackChangesD"> + <object class="GtkMenuItem" id="MenuReview-TrackChanges"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TrackChanges</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowTrackedChangesD"> + <object class="GtkMenuItem" id="MenuReview-ShowTrackedChanges"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShowTrackedChanges</property> </object> </child> <child> - <object class="GtkMenuItem" id="AcceptTrackedChangesD"> + <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChanges"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AcceptTrackedChanges</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator73"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-PreviousTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-NextTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NextTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChangeToNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChangeToNext</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptAllTrackedChanges"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptAllTrackedChanges</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RejectTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectTrackedChange</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertAnnotationD"> + <object class="GtkMenuItem" id="MenuReview-RejectTrackedChangeToNext"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:RejectTrackedChangeToNext</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShowAnnotationsD1"> + <object class="GtkMenuItem" id="MenuReview-RejectAllTrackedChanges"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> + <property name="action_name">.uno:RejectAllTrackedChanges</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator77"> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ProtectTraceChangeModeD"> + <object class="GtkMenuItem" id="MenuReview-ProtectTraceChangeMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ProtectTraceChangeMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="CompareDocuments"> + <object class="GtkMenuItem" id="MenuReview-CompareDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CompareDocuments</property> </object> </child> <child> - <object class="GtkMenuItem" id="MergeDocumentsD"> + <object class="GtkMenuItem" id="MenuReview-MergeDocuments"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:MergeDocuments</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RedactDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RedactDoc</property> + </object> + </child> </object> <object class="GtkMenu" id="Menu Table"> <property name="visible">True</property> @@ -7670,6 +7728,28 @@ <property name="can_focus">True</property> <property name="show_arrow">False</property> <child> + <object class="GtkToolButton" id="Review-RejectTrackedChangeToNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectTrackedChangeToNext</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Review-AcceptTrackedChangeToNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChangeToNext</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Review-AcceptAllTrackedChanges"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 6170f2cce582..2c42045e489c 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -2709,6 +2709,68 @@ </object> </child> <child> + <object class="GtkSeparatorMenuItem" id="MenuReview-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-PreviousTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-NextTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NextTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptTrackedChangeToNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChangeToNext</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-AcceptAllTrackedChanges"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptAllTrackedChanges</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RejectTrackedChange"> + <property name="visible">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectTrackedChange</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RejectTrackedChangeToNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectTrackedChangeToNext</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuReview-RejectAllTrackedChanges"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectAllTrackedChanges</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="MenuReview-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11755,10 +11817,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-AcceptTrackedChange"> + <object class="GtkToolButton" id="Review-AcceptTrackedChangeToNext"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AcceptTrackedChange</property> + <property name="action_name">.uno:AcceptTrackedChangeToNext</property> </object> <packing> <property name="expand">False</property> @@ -11766,10 +11828,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Review-RejectTrackedChange"> + <object class="GtkToolButton" id="Review-RejectTrackedChangeToNext"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RejectTrackedChange</property> + <property name="action_name">.uno:RejectTrackedChangeToNext</property> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 3317d90beb73..668309f90dd1 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -1365,7 +1365,6 @@ </child> <child> <object class="GtkToolButton" id="Default-InsertObjectChart"> - <property name="visible">False</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertObjectChart</property> </object> @@ -1387,7 +1386,6 @@ </child> <child> <object class="GtkToolButton" id="Default-InsertObject"> - <property name="visible">False</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertObject</property> </object> @@ -1409,7 +1407,6 @@ </child> <child> <object class="GtkToolButton" id="Default-DrawText"> - <property name="visible">False</property> <property name="can_focus">False</property> <property name="action_name">.uno:DrawText</property> </object> @@ -1420,7 +1417,6 @@ </child> <child> <object class="GtkToolButton" id="Default-FontworkGalleryFloater"> - <property name="visible">False</property> <property name="can_focus">False</property> <property name="action_name">.uno:FontworkGalleryFloater</property> </object> @@ -9408,6 +9404,28 @@ <property name="can_focus">True</property> <property name="show_arrow">False</property> <child> + <object class="GtkToolButton" id="Review-RejectTrackedChangeToNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RejectTrackedChangeToNext</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Review-AcceptTrackedChangeToNext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AcceptTrackedChangeToNext</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Review-AcceptAllTrackedChanges"> <property name="visible">True</property> <property name="can_focus">False</property> |