[Libreoffice-commits] online.git: 2 commits - loleaflet/src

Andras Timar andras.timar at collabora.com
Fri Oct 28 09:44:35 UTC 2016


 loleaflet/src/control/Control.Menubar.js |   95 ++++++++++++++++++++++++++-----
 1 file changed, 81 insertions(+), 14 deletions(-)

New commits:
commit ab0bd735e168cab01abd333b3ab3aad4fb3384b1
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Oct 28 11:43:58 2016 +0200

    Writer Format menu

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index ada6e02..9bfafeb 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -40,6 +40,73 @@ L.Control.Menubar = L.Control.extend({
 												{name: _('Page break'), type: 'unocommand', uno: '.uno:InsertPageBreak'},
 												{name: _('Column break'), type: 'unocommand', uno: '.uno:InsertColumnBreak'}]
 			},
+			{name: _('Format'), type: 'menu', menu:[
+				{name: _('Text'), type: 'menu', menu: [
+						{name: _('Bold'), type: 'unocommand', uno: '.uno:Bold'},
+						{name: _('Italic'), type: 'unocommand', uno: '.uno:Italic'},
+						{name: _('Underline'), type: 'unocommand', uno: '.uno:Underline'},
+						{name: _('Double underline'), type: 'unocommand', uno: '.uno:UnderlineDouble'},
+						{name: _('Strikethrough'), type: 'unocommand', uno: '.uno:Strikeout'},
+						{name: _('Overline'), type: 'unocommand', uno: '.uno:Overline'},
+						{type: 'separator'},
+						{name: _('Superscript'), type: 'unocommand', uno: '.uno:SuperScript'},
+						{name: _('Subscript'), type: 'unocommand', uno: '.uno:SubScript'},
+						{name: _('ꜱᴍᴀʟʟ ᴄᴀᴘꜱ'), type: 'unocommand', uno: '.uno:SmallCaps'},
+						{type: 'separator'},
+						{name: _('Shadow'), type: 'unocommand', uno: '.uno:Shadowed'},
+						{name: _('Outline'), type: 'unocommand', uno: '.uno:OutlineFont'},
+						{type: 'separator'},
+						{name: _('Increase size'), type: 'unocommand', uno: '.uno:Grow'},
+						{name: _('Decrease size'), type: 'unocommand', uno: '.uno:Shrink'},
+						{type: 'separator'},
+						{name: _('UPPERCASE'), type: 'unocommand', uno: '.uno:ChangeCaseToUpper'},
+						{name: _('lowercase'), type: 'unocommand', uno: '.uno:ChangeCaseToLower'},
+						{name: _('Cycle case'), type: 'unocommand', uno: '.uno:ChangeCaseRotateCase'},
+						{type: 'separator'},
+						{name: _('Sentence case'), type: 'unocommand', uno: '.uno:ChangeCaseToSentenceCase'},
+						{name: _('Capitalize Every Word'), type: 'unocommand', uno: '.uno:ChangeCaseToTitleCase'},
+						{name: _('tOGGLE cASE'), type: 'unocommand', uno: '.uno:ChangeCaseToToggleCase'}]},
+				{name: _('Spacing'), type: 'menu', menu: [
+						{name: _('Line spacing: 1'), type: 'unocommand', uno: '.uno:SpacePara1'},
+						{name: _('Line spacing: 1.5'), type: 'unocommand', uno: '.uno:SpacePara15'},
+						{name: _('Line spacing: 2'), type: 'unocommand', uno: '.uno:SpacePara2'},
+						{type: 'separator'},
+						{name: _('Increase paragraph spacing'), type: 'unocommand', uno: '.uno:ParaspaceIncrease'},
+						{name: _('Decrease paragraph spacing'), type: 'unocommand', uno: '.uno:ParaspaceDecrease'},
+						{type: 'separator'},
+						{name: _('Increase indent'), type: 'unocommand', uno: '.uno:IncrementIndent'},
+						{name: _('Decrease indent'), type: 'unocommand', uno: '.uno:DecrementIndent'}]},
+				{name: _('Align'), type: 'menu', menu: [
+						{name: _('Left'), type: 'unocommand', uno: '.uno:CommonAlignLeft'},
+						{name: _('Centered'), type: 'unocommand', uno: '.uno:CommonAlignHorizontalCenter'},
+						{name: _('Right'), type: 'unocommand', uno: '.uno:CommonAlignRight'},
+						{name: _('Justified'), type: 'unocommand', uno: '.uno:CommonAlignJustified'},
+						{type: 'separator'},
+						{name: _('Top'), type: 'unocommand', uno: '.uno:CommonAlignTop'},
+						{name: _('Center'), type: 'unocommand', uno: '.uno:CommonAlignVerticalcenter'},
+						{name: _('Bottom'), type: 'unocommand', uno: '.uno:CommonAlignBottom'}]},
+				{name: _('Lists'), type: 'menu', menu: [
+						{name: _('Bullets on/off'), type: 'unocommand', uno: '.uno:DefaultBullet'},
+						{name: _('Numbering on/off'), type: 'unocommand', uno: '.uno:DefaultNumbering'},
+						{type: 'separator'},
+						{name: _('Demote one level'), type: 'unocommand', uno: '.uno:DecrementLevel'},
+						{name: _('Promote one level'), type: 'unocommand', uno: '.uno:IncrementLevel'},
+						{name: _('Demote one level with subpoints'), type: 'unocommand', uno: '.uno:DecrementSublevels'},
+						{name: _('Promote one level with subpoints'), type: 'unocommand', uno: '.uno:IncrementSubLevels'},
+						{type: 'separator'},
+						{name: _('Move down'), type: 'unocommand', uno: '.uno:MoveDown'},
+						{name: _('Move up'), type: 'unocommand', uno: '.uno:MoveUp'},
+						{name: _('Move down with subpoints'), type: 'unocommand', uno: '.uno:MoveDownSubItems'},
+						{name: _('Move up with subpoints'), type: 'unocommand', uno: '.uno:MoveUpSubItems'},
+						{type: 'separator'},
+						{name: _('Insert unnumbered entry'), type: 'unocommand', uno: '.uno:InsertNeutralParagraph'},
+						{name: _('Restart numbering'), type: 'unocommand', uno: '.uno:NumberingStart'},
+						{type: 'separator'},
+						{name: _('To next paragraph in level'), type: 'unocommand', uno: '.uno:JumpDownThisLevel'},
+						{name: _('To previous paragraph in level'), type: 'unocommand', uno: '.uno:JumpUpThisLevel'},
+						{name: _('Continue previous numbering'), type: 'unocommand', uno: '.uno:ContinueNumbering'}]},
+				{name: _('Clear direct formatting'), type: 'unocommand', uno: '.uno:ResetAttributes'}
+			]},
 			{name: _('Tables'), type: 'menu', menu: [{name: _('Insert'), type: 'menu', menu: [{name: _('Rows before'), type: 'unocommand', uno: '.uno:InsertRowsBefore'},
 																						{name: _('Rows after'), type: 'unocommand', uno: '.uno:InsertRowsAfter'},
 																						{type: 'separator'},
commit 36715b7a541c070aa026ac9d46439f255e66dca5
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Oct 27 12:24:50 2016 +0200

    loleaflet: switch position of View and Insert menus

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index c08722c..ada6e02 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -25,6 +25,12 @@ L.Control.Menubar = L.Control.extend({
 												{type: 'separator'},
 												{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'}]
 			},
+			{name: _('View'), type: 'menu', menu: [{name: _('Full screen'), id: 'fullscreen', type: 'action'},
+												{type: 'separator'},
+												{name: _('Zoom in'), id: 'zoomin', type: 'action'},
+												{name: _('Zoom out'), id: 'zoomout', type: 'action'},
+												{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
+			},
 			{name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'},
 												{name: _('Comment'), type: 'unocommand', uno: '.uno:InsertAnnotation'},
 												{type: 'separator'},
@@ -34,12 +40,6 @@ L.Control.Menubar = L.Control.extend({
 												{name: _('Page break'), type: 'unocommand', uno: '.uno:InsertPageBreak'},
 												{name: _('Column break'), type: 'unocommand', uno: '.uno:InsertColumnBreak'}]
 			},
-			{name: _('View'), type: 'menu', menu: [{name: _('Full screen'), id: 'fullscreen', type: 'action'},
-												{type: 'separator'},
-												{name: _('Zoom in'), id: 'zoomin', type: 'action'},
-												{name: _('Zoom out'), id: 'zoomout', type: 'action'},
-												{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
-			},
 			{name: _('Tables'), type: 'menu', menu: [{name: _('Insert'), type: 'menu', menu: [{name: _('Rows before'), type: 'unocommand', uno: '.uno:InsertRowsBefore'},
 																						{name: _('Rows after'), type: 'unocommand', uno: '.uno:InsertRowsAfter'},
 																						{type: 'separator'},
@@ -77,14 +77,14 @@ L.Control.Menubar = L.Control.extend({
 												{type: 'separator'},
 												{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'}]
 			},
-			{name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'}]
-			},
 			{name: _('View'), type: 'menu', menu: [{name: _('Full screen'), id: 'fullscreen', type: 'action'},
 												{type: 'separator'},
 												{name: _('Zoom in'), id: 'zoomin', type: 'action'},
 												{name: _('Zoom out'), id: 'zoomout', type: 'action'},
 												{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
 			},
+			{name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'}]
+			},
 			{name: _('Tables'), type: 'menu', menu: [{name: _('Insert'), type: 'menu', menu: [{name: _('Rows before'), type: 'unocommand', uno: '.uno:InsertRowsBefore'},
 																						{name: _('Rows after'), type: 'unocommand', uno: '.uno:InsertRowsAfter'},
 																						{type: 'separator'},
@@ -123,18 +123,18 @@ L.Control.Menubar = L.Control.extend({
 												{type: 'separator'},
 												{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'}]
 			},
-			{name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'},
-												  {name: _('Comment'), type: 'unocommand', uno: '.uno:InsertAnnotation'},
-												  {type: 'separator'},
-												  {name: _('Row'), type: 'unocommand', uno: '.uno:InsertRows'},
-												  {name: _('Column'), type: 'unocommand', uno: '.uno:InsertColumns'}]
-			},
 			{name: _('View'), type: 'menu', menu: [{name: _('Full screen'), id: 'fullscreen', type: 'action'},
 												{type: 'separator'},
 												{name: _('Zoom in'), id: 'zoomin', type: 'action'},
 												{name: _('Zoom out'), id: 'zoomout', type: 'action'},
 												{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
 			},
+			{name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'},
+												  {name: _('Comment'), type: 'unocommand', uno: '.uno:InsertAnnotation'},
+												  {type: 'separator'},
+												  {name: _('Row'), type: 'unocommand', uno: '.uno:InsertRows'},
+												  {name: _('Column'), type: 'unocommand', uno: '.uno:InsertColumns'}]
+			},
 			{name: _('Cells'), type: 'menu', menu: [{name: _('Insert row'), type: 'unocommand', uno: '.uno:InsertRows'},
 												 {name: _('Insert column'), type: 'unocommand', uno: '.uno:InsertColumns'},
 												 {type: 'separator'},


More information about the Libreoffice-commits mailing list