online.git: 3 commits - browser/css browser/src

["Andreas-Kainz (via cogerrit)"]

browser/css/color-palette-dark.css | 5
browser/css/color-palette.css | 5
browser/css/notebookbar.css | 6
browser/src/control/Control.NotebookbarImpress.js | 206 ++++++------
browser/src/control/Control.NotebookbarWriter.js | 373 ++++++++++++++--------
5 files changed, 353 insertions(+), 242 deletions(-)

New commits:
commit 45d61b914d31a1b7bcc8ca3234c139b1e91de56b
Author: Andreas Kainz <kai...@gmail.com>
AuthorDate: Tue May 5 00:26:06 2026 +0200
Commit: Darshan-Upadhyay <darshan....@collabora.com>
CommitDate: Mon May 25 12:28:55 2026 +0000

NB Tab Table Writer/Impress/Draw add groups and update arrangement

Change-Id: I2bdbf8ebdf3dc2e7edc5a9e7ed5aa1a65a26aae6
Signed-off-by: Andreas-Kainz <kai...@gmail.com>
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/1985
Reviewed-by: Darshan-Upadhyay <darshan....@collabora.com>
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/browser/src/control/Control.NotebookbarImpress.js b/browser/src/control/Control.NotebookbarImpress.js
index 34cade400bd2..987da2e851e7 100644
--- a/browser/src/control/Control.NotebookbarImpress.js
+++ b/browser/src/control/Control.NotebookbarImpress.js
@@ -2096,14 +2096,66 @@ window.L.Control.NotebookbarImpress = window.L.Control.NotebookbarWriter.extend(
getTableTab: function() {
var content = [
{
- 'id': 'table-table-dialog',
- 'type': 'bigtoolitem',
- 'text': _UNO('.uno:TableDialog', 'presentation', true),
- 'command': '.uno:TableDialog',
- 'accessibility': { focusBack: false, combination: 'SD', de: null }
+ 'type': 'overflowgroup',
+ 'id': 'table-select',
+ 'name':_('Select'),
+ 'accessibility': { focusBack: true, combination: 'SE', de: null },
+ 'children' : [
+ {
+ 'type': 'bigtoolitem',
+ 'id': 'table-select-cell',
+ 'text': _UNO('.uno:EntireCell', 'presentation', true),
+ 'command': '.uno:EntireCell',
+ 'accessibility': { focusBack: true, combination: 'EC', de: null }
+ },
+ {
+ 'type': 'container',
+ 'children': [
+ {
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type': 'toolitem',
+ 'id': 'table-entire-column',
+ 'text': _UNO('.uno:EntireColumn', 'presentation'),
+ 'command': '.uno:EntireColumn',
+ 'accessibility': { focusBack: true, combination: 'CE', de: null }
+ },
+ {
+ 'type': 'toolitem',
+ 'id': 'table-select-table',
+ 'text': _UNO('.uno:SelectTable', 'presentation', true),
+ 'command': '.uno:SelectTable',
+ 'accessibility': { focusBack: true, combination: 'ST', de: null }
+ },
+ ]
+ },
+ {
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type': 'toolitem',
+ 'id': 'table-entire-row',
+ 'text': _UNO('.uno:EntireRow', 'presentation'),
+ 'command': '.uno:EntireRow',
+ 'accessibility': { focusBack: true, combination: 'ER', de: null }
+ },
+ {
+ 'type': 'toolitem',
+ 'id': 'table-delete-table',
+ 'text': _UNO('.uno:DeleteTable', 'presentation', true),
+ 'command': '.uno:DeleteTable',
+ 'accessibility': { focusBack: true, combination: 'DT', de: null }
+ },
+ ]
+ }
+ ],
+ 'vertical': 'true'
+ },
+ ]
},
- { type: 'separator', id: 'table-bigtoolitem-break', orientation: 'vertical' },
- {
+ { type: 'separator', id: 'table-select-break', orientation: 'vertical' },
+ {
'type': 'overflowgroup',
'id': 'table-insert',
'name':_('Insert'),
@@ -2209,79 +2261,10 @@ window.L.Control.NotebookbarImpress = window.L.Control.NotebookbarWriter.extend(
]
},
{ type: 'separator', id: 'table-merge-split-table-break', orientation: 'vertical' },
- {
- 'type': 'overflowgroup',
- 'id': 'table-select',
- 'name':_('Select'),
- 'accessibility': { focusBack: true, combination: 'ST', de: null },
- 'children' : [
- {
- 'type': 'container',
- 'children': [
- {
- 'type': 'toolbox',
- 'children': [
- {
- 'id': 'table-select-table',
- 'type': 'toolitem',
- 'text': _UNO('.uno:SelectTable', 'presentation'),
- 'command': '.uno:SelectTable',
- 'accessibility': { focusBack: true, combination: 'ST', de: null }
- }
- ]
- },
- {
- 'type': 'toolbox',
- 'children': [
- {
- 'id': 'table-delete-table',
- 'type': 'toolitem',
- 'text': _UNO('.uno:DeleteTable', 'presentation'),
- 'command': '.uno:DeleteTable',
- 'accessibility': { focusBack: true, combination: 'TD', de: null }
- }
- ]
- }
- ],
- 'vertical': 'true',
- },
- {
- 'type': 'container',
- 'children': [
- {
- 'type': 'toolbox',
- 'children': [
- {
- 'id': 'table-entire-column',
- 'type': 'toolitem',
- 'text': _UNO('.uno:EntireColumn', 'presentation'),
- 'command': '.uno:EntireColumn',
- 'accessibility': { focusBack: true, combination: 'CE', de: null }
- }
- ]
- },
- {
- 'type': 'toolbox',
- 'children': [
- {
- 'id': 'table-entire-row',
- 'type': 'toolitem',
- 'text': _UNO('.uno:EntireRow', 'presentation'),
- 'command': '.uno:EntireRow',
- 'accessibility': { focusBack: true, combination: 'RE', de: null }
- }
- ]
- }
- ],
- 'vertical': 'true'
- },
- ]
- },
- { type: 'separator', id: 'table-select-break', orientation: 'vertical' },
{
'type': 'overflowgroup',
'id': 'table-paragraph',
- 'name':_('Paragraph'),
+ 'name':_('Alignment'),
'accessibility': { focusBack: true, combination: 'CT', de: null },
'children' : [
{
@@ -2366,38 +2349,57 @@ window.L.Control.NotebookbarImpress = window.L.Control.NotebookbarWriter.extend(
},
{ type: 'separator', id: 'table-justifypara-break', orientation: 'vertical' },
{
- 'type': 'container',
- 'children': [
+ 'type': 'overflowgroup',
+ 'id': 'table-properties',
+ 'name':_('Design'),
+ 'accessibility': { focusBack: true, combination: 'SD', de: null },
+ 'more': {
+ 'command':'.uno:TableDialog',
+ 'accessibility': { focusBack: true, combination: 'MT', de: null },
+ },
+ 'children' : [
{
- 'type': 'toolbox',
- 'children': [
- {
- 'id': 'table-xline-color:ColorPickerMenu',
- 'noLabel': true,
- 'type': 'toolitem',
- 'text': _UNO('.uno:XLineColor'),
- 'command': '.uno:XLineColor',
- 'accessibility': { focusBack: true, combination: 'LC', de: null }
- }
- ]
+ 'id': 'table-table-dialog',
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:TableDialog', 'presentation', true),
+ 'command': '.uno:TableDialog',
+ 'accessibility': { focusBack: false, combination: 'SD', de: null }
},
{
- 'type': 'toolbox',
+ 'type': 'container',
'children': [
{
- 'id': 'table-fill-color:ColorPickerMenu',
- 'noLabel': true,
- 'type': 'toolitem',
- 'text': _UNO('.uno:FillColor'),
- 'command': '.uno:FillColor',
- 'accessibility': { focusBack: true, combination: 'FC', de: null }
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'id': 'table-xline-color:ColorPickerMenu',
+ 'type': 'menubutton',
+ 'text': _UNO('.uno:XLineColor'),
+ 'command': '.uno:XLineColor',
+ 'noLabel': true,
+ 'accessibility': { focusBack: true, combination: 'LC', de: null }
+ }
+ ]
+ },
+ {
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'id': 'table-fill-color:ColorPickerMenu',
+ 'type': 'menubutton',
+ 'text': _UNO('.uno:FillColor'),
+ 'command': '.uno:FillColor',
+ 'noLabel': true,
+ 'accessibility': { focusBack: true, combination: 'FC', de: null }
+ }
+ ]
}
- ]
- }
- ],
- 'vertical': 'true'
+ ],
+ 'vertical': 'true'
+ },
+ ]
},
- { type: 'separator', id: 'table-color-fill-break', orientation: 'vertical' },
+ { type: 'separator', id: 'table-bigtoolitem-break', orientation: 'vertical' },
{
'type': 'overflowgroup',
'id': 'table-align',
diff --git a/browser/src/control/Control.NotebookbarWriter.js b/browser/src/control/Control.NotebookbarWriter.js
index 37a72b73fb2d..575c3a73bd48 100644
--- a/browser/src/control/Control.NotebookbarWriter.js
+++ b/browser/src/control/Control.NotebookbarWriter.js
@@ -2481,18 +2481,19 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({

getTableTab: function() {
var content = [
- {
- 'type': 'bigtoolitem',
- 'text': _UNO('.uno:TableDialog', 'text', true),
- 'command': '.uno:TableDialog'
- },
- { type: 'separator', id: 'table-bigtoolitem-break', orientation: 'vertical' },
{
'type': 'overflowgroup',
- 'id': 'table-insert',
- 'name':_('Insert'),
- 'accessibility': { focusBack: false, combination: 'TI', de: null },
+ 'id': 'table-select',
+ 'name':_('Select'),
+ 'accessibility': { focusBack: false, combination: 'SE', de: null },
'children' : [
+ {
+ 'type': 'bigtoolitem',
+ 'id': 'table-entire-cell',
+ 'text': _UNO('.uno:EntireCell', 'text', true),
+ 'command': '.uno:EntireCell',
+ 'accessibility': { focusBack: true, combination: 'EC', de: null }
+ },
{
'type': 'container',
'children': [
@@ -2501,19 +2502,18 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
- 'text': _UNO('.uno:InsertColumnsBefore', 'text', true),
- 'command': '.uno:InsertColumnsBefore'
+ 'id': 'table-entire-column',
+ 'text': _UNO('.uno:EntireColumn', 'text'),
+ 'command': '.uno:EntireColumn',
+ 'accessibility': { focusBack: true, combination: 'CE', de: null }
},
{
'type': 'toolitem',
- 'text': _UNO('.uno:InsertColumnsAfter', 'text', true),
- 'command': '.uno:InsertColumnsAfter'
+ 'id': 'table-select-table',
+ 'text': _UNO('.uno:SelectTable', 'text', true),
+ 'command': '.uno:SelectTable',
+ 'accessibility': { focusBack: true, combination: 'ST', de: null }
},
- {
- 'type': 'toolitem',
- 'text': _UNO('.uno:DeleteColumns', 'text', true),
- 'command': '.uno:DeleteColumns'
- }
]
},
{
@@ -2521,19 +2521,18 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
- 'text': _UNO('.uno:InsertRowsBefore', 'text', true),
- 'command': '.uno:InsertRowsBefore'
+ 'id': 'table-entire-row',
+ 'text': _UNO('.uno:EntireRow', 'text'),
+ 'command': '.uno:EntireRow',
+ 'accessibility': { focusBack: true, combination: 'ER', de: null }
},
{
'type': 'toolitem',
- 'text': _UNO('.uno:InsertRowsAfter', 'text', true),
- 'command': '.uno:InsertRowsAfter'
+ 'id': 'table-delete-table',
+ 'text': _UNO('.uno:DeleteTable', 'text', true),
+ 'command': '.uno:DeleteTable',
+ 'accessibility': { focusBack: true, combination: 'DT', de: null }
},
- {
- 'type': 'toolitem',
- 'text': _UNO('.uno:DeleteRows', 'text', true),
- 'command': '.uno:DeleteRows'
- }
]
}
],
@@ -2541,18 +2540,12 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
},
]
},
- { type: 'separator', id: 'table-deleterows-break', orientation: 'vertical' },
- {
- 'type': 'bigtoolitem',
- 'text': _UNO('.uno:MergeCells', 'text'),
- 'command': '.uno:MergeCells'
- },
- { type: 'separator', id: 'table-mergecells-break', orientation: 'vertical' },
+ { type: 'separator', id: 'table-deletetable-break', orientation: 'vertical' },
{
'type': 'overflowgroup',
- 'id': 'table-split',
- 'name':_('Split'),
- 'accessibility': { focusBack: false, combination: 'TS', de: null },
+ 'id': 'table-insert',
+ 'name':_('Insert'),
+ 'accessibility': { focusBack: false, combination: 'TI', de: null },
'children' : [
{
'type': 'container',
@@ -2562,8 +2555,24 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
- 'text': _UNO('.uno:SplitCell', 'text'),
- 'command': '.uno:SplitCell'
+ 'id': 'table-insert-columns-before',
+ 'text': _UNO('.uno:InsertColumnsBefore', 'text', true),
+ 'command': '.uno:InsertColumnsBefore',
+ 'accessibility': { focusBack: true, combination: 'CB', de: null }
+ },
+ {
+ 'type': 'toolitem',
+ 'id': 'table-insert-columns-after',
+ 'text': _UNO('.uno:InsertColumnsAfter', 'text', true),
+ 'command': '.uno:InsertColumnsAfter',
+ 'accessibility': { focusBack: true, combination: 'CA', de: null }
+ },
+ {
+ 'type': 'toolitem',
+ 'id': 'table-insert-delete-columns',
+ 'text': _UNO('.uno:DeleteColumns', 'text', true),
+ 'command': '.uno:DeleteColumns',
+ 'accessibility': { focusBack: true, combination: 'CD', de: null }
}
]
},
@@ -2572,8 +2581,24 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
- 'text': _UNO('.uno:SplitTable', 'text'),
- 'command': '.uno:SplitTable'
+ 'id': 'table-insert-rows-before',
+ 'text': _UNO('.uno:InsertRowsBefore', 'text', true),
+ 'command': '.uno:InsertRowsBefore',
+ 'accessibility': { focusBack: true, combination: 'RB', de: null }
+ },
+ {
+ 'type': 'toolitem',
+ 'id': 'table-insert-rows-after',
+ 'text': _UNO('.uno:InsertRowsAfter', 'text', true),
+ 'command': '.uno:InsertRowsAfter',
+ 'accessibility': { focusBack: true, combination: 'RA', de: null }
+ },
+ {
+ 'type': 'toolitem',
+ 'id': 'table-insert-delete-rows',
+ 'text': _UNO('.uno:DeleteRows', 'text', true),
+ 'command': '.uno:DeleteRows',
+ 'accessibility': { focusBack: true, combination: 'RD', de: null }
}
]
}
@@ -2582,44 +2607,18 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
},
]
},
- { type: 'separator', id: 'table-splittable-break', orientation: 'vertical' },
- {
- 'type': 'container',
- 'children': [
- {
- 'type': 'toolbox',
- 'children': [
- {
- 'type': 'toolitem',
- 'text': _UNO('.uno:Protect', 'text'),
- 'command': '.uno:Protect'
- }
- ]
- },
- {
- 'type': 'toolbox',
- 'children': [
- {
- 'type': 'toolitem',
- 'text': _UNO('.uno:UnsetCellsReadOnly', 'text'),
- 'command': '.uno:UnsetCellsReadOnly'
- }
- ]
- }
- ],
- 'vertical': 'true'
- },
- { type: 'separator', id: 'table-unsetcellsreadonly-break', orientation: 'vertical' },
+ { type: 'separator', id: 'table-deleterows-break', orientation: 'vertical' },
{
'type': 'overflowgroup',
- 'id': 'table-select',
- 'name':_('Select'),
- 'accessibility': { focusBack: false, combination: 'TC', de: null },
+ 'id': 'table-split',
+ 'name':_('Merge & Split'),
'children' : [
{
'type': 'bigtoolitem',
- 'text': _UNO('.uno:EntireCell', 'text', true),
- 'command': '.uno:EntireCell'
+ 'id': 'table-insert-merge-cells',
+ 'text': _UNO('.uno:MergeCells', 'text'),
+ 'command': '.uno:MergeCells',
+ 'accessibility': { focusBack: true, combination: 'MC', de: null },
},
{
'type': 'container',
@@ -2629,14 +2628,11 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
- 'text': _UNO('.uno:EntireColumn', 'presentation'),
- 'command': '.uno:EntireColumn'
- },
- {
- 'type': 'toolitem',
- 'text': _UNO('.uno:SelectTable', 'text', true),
- 'command': '.uno:SelectTable'
- },
+ 'id': 'table-insert-split-cell',
+ 'text': _UNO('.uno:SplitCell', 'text'),
+ 'command': '.uno:SplitCell',
+ 'accessibility': { focusBack: true, combination: 'SC', de: null }
+ }
]
},
{
@@ -2644,14 +2640,11 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
- 'text': _UNO('.uno:EntireRow', 'presentation'),
- 'command': '.uno:EntireRow'
- },
- {
- 'type': 'toolitem',
- 'text': _UNO('.uno:DeleteTable', 'text', true),
- 'command': '.uno:DeleteTable'
- },
+ 'id': 'table-insert-split-table',
+ 'text': _UNO('.uno:SplitTable', 'text'),
+ 'command': '.uno:SplitTable',
+ 'accessibility': { focusBack: true, combination: 'TS', de: null }
+ }
]
}
],
@@ -2659,12 +2652,12 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
},
]
},
- { type: 'separator', id: 'table-deletetable-break', orientation: 'vertical' },
+ { type: 'separator', id: 'table-splittable-break', orientation: 'vertical' },
{
'type': 'overflowgroup',
- 'id': 'table-paragraph-table',// id-should be unique for overflowgroup options
- 'name':_('Paragraph'),
- 'accessibility': { focusBack: false, combination: 'TB', de: null },
+ 'id': 'table-alignment',
+ 'name':_('Alignment'),
+ 'accessibility': { focusBack: true, combination: 'CT', de: null },
'children' : [
{
'type': 'container',
@@ -2674,18 +2667,24 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
+ 'id': 'table-cell-vert-top',
'text': _UNO('.uno:CellVertTop'),
- 'command': '.uno:CellVertTop'
+ 'command': '.uno:CellVertTop',
+ 'accessibility': { focusBack: true, combination: 'CT', de: null }
},
{
'type': 'toolitem',
+ 'id': 'table-cell-vert-center',
'text': _UNO('.uno:CellVertCenter'),
- 'command': '.uno:CellVertCenter'
+ 'command': '.uno:CellVertCenter',
+ 'accessibility': { focusBack: true, combination: 'CC', de: null }
},
{
'type': 'toolitem',
+ 'id': 'table-cell-vert-bottom',
'text': _UNO('.uno:CellVertBottom'),
- 'command': '.uno:CellVertBottom'
+ 'command': '.uno:CellVertBottom',
+ 'accessibility': { focusBack: true, combination: 'CM', de: null }
}
]
},
@@ -2694,23 +2693,31 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
+ 'id': 'table-left-para',
'text': _UNO('.uno:LeftPara'),
- 'command': '.uno:LeftPara'
+ 'command': '.uno:LeftPara',
+ 'accessibility': { focusBack: true, combination: 'PL', de: null }
},
{
'type': 'toolitem',
+ 'id': 'table-center-para',
'text': _UNO('.uno:CenterPara'),
- 'command': '.uno:CenterPara'
+ 'command': '.uno:CenterPara',
+ 'accessibility': { focusBack: true, combination: 'PC', de: null }
},
{
'type': 'toolitem',
+ 'id': 'table-right-para',
'text': _UNO('.uno:RightPara'),
- 'command': '.uno:RightPara'
+ 'command': '.uno:RightPara',
+ 'accessibility': { focusBack: true, combination: 'PR', de: null }
},
{
'type': 'toolitem',
+ 'id': 'table-justify-para',
'text': _UNO('.uno:JustifyPara'),
- 'command': '.uno:JustifyPara'
+ 'command': '.uno:JustifyPara',
+ 'accessibility': { focusBack: true, combination: 'PJ', de: null }
}
]
}
@@ -2721,23 +2728,74 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
},
{ type: 'separator', id: 'table-justifypara-break', orientation: 'vertical' },
{
- 'type': 'bigtoolitem',
- 'text': _UNO('.uno:TableSort', 'text'),
- 'command': '.uno:TableSort'
- },
- { type: 'separator', id: 'table-tablesort-break', orientation: 'vertical' },
- {
- 'type': 'bigtoolitem',
- 'text': _UNO('.uno:TableNumberFormatDialog', 'text'),
- 'command': '.uno:TableNumberFormatDialog'
+ 'type': 'overflowgroup',
+ 'id': 'table-design',
+ 'name':_('Design'),
+ 'accessibility': { focusBack: true, combination: 'SD', de: null },
+ 'more': {
+ 'command':'.uno:TableDialog',
+ 'accessibility': { focusBack: true, combination: 'MT', de: null },
+ },
+ 'children' : [
+ {
+ 'id': 'table-table-dialog',
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:TableDialog', 'text', true),
+ 'command': '.uno:TableDialog',
+ 'accessibility': { focusBack: false, combination: 'SD', de: null }
+ },
+ {
+ 'type': 'container',
+ 'children': [
+ {
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type': 'menubutton',
+ 'id': 'set-border-style:BorderStyleMenuWriter',
+ 'noLabel': true,
+ 'text': _('Borders'),
+ 'command': '.uno:SetBorderStyle',
+ 'accessibility': { focusBack: true, combination: 'BL', de: null }
+ }
+ ]
+ },
+ {
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type': 'menubutton',
+ 'id': 'table-xline-color:ColorPickerMenu',
+ 'noLabel': true,
+ 'text': _('Cell Background'),
+ 'command': '.uno:TableCellBackgroundColor',
+ 'accessibility': { focusBack: true, combination: 'BC', de: null }
+ }
+ ]
+ }
+ ],
+ 'vertical': 'true'
+ },
+ ]
},
- { type: 'separator', id: 'table-tablenumberformatdialog-break', orientation: 'vertical' },
+ { type: 'separator', id: 'table-bigtoolitem-break', orientation: 'vertical' },
{
'type': 'overflowgroup',
'id': 'table-number-format',
- 'name':_('Number Format'),
- 'accessibility': { focusBack: false, combination: 'TN', de: null },
+ 'name':_('Format'),
+ 'accessibility': { focusBack: true, combination: 'FO', de: null },
+ 'more': {
+ 'command':'.uno:TableNumberFormatDialog',
+ 'accessibility': { focusBack: true, combination: 'MN', de: null },
+ },
'children' : [
+ {
+ 'type': 'bigtoolitem',
+ 'id': 'table-number-format-dialog',
+ 'text': _UNO('.uno:TableNumberFormatDialog', 'text'),
+ 'command': '.uno:TableNumberFormatDialog',
+ 'accessibility': { focusBack: true, combination: 'NF', de: null }
+ },
{
'type': 'container',
'children': [
@@ -2746,49 +2804,94 @@ window.L.Control.NotebookbarWriter = window.L.Control.Notebookbar.extend({
'children': [
{
'type': 'toolitem',
+ 'id': 'table-number-format-currency',
'text': _UNO('.uno:NumberFormatCurrency', 'text'),
- 'command': '.uno:NumberFormatCurrency'
+ 'command': '.uno:NumberFormatCurrency',
+ 'accessibility': { focusBack: true, combination: 'FC', de: null }
},
{
'type': 'toolitem',
- 'text': _UNO('.uno:NumberFormatDate', 'text'),
- 'command': '.uno:NumberFormatDate'
+ 'id': 'table-number-format-percent',
+ 'text': _UNO('.uno:NumberFormatPercent', 'text', true),
+ 'command': '.uno:NumberFormatPercent',
+ 'accessibility': { focusBack: true, combination: 'NP', de: null }
},
- {
- 'type': 'toolitem',
- 'text': _UNO('.uno:NumberFormatPercent', 'text'),
- 'command': '.uno:NumberFormatPercent'
- }
]
},
+ {
+ 'type': 'toolitem',
+ 'id': 'table-number-format-date',
+ 'text': _UNO('.uno:NumberFormatDate', 'text', false),
+ 'command': '.uno:NumberFormatDate',
+ 'accessibility': { focusBack: true, combination: 'DA', de: null }
+ }
],
'vertical': 'true'
},
+ ]
+ },
+ { type: 'separator', id: 'table-unsetcellsreadonly-break', orientation: 'vertical' },
+ {
+ 'type': 'overflowgroup',
+ 'id': 'table-sort-group',
+ 'name':_('Sort'),
+ 'accessibility': { focusBack: true, combination: 'SO', de: null },
+ 'children' : [
{
- 'type': 'toolbox',
+ 'type': 'bigtoolitem',
+ 'id': 'table-table-sort',
+ 'text': _UNO('.uno:TableSort', 'text'),
+ 'command': '.uno:TableSort',
+ 'accessibility': { focusBack: true, combination: 'SO', de: null }
+ }
+ ]
+ },
+ { type: 'separator', id: 'table-sort-break', orientation: 'vertical' },
+ {
+ 'type': 'overflowgroup',
+ 'id': 'table-protect-group',
+ 'name':_('Protect'),
+ 'accessibility': { focusBack: true, combination: 'PR', de: null },
+ 'children' : [
+ {
+ 'type': 'container',
'children': [
{
- 'type': 'toolitem',
- 'text': _UNO('.uno:TableCellBackgroundColor', 'text'),
- 'command': '.uno:TableCellBackgroundColor',
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type': 'toolitem',
+ 'id': 'table-protect-cell',
+ 'text': _UNO('.uno:Protect', 'text'),
+ 'command': '.uno:Protect',
+ 'accessibility': { focusBack: true, combination: 'PP', de: null }
+ }
+ ]
},
{
- 'id': 'set-border-style:BorderStyleMenuWriter',
- 'type': 'menubutton',
- 'noLabel': true,
- 'text': _UNO('.uno:SetBorderStyle', 'text'),
- 'command': '.uno:SetBorderStyle'
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type': 'toolitem',
+ 'id': 'table-unset-cells-read-only',
+ 'text': _UNO('.uno:UnsetCellsReadOnly', 'text'),
+ 'command': '.uno:UnsetCellsReadOnly',
+ 'accessibility': { focusBack: true, combination: 'UP', de: null }
+ }
+ ]
}
- ]
- }
- ],
- 'vertical': 'true'
+ ],
+ 'vertical': 'true'
+ },
+ ]
},
{ type: 'separator', id: 'table-numberformatpercent-break', orientation: 'vertical' },
{
'type': 'bigtoolitem',
+ 'id': 'table-insert-caption-dialog',
'text': _UNO('.uno:InsertCaptionDialog', 'text'),
- 'command': '.uno:InsertCaptionDialog'
+ 'command': '.uno:InsertCaptionDialog',
+ 'accessibility': { focusBack: true, combination: 'IC', de: null }
},
];

