diff --git a/browser/src/control/Control.NotebookbarImpress.js b/browser/src/control/Control.NotebookbarImpress.js index 7536314c620a4..3f25bb798c80d 100644 --- a/browser/src/control/Control.NotebookbarImpress.js +++ b/browser/src/control/Control.NotebookbarImpress.js @@ -546,6 +546,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ ], 'vertical': 'true' }, + { type: 'separator', id: 'home-undoredo-break', orientation: 'vertical' }, { 'id': 'home-paste:PasteMenu', 'type': 'menubutton', @@ -598,6 +599,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ ], 'vertical': 'true' }, + { type: 'separator', id: 'home-resertattributes-break', orientation: 'vertical' }, { 'type': 'container', 'children': [ @@ -726,6 +728,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ ], 'vertical': 'true' }, + { type: 'separator', id: 'home-fontcombobox-break', orientation: 'vertical' }, { 'id': 'home-insert-annotation', 'type': 'bigtoolitem', @@ -733,6 +736,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ 'command': '.uno:InsertAnnotation', 'accessibility': { focusBack: false, combination: 'ZC', de: 'ZC' } }, + { type: 'separator', id: 'home-insertannotation-break', orientation: 'vertical' }, { 'type': 'container', 'children': [ @@ -743,25 +747,46 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ 'type': 'toolbox', 'children': [ { - 'id': 'home-cell-vertical-top', + 'id': 'home-default-bullet', 'type': 'toolitem', - 'text': _UNO('.uno:CellVertTop'), - 'command': '.uno:CellVertTop', - 'accessibility': { focusBack: true, combination: 'LT', de: null } + 'text': _UNO('.uno:DefaultBullet'), + 'command': '.uno:DefaultBullet', + 'accessibility': { focusBack: true, combination: 'DB', de: null } }, { - 'id': 'home-cell-vertical-center', + 'id': 'home-default-numbering', 'type': 'toolitem', - 'text': _UNO('.uno:CellVertCenter'), - 'command': '.uno:CellVertCenter', - 'accessibility': { focusBack: true, combination: 'LC', de: null } + 'text': _UNO('.uno:DefaultNumbering'), + 'command': '.uno:DefaultNumbering', + 'accessibility': { focusBack: true, combination: 'DN', de: null } }, { - 'id': 'home-cell-vertical-bottom', + 'id': 'home-increment-indent', 'type': 'toolitem', - 'text': _UNO('.uno:CellVertBottom'), - 'command': '.uno:CellVertBottom', - 'accessibility': { focusBack: true, combination: 'LB', de: null } + 'text': _UNO('.uno:IncrementIndent'), + 'command': '.uno:IncrementIndent', + 'accessibility': { focusBack: true, combination: 'AI', de: null } + }, + { + 'id': 'home-decrement-indent', + 'type': 'toolitem', + 'text': _UNO('.uno:DecrementIndent'), + 'command': '.uno:DecrementIndent', + 'accessibility': { focusBack: true, combination: 'AO', de: null } + }, + { + 'id': 'home-para-left-to-right', + 'type': 'toolitem', + 'text': _UNO('.uno:ParaLeftToRight'), + 'command': '.uno:ParaLeftToRight', + 'accessibility': { focusBack: true, combination: 'TR', de: null } + }, + { + 'id': 'home-para-right-to-left', + 'type': 'toolitem', + 'text': _UNO('.uno:ParaRightToLeft'), + 'command': '.uno:ParaRightToLeft', + 'accessibility': { focusBack: true, combination: 'TL', de: null } } ] }, @@ -802,7 +827,15 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ 'text': _UNO('.uno:JustifyPara'), 'command': '.uno:JustifyPara', 'accessibility': { focusBack: true, combination: 'PJ', de: null } - } + }, + { + 'id': 'home-line-spacing:LineSpacingMenu', + 'type': 'menubutton', + 'noLabel': true, + 'text': _UNO('.uno:LineSpacing'), + 'command': '.uno:LineSpacing', + 'accessibility': { focusBack: false, combination: 'SL', de: null } + }, ] }, ], @@ -811,6 +844,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ ], 'vertical': 'true' }, + { type: 'separator', id: 'home-linespacingmenu-break', orientation: 'vertical' }, { 'type': 'container', 'children': [ @@ -821,39 +855,25 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ 'type': 'toolbox', 'children': [ { - 'id': 'home-default-bullet', - 'type': 'toolitem', - 'text': _UNO('.uno:DefaultBullet'), - 'command': '.uno:DefaultBullet', - 'accessibility': { focusBack: true, combination: 'DB', de: null } - }, - { - 'id': 'home-default-numbering', - 'type': 'toolitem', - 'text': _UNO('.uno:DefaultNumbering'), - 'command': '.uno:DefaultNumbering', - 'accessibility': { focusBack: true, combination: 'DN', de: null } - }, - { - 'id': 'home-increment-indent', + 'id': 'home-cell-vertical-top', 'type': 'toolitem', - 'text': _UNO('.uno:IncrementIndent'), - 'command': '.uno:IncrementIndent', - 'accessibility': { focusBack: true, combination: 'AI', de: null } + 'text': _UNO('.uno:CellVertTop'), + 'command': '.uno:CellVertTop', + 'accessibility': { focusBack: true, combination: 'LT', de: null } }, { - 'id': 'home-decrement-indent', + 'id': 'home-cell-vertical-center', 'type': 'toolitem', - 'text': _UNO('.uno:DecrementIndent'), - 'command': '.uno:DecrementIndent', - 'accessibility': { focusBack: true, combination: 'AO', de: null } + 'text': _UNO('.uno:CellVertCenter'), + 'command': '.uno:CellVertCenter', + 'accessibility': { focusBack: true, combination: 'LC', de: null } }, { - 'id': 'home-para-left-to-right', + 'id': 'home-cell-vertical-bottom', 'type': 'toolitem', - 'text': _UNO('.uno:ParaLeftToRight'), - 'command': '.uno:ParaLeftToRight', - 'accessibility': { focusBack: true, combination: 'TR', de: null } + 'text': _UNO('.uno:CellVertBottom'), + 'command': '.uno:CellVertBottom', + 'accessibility': { focusBack: true, combination: 'LB', de: null } } ] }, @@ -861,49 +881,32 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ 'vertical': 'false' }, { - 'type': 'container', + 'type': 'toolbox', 'children': [ { - 'id': 'SectionBottom13', - 'type': 'toolbox', - 'children': [ - { - 'id': 'home-para-space-increase', - 'type': 'toolitem', - 'text': _UNO('.uno:ParaspaceIncrease'), - 'command': '.uno:ParaspaceIncrease', - 'accessibility': { focusBack: true, combination: 'SI', de: null } - }, - { - 'id': 'home-para-space-decrease', - 'type': 'toolitem', - 'text': _UNO('.uno:ParaspaceDecrease'), - 'command': '.uno:ParaspaceDecrease', - 'accessibility': { focusBack: true, combination: 'SR', de: null } - }, - { - 'id': 'home-line-spacing:LineSpacingMenu', - 'type': 'menubutton', - 'noLabel': true, - 'text': _UNO('.uno:LineSpacing'), - 'command': '.uno:LineSpacing', - 'accessibility': { focusBack: false, combination: 'SL', de: null } - }, - { - 'id': 'home-para-right-to-left', - 'type': 'toolitem', - 'text': _UNO('.uno:ParaRightToLeft'), - 'command': '.uno:ParaRightToLeft', - 'accessibility': { focusBack: true, combination: 'TL', de: null } - } - ] + 'id': 'home-xline-color:ColorPickerMenu', + 'noLabel': true, + 'class': 'unospan-XLineColor', + 'type': 'toolitem', + 'text': _UNO('.uno:XLineColor'), + 'command': '.uno:XLineColor', + 'accessibility': { focusBack: true, combination: 'LR', de: null } }, - ], - 'vertical': 'false' + { + 'id': 'home-fill-color:ColorPickerMenu', + 'noLabel': true, + 'class': 'unospan-FillColor', + 'type': 'toolitem', + 'text': _UNO('.uno:FillColor'), + 'command': '.uno:FillColor', + 'accessibility': { focusBack: true, combination: 'BC', de: null } + } + ] } ], 'vertical': 'true' }, + { type: 'separator', id: 'home-fillcolormenu-break', orientation: 'vertical' }, { 'id': 'home-text', 'type': 'bigtoolitem', @@ -911,6 +914,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ 'command': '.uno:Text', 'accessibility': { focusBack: true, combination: 'TI', de: null } }, + { type: 'separator', id: 'home-inserttext-break', orientation: 'vertical' }, { 'type': 'container', 'children': [ @@ -945,40 +949,6 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ ], 'vertical': 'true' }, - { - 'type': 'container', - 'children': [ - { - 'type': 'toolbox', - 'children': [ - { - 'id': 'home-xline-color:ColorPickerMenu', - 'noLabel': true, - 'class': 'unospan-XLineColor', - 'type': 'toolitem', - 'text': _UNO('.uno:XLineColor'), - 'command': '.uno:XLineColor', - 'accessibility': { focusBack: true, combination: 'LR', de: null } - } - ] - }, - { - 'type': 'toolbox', - 'children': [ - { - 'id': 'home-fill-color:ColorPickerMenu', - 'noLabel': true, - 'class': 'unospan-FillColor', - 'type': 'toolitem', - 'text': _UNO('.uno:FillColor'), - 'command': '.uno:FillColor', - 'accessibility': { focusBack: true, combination: 'BC', de: null } - } - ] - } - ], - 'vertical': 'true' - }, { 'type': 'container', 'children': [ @@ -1032,6 +1002,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ ], 'vertical': 'true' }, + { type: 'separator', id: 'home-insertobjectchart-break', orientation: 'vertical' }, { 'id': 'home-presentation', 'class': 'unoPresentation', @@ -1040,6 +1011,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({ 'command': 'presentation', 'accessibility': { focusBack: true, combination: 'PT', de: null } }, + { type: 'separator', id: 'home-presentation-break', orientation: 'vertical' }, { 'type': 'container', 'children': [