Writer, Impress Insert tab: Annotation & Remotelink to similar place

- Make the Insert tab : insert annotation in similar place between
apps
- Use the same accesskey (accessibility, shortcut) in between apps and
the same as the one used inside of Home tab
  - Writer: Insert tab
    - Insert annotation: Add missing DE accesskey
    - Insert remotelink: Add missing accesskey
- Make both insert tabs more compact by making sure hyperlink and
remotelink stacked on both apps

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Icb8c512d437a8c328e6acf2cc41fc335d660af26
This commit is contained in:
Pedro Pinto Silva 2024-04-19 11:08:51 +02:00 committed by pedropintosilva
parent 0bc4daa15c
commit d84e76a841
2 changed files with 54 additions and 30 deletions

View file

@ -1185,7 +1185,38 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
],
'vertical': 'true'
},
{
(this._map['wopi'].EnableRemoteLinkPicker) ? {
'type': 'container',
'children': [
{
'type': 'toolbox',
'children': [
{
'id': 'insert-hyperlink-dialog',
'class': 'unoHyperlinkDialog',
'type': 'customtoolitem',
'text': _UNO('.uno:HyperlinkDialog'),
'command': 'hyperlinkdialog',
'accessibility': { focusBack: true, combination: 'IL', de: null }
}
]
},
{
'type': 'toolbox',
'children': [
{
'id': 'insert-insert-remote-link',
'class': 'unoremotelink',
'type': 'customtoolitem',
'text': _('Smart Picker'),
'command': 'remotelink',
'accessibility': { focusBack: true, combination: 'RL', de: null }
}
]
}
],
'vertical': 'true'
} : {
'id': 'HyperlinkDialog',
'class': 'unoHyperlinkDialog',
'type': 'bigcustomtoolitem',
@ -1193,14 +1224,13 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
'command': 'hyperlinkdialog',
'accessibility': { focusBack: true, combination: 'IL', de: null }
},
(this._map['wopi'].EnableRemoteLinkPicker) ? {
'id': 'insert-insert-smart-picker',
'class': 'unoremotelink',
'type': 'bigcustomtoolitem',
'text': _('Smart Picker'),
'command': 'remotelink',
'accessibility': { focusBack: true, combination: 'RL', de: null }
} : {},
{
'id': 'insert-insert-annotation',
'type': 'bigtoolitem',
'text': _UNO('.uno:InsertAnnotation', 'text'),
'command': '.uno:InsertAnnotation',
'accessibility': { focusBack: false, combination: 'ZC', de: 'ZC' }
},
{
'type': 'container',
'children': [
@ -1336,16 +1366,21 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
],
'vertical': 'true'
},
{
'id': 'insert-header-and-footer',
'type': 'bigtoolitem',
'text': _UNO('.uno:HeaderAndFooter', 'presentation'),
'command': '.uno:HeaderAndFooter',
'accessibility': { focusBack: true, combination: 'HF', de: null }
},
{
'type': 'container',
'children': [
{
'type': 'toolbox',
'children': [
{
'id': 'insert-header-and-footer',
'type': 'toolitem',
'text': _UNO('.uno:HeaderAndFooter', 'presentation'),
'command': '.uno:HeaderAndFooter',
'accessibility': { focusBack: true, combination: 'HF', de: null }
}
]
},
{
'type': 'toolbox',
'children': [
@ -1358,18 +1393,6 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
'accessibility': { focusBack: true, combination: 'IM', de: null }
}
]
},
{
'type': 'toolbox',
'children': [
{
'id': 'insert-insert-annotation',
'type': 'toolitem',
'text': _UNO('.uno:InsertAnnotation', 'text'),
'command': '.uno:InsertAnnotation',
'accessibility': { focusBack: true, combination: 'L', de: null }
}
]
}
],
'vertical': 'true'

View file

@ -1034,7 +1034,8 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
'class': 'unoremotelink',
'type': 'customtoolitem',
'text': _('Smart Picker'),
'command': 'remotelink'
'command': 'remotelink',
'accessibility': { focusBack: true, combination: 'RL', de: null }
}
]
}
@ -1053,7 +1054,7 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
'type': 'bigtoolitem',
'text': _UNO('.uno:InsertAnnotation', 'text'),
'command': '.uno:InsertAnnotation',
'accessibility': { focusBack: false, combination: 'L', de: 'N' }
'accessibility': { focusBack: false, combination: 'ZC', de: 'ZC' }
},
{
'type': 'container',