commit da2ef39df407990ebadcc0932b0e41e66c39ff86
Author: Pedro Pinto Silva <pedro...@collabora.com>
AuthorDate: Wed May 20 15:37:43 2026 +0200
Commit: Pedro Pinto Silva <pedro...@collabora.com>
CommitDate: Mon May 25 12:28:50 2026 +0000

Convert hard coded opacity for disabled button into css var

new: --opacity-icon-disabled

Signed-off-by: Pedro Pinto Silva <pedro...@collabora.com>
Change-Id: I1da5baad34d957686de652ecc285d1f3009be5ee
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/3001
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/browser/css/color-palette-dark.css b/browser/css/color-palette-dark.css
index 60a1d576c960..b3d2d2d0bb04 100644
--- a/browser/css/color-palette-dark.css
+++ b/browser/css/color-palette-dark.css
@@ -80,6 +80,11 @@

--color-backstage-background: #1E1E1E;
--color-backstage-background-dark: #121212;
+
+ /* --opacity-icon: 1; */
+ /* --opacity-icon-hover: 1; */
+ /* --opacity-icon-active: 1; */
+ --opacity-icon-disabled: 0.65;
}

[data-bg-theme='dark'] {
diff --git a/browser/css/color-palette.css b/browser/css/color-palette.css
index 1a85766b0758..553fec6e30a8 100644
--- a/browser/css/color-palette.css
+++ b/browser/css/color-palette.css
@@ -89,6 +89,11 @@

--color-backstage-background : #f5f5f5;
--color-backstage-background-dark : #f0f0f0;
+
+ /* --opacity-icon: 1; */
+ /* --opacity-icon-hover: 1; */
+ /* --opacity-icon-active: 1; */
+ --opacity-icon-disabled: 0.65;
}

