diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-07-26 12:35:11 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-07-28 00:44:46 +0200 |
commit | 2446fdba3ec4a81d6e3b619a1d9e91b3c6dcbd54 (patch) | |
tree | cd669f0646152ad90756bc06e31fc6eb5d9e9a4b /officecfg | |
parent | a10e3987e61b7fcc1a3f7ce3f34fe75a51bff87e (diff) |
tdf#134887 Rework last item handling in NewToolbarController
Just store the last used menu id, and consistently get all the
information (command name, image id, target frame etc.) from the menu
instance. Also implement the XSubToolbarController interface, so we get
a chance to update the image on icon size or theme change.
The initial action and icon of the button are based on the url passed
by the .uno:AddDirect status update, given that there is a corresponding
menu item. The only defined fallback now is to .uno:AddDirect itself for
both executing and getting the icon, but this shouldn't happen normally,
as I fixed all the affected cases I found so far, namely Base (including
windows like table design etc.) and the Basic IDE.
Actually these cases were partially broken anyway, and as a result now
completely fixed:
- In Base main app window, the button used to default to a new Writer
document, although its tooltip advertises Ctrl+N as the kb shortcut, and
pressing that shortcut actually opens the database creation wizard (as
expected).
- In the Basic IDE, the button was working, but not the Ctrl+N shortcut.
Change-Id: I6537b3f38e7d7001ec1b39d78285445464fd8cbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99514
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'officecfg')
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 06bfd060d9da..d54fabafaebc 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -500,14 +500,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing </prop> </node> </node> - <node oor:name="com.sun.star.sdb.OfficeDatabaseDocument" oor:op="replace"> - <node oor:name="N_MOD1" oor:op="replace"> - <prop oor:name="Command"> - <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">private:factory/sdatabase?Interactive</value> - </prop> - </node> - </node> + <node oor:name="com.sun.star.sdb.OfficeDatabaseDocument" oor:op="replace"/> <node oor:name="com.sun.star.sdb.DataSourceBrowser" oor:op="replace"> <node oor:name="F_MOD1" oor:op="replace"> <prop oor:name="Command"> |