summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-01-15 21:02:49 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2017-01-16 13:07:58 +0000
commit535f2b2b0a21407c4412d14149d271a199c3e6b8 (patch)
tree934fbcebf62de9ace52d160f34ae018c99304058 /sd
parentc5555c1698665011457147b1f15ea00f04665a05 (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 'sd')
-rw-r--r--sd/UIConfig_simpress.mk1
-rw-r--r--sd/uiconfig/simpress/popupmenu/notebookbar.xml19
2 files changed, 20 insertions, 0 deletions
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index a2930acd7b66..f268c0074d62 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/simpress,\
sd/uiconfig/simpress/popupmenu/measure \
sd/uiconfig/simpress/popupmenu/media \
sd/uiconfig/simpress/popupmenu/multiselect \
+ sd/uiconfig/simpress/popupmenu/notebookbar \
sd/uiconfig/simpress/popupmenu/oleobject \
sd/uiconfig/simpress/popupmenu/outlinetext \
sd/uiconfig/simpress/popupmenu/outline \
diff --git a/sd/uiconfig/simpress/popupmenu/notebookbar.xml b/sd/uiconfig/simpress/popupmenu/notebookbar.xml
new file mode 100644
index 000000000000..7814a63c3f71
--- /dev/null
+++ b/sd/uiconfig/simpress/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:Open"/>
+ <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>