diff options
author | andreas kainz <kainz.a@gmail.com> | 2019-02-21 18:57:00 +0100 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2019-02-25 09:04:07 +0100 |
commit | 67eaa07e02a08bee869acd6d6a9dfb91adcf8fd1 (patch) | |
tree | f7b2a5baa1390c7402e59eca63888b1c156cfc00 /sw/uiconfig/sglobal | |
parent | 435b64ecb6289a5ebfb8474f81dac032aaccfa4c (diff) |
sync sglobal UI files with swriter UI files
Change-Id: Icd326ab025ffb74f36dba880261ed3638bcdfd5c
Reviewed-on: https://gerrit.libreoffice.org/68191
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sw/uiconfig/sglobal')
-rw-r--r-- | sw/uiconfig/sglobal/popupmenu/text.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/sglobal/statusbar/statusbar.xml | 19 | ||||
-rw-r--r-- | sw/uiconfig/sglobal/toolbar/changes.xml | 2 | ||||
-rw-r--r-- | sw/uiconfig/sglobal/toolbar/fullscreenbar.xml | 19 | ||||
-rw-r--r-- | sw/uiconfig/sglobal/toolbar/tableobjectbar.xml | 2 |
5 files changed, 32 insertions, 11 deletions
diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml b/sw/uiconfig/sglobal/popupmenu/text.xml index 999fd1259507..332a2caa26f0 100644 --- a/sw/uiconfig/sglobal/popupmenu/text.xml +++ b/sw/uiconfig/sglobal/popupmenu/text.xml @@ -75,6 +75,7 @@ </menu:menupopup> </menu:menu> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:InsertAnnotation"/> <menu:menuitem menu:id=".uno:AcceptTrackedChange"/> <menu:menuitem menu:id=".uno:RejectTrackedChange"/> <menu:menuitem menu:id=".uno:NextTrackedChange"/> diff --git a/sw/uiconfig/sglobal/statusbar/statusbar.xml b/sw/uiconfig/sglobal/statusbar/statusbar.xml index ff1f57d9d734..f85f07daa068 100644 --- a/sw/uiconfig/sglobal/statusbar/statusbar.xml +++ b/sw/uiconfig/sglobal/statusbar/statusbar.xml @@ -18,15 +18,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink"> - <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54"/> + <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:mandatory="true" statusbar:width="54"/> + <statusbar:statusbaritem xlink:href=".uno:StateWordCount" statusbar:align="left" statusbar:autosize="true"/> <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79"/> - <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100"/> - <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="55"/> - <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/> - <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/> - <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/> - <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="10"/> + <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:mandatory="false" statusbar:width="100"/> + <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:mandatory="false" statusbar:width="55"/> + <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/> + <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/> + <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/> + <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:mandatory="false" statusbar:ownerdraw="true" statusbar:width="10"/> <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63"/> - <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130"/> - <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35"/> + <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="true" statusbar:width="130"/> + <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:mandatory="true" statusbar:width="35"/> </statusbar:statusbar> diff --git a/sw/uiconfig/sglobal/toolbar/changes.xml b/sw/uiconfig/sglobal/toolbar/changes.xml index af6d4dcf724a..9865acd2eb4b 100644 --- a/sw/uiconfig/sglobal/toolbar/changes.xml +++ b/sw/uiconfig/sglobal/toolbar/changes.xml @@ -25,6 +25,8 @@ <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange"/> <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChange"/> <toolbar:toolbaritem xlink:href=".uno:RejectTrackedChange"/> + <toolbar:toolbaritem xlink:href=".uno:AcceptAllTrackedChanges"/> + <toolbar:toolbaritem xlink:href=".uno:RejectAllTrackedChanges"/> <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/> diff --git a/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml b/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml index 4162e396e5f2..9b007728dcdc 100644 --- a/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml +++ b/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * 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:FullScreen"/> -</toolbar:toolbar>
\ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml index 75efbade4479..55297a1140df 100644 --- a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml @@ -42,7 +42,7 @@ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/> <toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/> + <toolbar:toolbaritem xlink:href=".uno:TableCellBackgroundColor"/> <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/> |