[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loleaflet/README loleaflet/src loolwsd/bundled

Mihai Varga mihai.varga at collabora.com
Thu Sep 10 02:57:57 PDT 2015


 loleaflet/README                                        |    4 +-
 loleaflet/dist/images/decrementindent.png               |binary
 loleaflet/dist/images/incrementindent.png               |binary
 loleaflet/src/control/Control.Buttons.js                |   26 ++++++++--------
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h |    3 +
 5 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 76b15ea3033e24b2a27f13e8875537eb253a86f7
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Thu Sep 10 12:57:11 2015 +0300

    loleaflet: increase/decrease indent buttons

diff --git a/loleaflet/README b/loleaflet/README
index c9b1144..1ef0296 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -81,7 +81,9 @@ Edit, view, readOnly:
 
 Buttons like Bold, Italic, Strike through etc.
     - API:
-        map.toggleCommandState('Bold' | 'Italic' | 'Underline' | 'Strikeout' | 'AlighLeft', etc)
+        map.toggleCommandState('Bold' | 'Italic' | 'Underline' | 'Strikeout' |
+            'LeftPara' | 'CenterPara' | 'RightPara' | 'JustifyPara' |
+            'IncrementIndent' | 'DecrementIndent'
     - events:
         map.on('commandstatechanged', function (e) {}) where:
             + e.unoCmd == 'Bold' | 'Italic' etc.
diff --git a/loleaflet/dist/images/decrementindent.png b/loleaflet/dist/images/decrementindent.png
new file mode 100644
index 0000000..b2a6c72
Binary files /dev/null and b/loleaflet/dist/images/decrementindent.png differ
diff --git a/loleaflet/dist/images/incrementindent.png b/loleaflet/dist/images/incrementindent.png
new file mode 100644
index 0000000..a1d6125
Binary files /dev/null and b/loleaflet/dist/images/incrementindent.png differ
diff --git a/loleaflet/src/control/Control.Buttons.js b/loleaflet/src/control/Control.Buttons.js
index f2622cb..4a02c04 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -12,18 +12,20 @@ L.Control.Buttons = L.Control.extend({
 		    container = L.DomUtil.create('div', buttonsName + '-container' + ' leaflet-bar');
 
 		this._buttons = {
-			'bold':          {title: 'Bold',               uno: 'Bold',        iconName: 'bold.png'},
-			'italic':        {title: 'Italic',             uno: 'Italic',      iconName: 'italic.png'},
-			'underline':     {title: 'Underline',          uno: 'Underline',   iconName: 'underline.png'},
-			'strikethrough': {title: 'Strike-through',     uno: 'Strikeout',   iconName: 'strikethrough.png'},
-			'alignleft':     {title: 'Align left',         uno: 'LeftPara',    iconName: 'alignleft.png'},
-			'aligncenter':   {title: 'Center horizontaly', uno: 'CenterPara',  iconName: 'aligncenter.png'},
-			'alignright':    {title: 'Align right',        uno: 'RightPara',   iconName: 'alignright.png'},
-			'alignblock':    {title: 'Justified',          uno: 'JustifyPara', iconName: 'alignblock.png'},
-			'save':          {title: 'Save',               uno: 'Save',        iconName: 'save.png'},
-			'saveas':        {title: 'Save As',                                iconName: 'saveas.png'},
-			'edit':          {title: 'Enable editing',                         iconName: 'edit.png'},
-			'selection':     {title: 'Enable selection',                       iconName: 'selection.png'}
+			'bold':          {title: 'Bold',               uno: 'Bold',            iconName: 'bold.png'},
+			'italic':        {title: 'Italic',             uno: 'Italic',          iconName: 'italic.png'},
+			'underline':     {title: 'Underline',          uno: 'Underline',       iconName: 'underline.png'},
+			'strikethrough': {title: 'Strike-through',     uno: 'Strikeout',       iconName: 'strikethrough.png'},
+			'alignleft':     {title: 'Align left',         uno: 'LeftPara',        iconName: 'alignleft.png'},
+			'aligncenter':   {title: 'Center horizontaly', uno: 'CenterPara',      iconName: 'aligncenter.png'},
+			'alignright':    {title: 'Align right',        uno: 'RightPara',       iconName: 'alignright.png'},
+			'alignblock':    {title: 'Justified',          uno: 'JustifyPara',     iconName: 'alignblock.png'},
+			'incindent':     {title: 'Increment indent',   uno: 'IncrementIndent', iconName: 'incrementindent.png'},
+			'decindent':     {title: 'Decrement indent',   uno: 'DecrementIndent', iconName: 'decrementindent.png'},
+			'save':          {title: 'Save',               uno: 'Save',            iconName: 'save.png'},
+			'saveas':        {title: 'Save As',                                    iconName: 'saveas.png'},
+			'edit':          {title: 'Enable editing',                             iconName: 'edit.png'},
+			'selection':     {title: 'Enable selection',                           iconName: 'selection.png'}
 		};
 		for (var key in this._buttons) {
 			var button = this._buttons[key];
commit b278554ba6218852c451d2d704fbc38297ab2240
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Thu Sep 10 12:56:32 2015 +0300

    loolwsd: update bundled headers

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index e3b4850..8060f0e 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -159,6 +159,9 @@ struct _LibreOfficeKitDocumentClass
 
     /// @see lok::Document::resetSelection
     void (*resetSelection) (LibreOfficeKitDocument* pThis);
+
+    /// @see lok::Document:getStyles
+    char* (*getCommandValues) (LibreOfficeKitDocument* pThis, const char* pCommand);
 #endif // LOK_USE_UNSTABLE_API
 };
 


More information about the Libreoffice-commits mailing list