diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2014-09-22 05:20:42 +0400 |
|---|---|---|
| committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-23 22:28:52 +0000 |
| commit | bba15935842071289f6fbf9edef409b605254508 (patch) | |
| tree | c15373b2ab947681d88d5d5dd5d732f210d80a1a | |
| parent | da21f7da44dc577a08ea3bc210083dc8decf18bc (diff) | |
fdo#83955 Track Changes: Improve the changes toolbar
Change-Id: I50986a5c3d55890536dd2b1736887a816c931699
Reviewed-on: https://gerrit.libreoffice.org/11575
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
| -rw-r--r-- | icon-themes/galaxy/links.txt | 20 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 3 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/changes.xml | 15 |
3 files changed, 31 insertions, 7 deletions
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index 69160dcc4831..28a38ddf57d4 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -5,4 +5,22 @@ cmd/sc_datastreamsstop.png avmedia/res/av02051.png 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
\ No newline at end of file +cmd/sc_zoommode.png cmd/sc_zoomoptimal.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_zoomplus.png +cmd/sc_accepttracedchange.png cmd/sc_zoomplus.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 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 4dcc178697de..05d318edb05e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -744,6 +744,9 @@ <prop oor:name="Visible" oor:type="xs:boolean"> <value>false</value> </prop> + <prop oor:name="Style" oor:type="xs:int"> + <value>2</value> + </prop> </node> </node> </node> diff --git a/sw/uiconfig/swriter/toolbar/changes.xml b/sw/uiconfig/swriter/toolbar/changes.xml index 29a798453571..1b7bf95a5385 100644 --- a/sw/uiconfig/swriter/toolbar/changes.xml +++ b/sw/uiconfig/swriter/toolbar/changes.xml @@ -19,15 +19,18 @@ --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink"> <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:helpid="10624"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:helpid="10725"/> - <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:helpid="10622"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:helpid="10625"/> - <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:helpid="10625"/> + <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="More" toolbar:helpid="10622"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:helpid="10626"/> <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:helpid="10625"/> + <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:helpid="10625"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="10625"/> + <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare" toolbar:visible="false"/> + <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> |