sc/uiconfig/scalc/popupmenu/notebookbar.xml | 16 +++++++++------- sc/uiconfig/scalc/toolbar/notebookbarshortcuts.xml | 2 +- sd/uiconfig/simpress/popupmenu/notebookbar.xml | 16 +++++++++------- sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml | 2 +- sw/uiconfig/swriter/popupmenu/notebookbar.xml | 2 +- sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml | 2 +- 6 files changed, 22 insertions(+), 18 deletions(-)
New commits: commit 788ed94bff85b6e3578d23571e233783da455556 Author: andreas kainz <kain...@gmail.com> Date: Mon Apr 23 10:04:03 2018 +0200 NB Implementation: Tabbedbar global layout Change-Id: Ic3c4bdda30bf217a0c71907234bbf7ad2a3f8d59 Reviewed-on: https://gerrit.libreoffice.org/53309 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sc/uiconfig/scalc/popupmenu/notebookbar.xml b/sc/uiconfig/scalc/popupmenu/notebookbar.xml index b470c0e57c31..31952654b196 100644 --- a/sc/uiconfig/scalc/popupmenu/notebookbar.xml +++ b/sc/uiconfig/scalc/popupmenu/notebookbar.xml @@ -9,13 +9,15 @@ --> <menu:menupopup xmlns:menu="http://openoffice.org/2001/menu"> <menu:menuitem menu:id=".uno:AddDirect"/> - <menu:menuitem menu:id=".uno:OpenFromCalc"/> <menu:menuitem menu:id=".uno:RecentFileList"/> - <menu:menuitem menu:id=".uno:Save"/> - <menu:menuitem menu:id=".uno:Undo"/> - <menu:menuitem menu:id=".uno:Redo"/> - <menu:menuitem menu:id=".uno:Print"/> - <menu:menuitem menu:id=".uno:Menubar"/> - <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> <menu:menuitem menu:id=".uno:CloseDoc"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:ToolbarMode"/> + <menu:menuitem menu:id=".uno:AvailableToolbars"/> + <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:HelpIndex"/> + <menu:menuitem menu:id=".uno:Donation"/> + <menu:menuitem menu:id=".uno:About"/> + <menu:menuseparator/> </menu:menupopup> diff --git a/sc/uiconfig/scalc/toolbar/notebookbarshortcuts.xml b/sc/uiconfig/scalc/toolbar/notebookbarshortcuts.xml index 41985d00592f..301a4b1880a2 100644 --- a/sc/uiconfig/scalc/toolbar/notebookbarshortcuts.xml +++ b/sc/uiconfig/scalc/toolbar/notebookbarshortcuts.xml @@ -8,10 +8,10 @@ * --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink"> + <toolbar:toolbaritem xlink:href=".uno:Menubar"/> <toolbar:toolbaritem xlink:href=".uno:OpenFromCalc"/> <toolbar:toolbaritem xlink:href=".uno:Save"/> <toolbar:toolbaritem xlink:href=".uno:Undo"/> <toolbar:toolbaritem xlink:href=".uno:Redo"/> <toolbar:toolbaritem xlink:href=".uno:Print"/> - <toolbar:toolbaritem xlink:href=".uno:Menubar"/> </toolbar:toolbar> diff --git a/sd/uiconfig/simpress/popupmenu/notebookbar.xml b/sd/uiconfig/simpress/popupmenu/notebookbar.xml index 9295fefe7487..31952654b196 100644 --- a/sd/uiconfig/simpress/popupmenu/notebookbar.xml +++ b/sd/uiconfig/simpress/popupmenu/notebookbar.xml @@ -9,13 +9,15 @@ --> <menu:menupopup xmlns:menu="http://openoffice.org/2001/menu"> <menu:menuitem menu:id=".uno:AddDirect"/> - <menu:menuitem menu:id=".uno:Open"/> <menu:menuitem menu:id=".uno:RecentFileList"/> - <menu:menuitem menu:id=".uno:Save"/> - <menu:menuitem menu:id=".uno:Undo"/> - <menu:menuitem menu:id=".uno:Redo"/> - <menu:menuitem menu:id=".uno:Print"/> - <menu:menuitem menu:id=".uno:Menubar"/> - <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> <menu:menuitem menu:id=".uno:CloseDoc"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:ToolbarMode"/> + <menu:menuitem menu:id=".uno:AvailableToolbars"/> + <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:HelpIndex"/> + <menu:menuitem menu:id=".uno:Donation"/> + <menu:menuitem menu:id=".uno:About"/> + <menu:menuseparator/> </menu:menupopup> diff --git a/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml b/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml index bd878ffc6651..a45e9d4e67a7 100644 --- a/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml +++ b/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml @@ -8,10 +8,10 @@ * --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink"> + <toolbar:toolbaritem xlink:href=".uno:Menubar"/> <toolbar:toolbaritem xlink:href=".uno:Open"/> <toolbar:toolbaritem xlink:href=".uno:Save"/> <toolbar:toolbaritem xlink:href=".uno:Undo"/> <toolbar:toolbaritem xlink:href=".uno:Redo"/> <toolbar:toolbaritem xlink:href=".uno:Presentation"/> - <toolbar:toolbaritem xlink:href=".uno:Menubar"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/popupmenu/notebookbar.xml b/sw/uiconfig/swriter/popupmenu/notebookbar.xml index cb6a1267fda3..31952654b196 100644 --- a/sw/uiconfig/swriter/popupmenu/notebookbar.xml +++ b/sw/uiconfig/swriter/popupmenu/notebookbar.xml @@ -10,6 +10,7 @@ <menu:menupopup xmlns:menu="http://openoffice.org/2001/menu"> <menu:menuitem menu:id=".uno:AddDirect"/> <menu:menuitem menu:id=".uno:RecentFileList"/> + <menu:menuitem menu:id=".uno:CloseDoc"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ToolbarMode"/> <menu:menuitem menu:id=".uno:AvailableToolbars"/> @@ -19,5 +20,4 @@ <menu:menuitem menu:id=".uno:Donation"/> <menu:menuitem menu:id=".uno:About"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:CloseDoc"/> </menu:menupopup> diff --git a/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml b/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml index 80d7050b23ed..19267c79b16b 100644 --- a/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml +++ b/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml @@ -8,10 +8,10 @@ * --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink"> + <toolbar:toolbaritem xlink:href=".uno:Menubar"/> <toolbar:toolbaritem xlink:href=".uno:OpenFromWriter"/> <toolbar:toolbaritem xlink:href=".uno:Save"/> <toolbar:toolbaritem xlink:href=".uno:Undo"/> <toolbar:toolbaritem xlink:href=".uno:Redo"/> <toolbar:toolbaritem xlink:href=".uno:Print"/> - <toolbar:toolbaritem xlink:href=".uno:Menubar"/> </toolbar:toolbar> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits