diff options
author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-24 10:36:38 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-24 10:38:26 +0200 |
commit | 6332c643016ce4c4d254c8429a5eceae6664bf5c (patch) | |
tree | c9f47b5b6bdf943e38a6eb1883bcd02867aff2d4 | |
parent | 0e9aa656aa3ca12ae14e2c68473f1ae0264cd11a (diff) |
fdo#83955 Fix changes toolbar to display icons+text
Change-Id: I88ab66f60fc477f0e1e33d4049af7721e9435272
-rw-r--r-- | icon-themes/galaxy/links.txt | 18 | ||||
-rw-r--r-- | icon-themes/tango/links.txt | 19 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 6 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 3 | ||||
-rw-r--r-- | sw/uiconfig/swriter/toolbar/changes.xml | 18 |
5 files changed, 34 insertions, 30 deletions
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index c5d321d1e75e..ebeb7146d730 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -6,21 +6,3 @@ 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/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 diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 9bfda77aadfd..c14bf4ebf33b 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -131,6 +131,25 @@ 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 + # Duplicates cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index c0bd4217c768..6154bf2d96b2 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -184,11 +184,17 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Next Change</value> </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> </node> <node oor:name=".uno:PreviousTrackedChange" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Pr~evious Change</value> </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> </node> <node oor:name=".uno:UpdateAllLinks" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 05d318edb05e..4dcc178697de 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -744,9 +744,6 @@ <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 1b7bf95a5385..0b094ef4013b 100644 --- a/sw/uiconfig/swriter/toolbar/changes.xml +++ b/sw/uiconfig/swriter/toolbar/changes.xml @@ -18,17 +18,17 @@ * 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:helpid="10624"/> - <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:helpid="10725"/> + <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:toolbarseparator/> - <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: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:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:helpid="10625"/> - <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode" toolbar:text="Protect" toolbar:helpid="10625"/> + <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:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:CompareDocuments" toolbar:text="Compare" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:MergeDocuments" toolbar:text="Merge" toolbar:visible="false"/> |