diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-15 21:02:49 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-16 13:07:58 +0000 |
| commit | 535f2b2b0a21407c4412d14149d271a199c3e6b8 (patch) | |
| tree | 934fbcebf62de9ace52d160f34ae018c99304058 /sw | |
| parent | c5555c1698665011457147b1f15ea00f04665a05 (diff) | |
Convert RID_MENU_NOTEBOOKBAR to xml
Brings a lot of features (icons, keyboard shortcuts,
customization, context menu interception etc.)
Other changes:
- Make SfxDispatcher::ExecutePopup take PopupMenuFlags
arg, to be able to pass NoMouseUpClose, so that the
menu won't close on mouse-up under anything != gtk3.
- Make .uno:OpenFromWriter and .uno:OpenFromCalc async
slots, to avoid crash under gtk3 when recycling the
current frame.
- Don't show the menu in customization dialog, if
experimental mode disabled.
Change-Id: Ieea2f73f6b48fbaf4bdfc4acf1a33d25422357cb
Reviewed-on: https://gerrit.libreoffice.org/33101
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/UIConfig_swriter.mk | 1 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/popupmenu/notebookbar.xml | 19 |
3 files changed, 21 insertions, 0 deletions
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 2ff017fe3b6a..532f0ba409cb 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\ sw/uiconfig/swriter/popupmenu/graphic \ sw/uiconfig/swriter/popupmenu/insertfield \ sw/uiconfig/swriter/popupmenu/media \ + sw/uiconfig/swriter/popupmenu/notebookbar \ sw/uiconfig/swriter/popupmenu/oleobject \ sw/uiconfig/swriter/popupmenu/preview \ sw/uiconfig/swriter/popupmenu/table \ diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 494068ac9968..4de6cbba33d0 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -7408,6 +7408,7 @@ SfxVoidItem OpenFromWriter FN_OPEN_FILE Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; + Asynchron; SlotType = SfxStringItem diff --git a/sw/uiconfig/swriter/popupmenu/notebookbar.xml b/sw/uiconfig/swriter/popupmenu/notebookbar.xml new file mode 100644 index 000000000000..d37082e53a14 --- /dev/null +++ b/sw/uiconfig/swriter/popupmenu/notebookbar.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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/. + * +--> +<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu"> + <menu:menuitem menu:id=".uno:OpenFromWriter"/> + <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:menupopup> |