diff options
29 files changed, 23 insertions, 28 deletions
diff --git a/icon-themes/galaxy/cmd/lc_accepttracedchange.png b/icon-themes/galaxy/cmd/lc_accepttracedchange.png Binary files differnew file mode 100644 index 000000000000..176f2c579639 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_accepttracedchange.png diff --git a/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png b/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png Binary files differnew file mode 100644 index 000000000000..323754d1eac2 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png diff --git a/icon-themes/galaxy/cmd/lc_commentchangetracking.png b/icon-themes/galaxy/cmd/lc_commentchangetracking.png Binary files differnew file mode 100644 index 000000000000..6ec8b68479e6 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_commentchangetracking.png diff --git a/icon-themes/galaxy/cmd/lc_comparedocuments.png b/icon-themes/galaxy/cmd/lc_comparedocuments.png Binary files differnew file mode 100644 index 000000000000..6d3cbdaceac3 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_comparedocuments.png diff --git a/icon-themes/galaxy/cmd/lc_nexttrackedchange.png b/icon-themes/galaxy/cmd/lc_nexttrackedchange.png Binary files differnew file mode 100644 index 000000000000..7abe09b37524 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_nexttrackedchange.png diff --git a/icon-themes/galaxy/cmd/lc_previoustrackedchange.png b/icon-themes/galaxy/cmd/lc_previoustrackedchange.png Binary files differnew file mode 100644 index 000000000000..45bbab05ed64 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_previoustrackedchange.png diff --git a/icon-themes/galaxy/cmd/lc_protecttracechangemode.png b/icon-themes/galaxy/cmd/lc_protecttracechangemode.png Binary files differnew file mode 100644 index 000000000000..3581a2134894 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_protecttracechangemode.png diff --git a/icon-themes/galaxy/cmd/lc_rejecttracedchange.png b/icon-themes/galaxy/cmd/lc_rejecttracedchange.png Binary files differnew file mode 100644 index 000000000000..569f3293c878 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_rejecttracedchange.png diff --git a/icon-themes/galaxy/cmd/lc_showtrackedchanges.png b/icon-themes/galaxy/cmd/lc_showtrackedchanges.png Binary files differnew file mode 100644 index 000000000000..8b588bacaafb --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_showtrackedchanges.png diff --git a/icon-themes/galaxy/cmd/lc_trackchanges.png b/icon-themes/galaxy/cmd/lc_trackchanges.png Binary files differnew file mode 100644 index 000000000000..c440a2082537 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_trackchanges.png diff --git a/icon-themes/galaxy/cmd/sc_protecttracechangemode.png b/icon-themes/galaxy/cmd/sc_protecttracechangemode.png Binary files differnew file mode 100644 index 000000000000..ef47f54a8e81 --- /dev/null +++ b/icon-themes/galaxy/cmd/sc_protecttracechangemode.png diff --git a/icon-themes/galaxy/cmd/sc_trackchanges.png b/icon-themes/galaxy/cmd/sc_trackchanges.png Binary files differnew file mode 100644 index 000000000000..2f66cdebbbfa --- /dev/null +++ b/icon-themes/galaxy/cmd/sc_trackchanges.png diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index ebeb7146d730..490c97c161c5 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -6,3 +6,13 @@ cmd/lc_showsinglepage.png cmd/lc_adddirect.png cmd/sc_showsinglepage.png cmd/sc_adddirect.png cmd/lc_zoommode.png cmd/lc_zoomoptimal.png cmd/sc_zoommode.png cmd/sc_zoomoptimal.png +cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png +cmd/sc_trackchanges.png cmd/sc_recsave.png +cmd/sc_previoustrackedchange.png cmd/sc_navigateback.png +cmd/sc_nexttrackedchange.png cmd/sc_navigateforward.png +cmd/sc_accepttracedchange.png cmd/sc_yes.png +cmd/sc_rejecttracedchange.png cmd/sc_no.png +cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png +cmd/sc_commentchangetracking.png cmd/sc_editdoc.png +cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png +cmd/sc_comparedocuments.png cmd/sc_copy.png diff --git a/icon-themes/tango/cmd/lc_accepttracedchange.png b/icon-themes/tango/cmd/lc_accepttracedchange.png Binary files differnew file mode 100644 index 000000000000..176f2c579639 --- /dev/null +++ b/icon-themes/tango/cmd/lc_accepttracedchange.png diff --git a/icon-themes/tango/cmd/lc_accepttrackedchanges.png b/icon-themes/tango/cmd/lc_accepttrackedchanges.png Binary files differnew file mode 100644 index 000000000000..323754d1eac2 --- /dev/null +++ b/icon-themes/tango/cmd/lc_accepttrackedchanges.png diff --git a/icon-themes/tango/cmd/lc_commentchangetracking.png b/icon-themes/tango/cmd/lc_commentchangetracking.png Binary files differnew file mode 100644 index 000000000000..6ec8b68479e6 --- /dev/null +++ b/icon-themes/tango/cmd/lc_commentchangetracking.png diff --git a/icon-themes/tango/cmd/lc_comparedocuments.png b/icon-themes/tango/cmd/lc_comparedocuments.png Binary files differnew file mode 100644 index 000000000000..6d3cbdaceac3 --- /dev/null +++ b/icon-themes/tango/cmd/lc_comparedocuments.png diff --git a/icon-themes/tango/cmd/lc_nexttrackedchange.png b/icon-themes/tango/cmd/lc_nexttrackedchange.png Binary files differnew file mode 100644 index 000000000000..7abe09b37524 --- /dev/null +++ b/icon-themes/tango/cmd/lc_nexttrackedchange.png diff --git a/icon-themes/tango/cmd/lc_previoustrackedchange.png b/icon-themes/tango/cmd/lc_previoustrackedchange.png Binary files differnew file mode 100644 index 000000000000..45bbab05ed64 --- /dev/null +++ b/icon-themes/tango/cmd/lc_previoustrackedchange.png diff --git a/icon-themes/tango/cmd/lc_protecttracechangemode.png b/icon-themes/tango/cmd/lc_protecttracechangemode.png Binary files differnew file mode 100644 index 000000000000..3581a2134894 --- /dev/null +++ b/icon-themes/tango/cmd/lc_protecttracechangemode.png diff --git a/icon-themes/tango/cmd/lc_rejecttracedchange.png b/icon-themes/tango/cmd/lc_rejecttracedchange.png Binary files differnew file mode 100644 index 000000000000..569f3293c878 --- /dev/null +++ b/icon-themes/tango/cmd/lc_rejecttracedchange.png diff --git a/icon-themes/tango/cmd/lc_showtrackedchanges.png b/icon-themes/tango/cmd/lc_showtrackedchanges.png Binary files differnew file mode 100644 index 000000000000..8b588bacaafb --- /dev/null +++ b/icon-themes/tango/cmd/lc_showtrackedchanges.png diff --git a/icon-themes/tango/cmd/lc_trackchanges.png b/icon-themes/tango/cmd/lc_trackchanges.png Binary files differnew file mode 100644 index 000000000000..c440a2082537 --- /dev/null +++ b/icon-themes/tango/cmd/lc_trackchanges.png diff --git a/icon-themes/tango/cmd/lc_trackchanges.xcf.bz2 b/icon-themes/tango/cmd/lc_trackchanges.xcf.bz2 Binary files differnew file mode 100644 index 000000000000..d87d02058a68 --- /dev/null +++ b/icon-themes/tango/cmd/lc_trackchanges.xcf.bz2 diff --git a/icon-themes/tango/cmd/sc_protecttracechangemode.png b/icon-themes/tango/cmd/sc_protecttracechangemode.png Binary files differnew file mode 100644 index 000000000000..ef47f54a8e81 --- /dev/null +++ b/icon-themes/tango/cmd/sc_protecttracechangemode.png diff --git a/icon-themes/tango/cmd/sc_trackchanges.png b/icon-themes/tango/cmd/sc_trackchanges.png Binary files differnew file mode 100644 index 000000000000..2f66cdebbbfa --- /dev/null +++ b/icon-themes/tango/cmd/sc_trackchanges.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index d3f954e35560..4c71487672e4 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -131,24 +131,6 @@ avmedia/res/av02048.png cmd/sc_open.png svx/res/id02.png cmd/sc_open.png cmd/lc_pagesetup.png cmd/lc_setdocumentproperties.png cmd/sc_pagesetup.png cmd/sc_setdocumentproperties.png -cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png -cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png -cmd/lc_trackchanges.png cmd/lc_recsave.png -cmd/sc_trackchanges.png cmd/sc_recsave.png -cmd/lc_previoustrackedchange.png cmd/lc_upsearch.png -cmd/sc_previoustrackedchange.png cmd/sc_upsearch.png -cmd/lc_nexttrackedchange.png cmd/lc_downsearch.png -cmd/sc_nexttrackedchange.png cmd/sc_downsearch.png -cmd/lc_accepttracedchange.png cmd/lc_zoomin.png -cmd/sc_accepttracedchange.png cmd/sc_zoomin.png -cmd/lc_rejecttracedchange.png cmd/lc_zoomminus.png -cmd/sc_rejecttracedchange.png cmd/sc_zoomminus.png -cmd/lc_protecttracechangemode.png cmd/lc_chainframes.png -cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png -cmd/lc_commentchangetracking.png cmd/lc_editdoc.png -cmd/sc_commentchangetracking.png cmd/sc_editdoc.png -cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png -cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png cmd/lc_closepreview.png cmd/lc_closedoc.png cmd/sc_closepreview.png cmd/sc_closedoc.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index ce0aed368d09..c47a30d39512 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3892,6 +3892,9 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Co~mpare Document...</value> </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> </node> <node oor:name=".uno:MergeDocuments" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/sw/uiconfig/swriter/toolbar/changes.xml b/sw/uiconfig/swriter/toolbar/changes.xml index 0b094ef4013b..dc893879180d 100644 --- a/sw/uiconfig/swriter/toolbar/changes.xml +++ b/sw/uiconfig/swriter/toolbar/changes.xml @@ -18,19 +18,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink"> - <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:style="image text" toolbar:helpid="10624"/> - <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:style="image text" toolbar:helpid="10725"/> + <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:text="Show" toolbar:helpid="10624"/> + <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:text="Record" toolbar:helpid="10725"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous" toolbar:style="image text" /> - <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next" toolbar:style="image text" /> - <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:style="image text" toolbar:helpid="10625"/> - <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:style="image text" toolbar:helpid="10626"/> - <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="More" toolbar:style="image text" toolbar:helpid="10622"/> + <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous"/> + <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next"/> + <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:helpid="10625"/> + <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:helpid="10626"/> + <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="List" toolbar:helpid="10622"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:style="image text" toolbar:helpid="10625"/> - <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:style="image text" toolbar:helpid="10625"/> + <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:text="Comment" toolbar:helpid="10625"/> + <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:helpid="10625"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare"/> <toolbar:toolbaritem xlink:href=".uno:MergeDocuments" toolbar:text="Merge" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:visible="false" toolbar:helpid="10625"/> </toolbar:toolbar> |