[data-bg-theme='light'] {
diff --git a/browser/css/notebookbar.css b/browser/css/notebookbar.css
index a5d3bfa41618..94f7885f76d5 100644
--- a/browser/css/notebookbar.css
+++ b/browser/css/notebookbar.css
@@ -394,7 +394,7 @@ label.notebookbar.ui-checkbox-label {
.unotoolbutton[disabled]:not(.unospan-shortcutstoolbox),
.mobile-wizard-widebutton.disabled,
.locking-disabled {
- opacity: 0.65;
+ opacity: var(--opacity-icon-disabled);
cursor: not-allowed;
}

commit 33c69aaaf6b9381deba6557647c811c720a7bc5f
Author: Pedro Pinto Silva <pedro...@collabora.com>
AuthorDate: Wed May 20 14:47:45 2026 +0200
Commit: Pedro Pinto Silva <pedro...@collabora.com>
CommitDate: Mon May 25 12:28:36 2026 +0000

Removing dead has-dropdown--color css rule

as it was removed in 361039c52850
- "remove-w2ui: reuse MenuButton for color picker button"
- by Szymon Kłos (March 13, 2024)

Signed-off-by: Pedro Pinto Silva <pedro...@collabora.com>
Change-Id: I59cd45534250d8fbe570c31e7b0738de69474d72
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/3000
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/browser/css/notebookbar.css b/browser/css/notebookbar.css
index cb9260602cb2..a5d3bfa41618 100644
--- a/browser/css/notebookbar.css
+++ b/browser/css/notebookbar.css
@@ -343,10 +343,6 @@ html[data-theme='dark'] .savemodified.unotoolbutton:not(.notebookbar) .unobutton
height: var(--btn-img-size);
}

-.has-dropdown--color.notebookbar {
- height: var(--btn-size) !important;
-}
-
.unotoolbutton.notebookbar .unolabel {
font-size: var(--header-font-size);
font-family: var(--cool-font);