Skip to content

Commit 4549a51

Browse files
pedropintosilvapedropintosilva
committed
Impress: Home tab: shuffle buttons, better grouping and space
Signed-off-by: Pedro Pinto Silva <[email protected]> Change-Id: Ie321796bd2ed19537c5f6f284facf1aa414cc13f
1 parent 5b86a3d commit 4549a51

File tree

1 file changed

+72
-109
lines changed

1 file changed

+72
-109
lines changed

‎browser/src/control/Control.NotebookbarImpress.js

Lines changed: 72 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -743,25 +743,46 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
743743
'type': 'toolbox',
744744
'children': [
745745
{
746-
'id': 'home-cell-vertical-top',
746+
'id': 'home-default-bullet',
747747
'type': 'toolitem',
748-
'text': _UNO('.uno:CellVertTop'),
749-
'command': '.uno:CellVertTop',
750-
'accessibility': { focusBack: true, combination: 'LT', de: null }
748+
'text': _UNO('.uno:DefaultBullet'),
749+
'command': '.uno:DefaultBullet',
750+
'accessibility': { focusBack: true, combination: 'DB', de: null }
751751
},
752752
{
753-
'id': 'home-cell-vertical-center',
753+
'id': 'home-default-numbering',
754754
'type': 'toolitem',
755-
'text': _UNO('.uno:CellVertCenter'),
756-
'command': '.uno:CellVertCenter',
757-
'accessibility': { focusBack: true, combination: 'LC', de: null }
755+
'text': _UNO('.uno:DefaultNumbering'),
756+
'command': '.uno:DefaultNumbering',
757+
'accessibility': { focusBack: true, combination: 'DN', de: null }
758758
},
759759
{
760-
'id': 'home-cell-vertical-bottom',
760+
'id': 'home-increment-indent',
761761
'type': 'toolitem',
762-
'text': _UNO('.uno:CellVertBottom'),
763-
'command': '.uno:CellVertBottom',
764-
'accessibility': { focusBack: true, combination: 'LB', de: null }
762+
'text': _UNO('.uno:IncrementIndent'),
763+
'command': '.uno:IncrementIndent',
764+
'accessibility': { focusBack: true, combination: 'AI', de: null }
765+
},
766+
{
767+
'id': 'home-decrement-indent',
768+
'type': 'toolitem',
769+
'text': _UNO('.uno:DecrementIndent'),
770+
'command': '.uno:DecrementIndent',
771+
'accessibility': { focusBack: true, combination: 'AO', de: null }
772+
},
773+
{
774+
'id': 'home-para-left-to-right',
775+
'type': 'toolitem',
776+
'text': _UNO('.uno:ParaLeftToRight'),
777+
'command': '.uno:ParaLeftToRight',
778+
'accessibility': { focusBack: true, combination: 'TR', de: null }
779+
},
780+
{
781+
'id': 'home-para-right-to-left',
782+
'type': 'toolitem',
783+
'text': _UNO('.uno:ParaRightToLeft'),
784+
'command': '.uno:ParaRightToLeft',
785+
'accessibility': { focusBack: true, combination: 'TL', de: null }
765786
}
766787
]
767788
},
@@ -802,7 +823,15 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
802823
'text': _UNO('.uno:JustifyPara'),
803824
'command': '.uno:JustifyPara',
804825
'accessibility': { focusBack: true, combination: 'PJ', de: null }
805-
}
826+
},
827+
{
828+
'id': 'home-line-spacing:LineSpacingMenu',
829+
'type': 'menubutton',
830+
'noLabel': true,
831+
'text': _UNO('.uno:LineSpacing'),
832+
'command': '.uno:LineSpacing',
833+
'accessibility': { focusBack: false, combination: 'SL', de: null }
834+
},
806835
]
807836
},
808837
],
@@ -821,85 +850,53 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
821850
'type': 'toolbox',
822851
'children': [
823852
{
824-
'id': 'home-default-bullet',
825-
'type': 'toolitem',
826-
'text': _UNO('.uno:DefaultBullet'),
827-
'command': '.uno:DefaultBullet',
828-
'accessibility': { focusBack: true, combination: 'DB', de: null }
829-
},
830-
{
831-
'id': 'home-default-numbering',
832-
'type': 'toolitem',
833-
'text': _UNO('.uno:DefaultNumbering'),
834-
'command': '.uno:DefaultNumbering',
835-
'accessibility': { focusBack: true, combination: 'DN', de: null }
836-
},
837-
{
838-
'id': 'home-increment-indent',
853+
'id': 'home-cell-vertical-top',
839854
'type': 'toolitem',
840-
'text': _UNO('.uno:IncrementIndent'),
841-
'command': '.uno:IncrementIndent',
842-
'accessibility': { focusBack: true, combination: 'AI', de: null }
855+
'text': _UNO('.uno:CellVertTop'),
856+
'command': '.uno:CellVertTop',
857+
'accessibility': { focusBack: true, combination: 'LT', de: null }
843858
},
844859
{
845-
'id': 'home-decrement-indent',
860+
'id': 'home-cell-vertical-center',
846861
'type': 'toolitem',
847-
'text': _UNO('.uno:DecrementIndent'),
848-
'command': '.uno:DecrementIndent',
849-
'accessibility': { focusBack: true, combination: 'AO', de: null }
862+
'text': _UNO('.uno:CellVertCenter'),
863+
'command': '.uno:CellVertCenter',
864+
'accessibility': { focusBack: true, combination: 'LC', de: null }
850865
},
851866
{
852-
'id': 'home-para-left-to-right',
867+
'id': 'home-cell-vertical-bottom',
853868
'type': 'toolitem',
854-
'text': _UNO('.uno:ParaLeftToRight'),
855-
'command': '.uno:ParaLeftToRight',
856-
'accessibility': { focusBack: true, combination: 'TR', de: null }
869+
'text': _UNO('.uno:CellVertBottom'),
870+
'command': '.uno:CellVertBottom',
871+
'accessibility': { focusBack: true, combination: 'LB', de: null }
857872
}
858873
]
859874
},
860875
],
861876
'vertical': 'false'
862877
},
863878
{
864-
'type': 'container',
879+
'type': 'toolbox',
865880
'children': [
866881
{
867-
'id': 'SectionBottom13',
868-
'type': 'toolbox',
869-
'children': [
870-
{
871-
'id': 'home-para-space-increase',
872-
'type': 'toolitem',
873-
'text': _UNO('.uno:ParaspaceIncrease'),
874-
'command': '.uno:ParaspaceIncrease',
875-
'accessibility': { focusBack: true, combination: 'SI', de: null }
876-
},
877-
{
878-
'id': 'home-para-space-decrease',
879-
'type': 'toolitem',
880-
'text': _UNO('.uno:ParaspaceDecrease'),
881-
'command': '.uno:ParaspaceDecrease',
882-
'accessibility': { focusBack: true, combination: 'SR', de: null }
883-
},
884-
{
885-
'id': 'home-line-spacing:LineSpacingMenu',
886-
'type': 'menubutton',
887-
'noLabel': true,
888-
'text': _UNO('.uno:LineSpacing'),
889-
'command': '.uno:LineSpacing',
890-
'accessibility': { focusBack: false, combination: 'SL', de: null }
891-
},
892-
{
893-
'id': 'home-para-right-to-left',
894-
'type': 'toolitem',
895-
'text': _UNO('.uno:ParaRightToLeft'),
896-
'command': '.uno:ParaRightToLeft',
897-
'accessibility': { focusBack: true, combination: 'TL', de: null }
898-
}
899-
]
882+
'id': 'home-xline-color:ColorPickerMenu',
883+
'noLabel': true,
884+
'class': 'unospan-XLineColor',
885+
'type': 'toolitem',
886+
'text': _UNO('.uno:XLineColor'),
887+
'command': '.uno:XLineColor',
888+
'accessibility': { focusBack: true, combination: 'LR', de: null }
900889
},
901-
],
902-
'vertical': 'false'
890+
{
891+
'id': 'home-fill-color:ColorPickerMenu',
892+
'noLabel': true,
893+
'class': 'unospan-FillColor',
894+
'type': 'toolitem',
895+
'text': _UNO('.uno:FillColor'),
896+
'command': '.uno:FillColor',
897+
'accessibility': { focusBack: true, combination: 'BC', de: null }
898+
}
899+
]
903900
}
904901
],
905902
'vertical': 'true'
@@ -945,40 +942,6 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
945942
],
946943
'vertical': 'true'
947944
},
948-
{
949-
'type': 'container',
950-
'children': [
951-
{
952-
'type': 'toolbox',
953-
'children': [
954-
{
955-
'id': 'home-xline-color:ColorPickerMenu',
956-
'noLabel': true,
957-
'class': 'unospan-XLineColor',
958-
'type': 'toolitem',
959-
'text': _UNO('.uno:XLineColor'),
960-
'command': '.uno:XLineColor',
961-
'accessibility': { focusBack: true, combination: 'LR', de: null }
962-
}
963-
]
964-
},
965-
{
966-
'type': 'toolbox',
967-
'children': [
968-
{
969-
'id': 'home-fill-color:ColorPickerMenu',
970-
'noLabel': true,
971-
'class': 'unospan-FillColor',
972-
'type': 'toolitem',
973-
'text': _UNO('.uno:FillColor'),
974-
'command': '.uno:FillColor',
975-
'accessibility': { focusBack: true, combination: 'BC', de: null }
976-
}
977-
]
978-
}
979-
],
980-
'vertical': 'true'
981-
},
982945
{
983946
'type': 'container',
984947
'children': [

0 commit comments

Comments
 (0)