[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 4 commits - loleaflet/dist loleaflet/Makefile loleaflet/src
Andras Timar
andras.timar at collabora.com
Mon May 23 21:32:55 UTC 2016
loleaflet/Makefile | 2
loleaflet/dist/loleaflet.html | 5
loleaflet/dist/toolbar/toolbar.js | 13 --
loleaflet/src/control/Control.ContextMenu.js | 1
loleaflet/src/control/Control.Menubar.js | 172 +++++++++++++--------------
5 files changed, 92 insertions(+), 101 deletions(-)
New commits:
commit 63a52dbd172da0d16e1e412af6274a88d837e6fe
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 23:31:37 2016 +0200
loleaflet: bccu#1813 workaround for double encoding in cp-5.0 branch
(cherry picked from commit 3724fc1b668961b729f47095dd9403c6e38c0728)
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 50781da..cdec3b2 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -105,6 +105,7 @@ L.Control.ContextMenu = L.Control.extend({
}
itemName = item.text.replace('~', '');
+ itemName = itemName.replace('°', '°'); // bccu#1813 double encoding in cp-5.0 branch only
contextMenu[item.command] = {
name: _(itemName)
};
commit 15e5ab7c413b75e90dbe9ff69f50969dd8fb236e
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 22:49:11 2016 +0200
loleaflet: enable l10n of menus
(cherry picked from commit 62896c66eadd36d0ae01bb05a8911c294562e0c3)
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 91c55f6..b42cc4e 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -33,6 +33,7 @@ pot:
dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
+ src/control/Control.Menubar.js \
src/core/Socket.js
html2po --pot --input=dist/loleaflet-help.html --output=po/loleaflet-help.pot
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 2e6da81..d89c05e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -6,127 +6,127 @@
L.Control.Menubar = L.Control.extend({
options: {
text: [
- {name: 'File', type: 'menu', menu: [{name: 'Save', type: 'unocommand', uno: '.uno:Save'},
- {name: 'Print', id: 'print', type: 'action'},
- {name: 'Download as', type: 'menu', menu: [{name: 'PDF Document (.pdf)', id: 'downloadas-pdf', type: 'action'},
- {name: 'ODF text document (.odt)', id: 'downloadas-odt', type: 'action'},
- {name: 'Microsoft Word 2003 (.doc)', id: 'downloadas-doc', type: 'action'},
- {name: 'Microsoft Word (.docx)', id: 'downloadas-docx', type: 'action'}]}]
+ {name: _('File'), type: 'menu', menu: [{name: _('Save'), type: 'unocommand', uno: '.uno:Save'},
+ {name: _('Print'), id: 'print', type: 'action'},
+ {name: _('Download as'), type: 'menu', menu: [{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
+ {name: _('Microsoft Word 2003 (.doc)'), id: 'downloadas-doc', type: 'action'},
+ {name: _('Microsoft Word (.docx)'), id: 'downloadas-docx', type: 'action'}]}]
},
- {name: 'Edit', type: 'menu', menu: [{name: 'Undo', type: 'unocommand', uno: '.uno:Undo'},
- {name: 'Redo', type: 'unocommand', uno: '.uno:Redo'},
+ {name: _('Edit'), type: 'menu', menu: [{name: _('Undo'), type: 'unocommand', uno: '.uno:Undo'},
+ {name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
{type: 'separator'},
- {name: 'Cut', type: 'unocommand', uno: '.uno:Cut'},
- {name: 'Copy', type: 'unocommand', uno: '.uno:Copy'},
- {name: 'Paste', type: 'unocommand', uno: '.uno:Paste'},
+ {name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
+ {name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
+ {name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
{type: 'separator'},
- {name: 'Select All', type: 'unocommand', uno: '.uno:SelectAll'}]
+ {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'}]
+ {name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'},
+ {name: _('Comment'), type: 'unocommand', uno: '.uno:InsertAnnotation'}]
},
- {name: 'View', type: 'menu', menu: [{name: 'Full screen', id: 'fullscreen', 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: 'Zoom reset', id: 'zoomreset', type: 'action'}]
+ {name: _('Zoom in'), id: 'zoomin', type: 'action'},
+ {name: _('Zoom out'), id: 'zoomout', type: 'action'},
+ {name: _('Zoom reset'), 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'},
+ {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'},
- {name: 'Columns Left', type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
- {name: 'Columns Right', type: 'unocommand', uno: '.uno:InsertColumnsAfter'}]},
- {name: 'Delete', type: 'menu', menu: [{name: 'Rows', type: 'unocommand', uno: '.uno:DeleteRows'},
- {name: 'Columns', type: 'unocommand', uno: '.uno:DeleteColumns'},
- {name: 'Table', type: 'unocommand', uno: '.uno:DeleteTable'}]},
- {name: 'Select', type: 'menu', menu: [{name: 'Table', type: 'unocommand', uno: '.uno:SelectTable'},
- {name: 'Row', type: 'unocommand', uno: '.uno:EntireRow'},
- {name: 'Column', type: 'unocommand', uno: '.uno:EntireColumn'},
- {name: 'Cell', type: 'unocommand', uno: '.uno:EntireCell'}]},
- {name: 'Merge cells', type: 'unocommand', uno: '.uno:MergeCells'}]
+ {name: _('Columns Left'), type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
+ {name: _('Columns Right'), type: 'unocommand', uno: '.uno:InsertColumnsAfter'}]},
+ {name: _('Delete'), type: 'menu', menu: [{name: _('Rows'), type: 'unocommand', uno: '.uno:DeleteRows'},
+ {name: _('Columns'), type: 'unocommand', uno: '.uno:DeleteColumns'},
+ {name: _('Table'), type: 'unocommand', uno: '.uno:DeleteTable'}]},
+ {name: _('Select'), type: 'menu', menu: [{name: _('Table'), type: 'unocommand', uno: '.uno:SelectTable'},
+ {name: _('Row'), type: 'unocommand', uno: '.uno:EntireRow'},
+ {name: _('Column'), type: 'unocommand', uno: '.uno:EntireColumn'},
+ {name: _('Cell'), type: 'unocommand', uno: '.uno:EntireCell'}]},
+ {name: _('Merge cells'), type: 'unocommand', uno: '.uno:MergeCells'}]
}
],
presentation: [
- {name: 'File', type: 'menu', menu: [{name: 'Save', type: 'unocommand', uno: '.uno:Save'},
- {name: 'Print', id: 'print', type: 'action'},
- {name: 'Download as', type: 'menu', menu: [{name: 'PDF Document (.pdf)', id: 'downloadas-pdf', type: 'action'},
- {name: 'ODF presentation (.odp)', id: 'downloadas-odp', type: 'action'},
- {name: 'Microsoft Powerpoint 2003 (.ppt)', id: 'downloadas-ppt', type: 'action'},
- {name: 'Microsoft Powerpoint (.pptx)', id: 'downloadas-pptx', type: 'action'}]}]
+ {name: _('File'), type: 'menu', menu: [{name: _('Save'), type: 'unocommand', uno: '.uno:Save'},
+ {name: _('Print'), id: 'print', type: 'action'},
+ {name: _('Download as'), type: 'menu', menu: [{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
+ {name: _('Microsoft Powerpoint 2003 (.ppt)'), id: 'downloadas-ppt', type: 'action'},
+ {name: _('Microsoft Powerpoint (.pptx)'), id: 'downloadas-pptx', type: 'action'}]}]
},
- {name: 'Edit', type: 'menu', menu: [{name: 'Undo', type: 'unocommand', uno: '.uno:Undo'},
- {name: 'Redo', type: 'unocommand', uno: '.uno:Redo'},
+ {name: _('Edit'), type: 'menu', menu: [{name: _('Undo'), type: 'unocommand', uno: '.uno:Undo'},
+ {name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
{type: 'separator'},
- {name: 'Cut', type: 'unocommand', uno: '.uno:Cut'},
- {name: 'Copy', type: 'unocommand', uno: '.uno:Copy'},
- {name: 'Paste', type: 'unocommand', uno: '.uno:Paste'},
+ {name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
+ {name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
+ {name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
{type: 'separator'},
- {name: 'Select All', type: 'unocommand', uno: '.uno:SelectAll'}]
+ {name: _('Select All'), type: 'unocommand', uno: '.uno:SelectAll'}]
},
- {name: 'Insert', type: 'menu', menu: [{name: 'Image', id: 'insertgraphic', type: 'action'}]
+ {name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'}]
},
- {name: 'View', type: 'menu', menu: [{name: 'Full Screen', id: 'fullscreen', 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: 'Zoom reset', id: 'zoomreset', type: 'action'}]
+ {name: _('Zoom in'), id: 'zoomin', type: 'action'},
+ {name: _('Zoom out'), id: 'zoomout', type: 'action'},
+ {name: _('Zoom reset'), 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'},
+ {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'},
- {name: 'Columns Left', type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
- {name: 'Columns Right', type: 'unocommand', uno: '.uno:InsertColumnsAfter'}]},
- {name: 'Delete', type: 'menu', menu: [{name: 'Rows', type: 'unocommand', uno: '.uno:DeleteRows'},
- {name: 'Columns', type: 'unocommand', uno: '.uno:DeleteColumns'},
- {name: 'Table', type: 'unocommand', uno: '.uno:DeleteTable'}]},
- {name: 'Select', type: 'menu', menu: [{name: 'Table', type: 'unocommand', uno: '.uno:SelectTable'},
- {name: 'Row', type: 'unocommand', uno: '.uno:EntireRow'},
- {name: 'Column', type: 'unocommand', uno: '.uno:EntireColumn'},
- {name: 'Cell', type: 'unocommand', uno: '.uno:EntireCell'}]},
- {name: 'Merge cells', type: 'unocommand', uno: '.uno:MergeCells'}]
+ {name: _('Columns Left'), type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
+ {name: _('Columns Right'), type: 'unocommand', uno: '.uno:InsertColumnsAfter'}]},
+ {name: _('Delete'), type: 'menu', menu: [{name: _('Rows'), type: 'unocommand', uno: '.uno:DeleteRows'},
+ {name: _('Columns'), type: 'unocommand', uno: '.uno:DeleteColumns'},
+ {name: _('Table'), type: 'unocommand', uno: '.uno:DeleteTable'}]},
+ {name: _('Select'), type: 'menu', menu: [{name: _('Table'), type: 'unocommand', uno: '.uno:SelectTable'},
+ {name: _('Row'), type: 'unocommand', uno: '.uno:EntireRow'},
+ {name: _('Column'), type: 'unocommand', uno: '.uno:EntireColumn'},
+ {name: _('Cell'), type: 'unocommand', uno: '.uno:EntireCell'}]},
+ {name: _('Merge cells'), type: 'unocommand', uno: '.uno:MergeCells'}]
},
- {name: 'Slide', type: 'menu', menu: [{name: 'New slide', id: 'insertpage', type: 'action'},
- {name: 'Duplicate slide', id: 'duplicatepage', type: 'action'},
- {name: 'Delete slide', id: 'deletepage', type: 'action'},
+ {name: _('Slide'), type: 'menu', menu: [{name: _('New slide'), id: 'insertpage', type: 'action'},
+ {name: _('Duplicate slide'), id: 'duplicatepage', type: 'action'},
+ {name: _('Delete slide'), id: 'deletepage', type: 'action'},
{type: 'separator'},
- {name: 'Fullscreen Presentation', id: 'fullscreen-presentation', type: 'action'}]
+ {name: _('Fullscreen Presentation'), id: 'fullscreen-presentation', type: 'action'}]
}
],
spreadsheet: [
- {name: 'File', type: 'menu', menu: [{name: 'Save', type: 'unocommand', uno: '.uno:Save'},
- {name: 'Print', id: 'print', type: 'action'},
- {name: 'Download as', type: 'menu', menu: [{name: 'PDF Document (.pdf)', id: 'downloadas-pdf', type: 'action'},
- {name: 'ODF spreadsheet (.ods)', id: 'downloadas-ods', type: 'action'},
- {name: 'Microsoft Excel 2003 (.xls)', id: 'downloadas-xls', type: 'action'},
- {name: 'Microsoft Excel (.xlsx)', id: 'downloadas-xlsx', type: 'action'}]}]
+ {name: _('File'), type: 'menu', menu: [{name: _('Save'), type: 'unocommand', uno: '.uno:Save'},
+ {name: _('Print'), id: 'print', type: 'action'},
+ {name: _('Download as'), type: 'menu', menu: [{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
+ {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
+ {name: _('Microsoft Excel 2003 (.xls)'), id: 'downloadas-xls', type: 'action'},
+ {name: _('Microsoft Excel (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]}]
},
- {name: 'Edit', type: 'menu', menu: [{name: 'Undo', type: 'unocommand', uno: '.uno:Undo'},
- {name: 'Redo', type: 'unocommand', uno: '.uno:Redo'},
+ {name: _('Edit'), type: 'menu', menu: [{name: _('Undo'), type: 'unocommand', uno: '.uno:Undo'},
+ {name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
{type: 'separator'},
- {name: 'Cut', type: 'unocommand', uno: '.uno:Cut'},
- {name: 'Copy', type: 'unocommand', uno: '.uno:Copy'},
- {name: 'Paste', type: 'unocommand', uno: '.uno:Paste'},
+ {name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
+ {name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
+ {name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
{type: 'separator'},
- {name: 'Select All', type: 'unocommand', uno: '.uno:SelectAll'}]
+ {name: _('Select All'), type: 'unocommand', uno: '.uno:SelectAll'}]
},
- {name: 'Insert', type: 'menu', menu: [{name: 'Image', id: 'insertgraphic', type: 'action'},
+ {name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'},
{type: 'separator'},
- {name: 'Row', type: 'unocommand', uno: '.uno:InsertRows'},
- {name: 'Column', type: 'unocommand', uno: '.uno:InsertColumns'}]
+ {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'},
+ {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: 'Zoom reset', id: 'zoomreset', type: 'action'}]
+ {name: _('Zoom in'), id: 'zoomin', type: 'action'},
+ {name: _('Zoom out'), id: 'zoomout', type: 'action'},
+ {name: _('Zoom reset'), id: 'zoomreset', type: 'action'}]
},
- {name: 'Cells', type: 'menu', menu: [{name: 'Insert Row', type: 'unocommand', uno: '.uno:InsertRows'},
- {name: 'Insert 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'},
- {name: 'Delete Row', type: 'unocommand', uno: '.uno:DeleteRows'},
- {name: 'Delete Column', type: 'unocommand', uno: '.uno:DeleteColumns'}]
+ {name: _('Delete Row'), type: 'unocommand', uno: '.uno:DeleteRows'},
+ {name: _('Delete Column'), type: 'unocommand', uno: '.uno:DeleteColumns'}]
}
],
commit 8a993c8d0ff9fdce16b26bc257db0fcf4969f10e
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 22:40:30 2016 +0200
loleaflet: remove obsoleted dialog for menu:file:saveas
(cherry picked from commit c90bd39b2ebe2e03965e9d47afc0b6a042587cb2)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index ad13560..81aeb91 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -226,19 +226,6 @@ function onClick(id) {
map.setPart(id);
}
}
- else if (id === 'menu:file:saveas') {
- var dialog = '<label for="url">URL</label>' +
- '<input name="url" type="text" value=' + map._docLayer.options.doc + '/>' +
- '<label for="format">Format</label>' +
- '<input name="format" type="text" />' +
- '<label for="options">Options</label>' +
- '<input name="options" type="text" />';
- vex.dialog.open({
- message: 'Save as:',
- input: dialog,
- callback: onSaveAs
- });
- }
else if (id === 'takeedit') {
if (!item.checked) {
map._socket.sendMessage('takeedit');
commit 25f9f4644468aa637ae34330122d5f62803bbcd4
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 22:32:56 2016 +0200
loleaflet: enable l10n of two error messages
(cherry picked from commit 55c77c6deb16c694c50a70c98ea0110eae3d5159)
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 9615de2..91c55f6 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -30,6 +30,7 @@ dist: all
pot:
xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+ dist/errormessages.js \
dist/toolbar/toolbar.js \
src/control/Control.Tabs.js \
src/core/Socket.js
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index a8eac6b..c27cb69 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -49,6 +49,7 @@
<script src="/loleaflet/%VERSION%/branding.js"></script> <!-- logo onclick handler -->
<script>vex.defaultOptions.className = 'vex-theme-plain';</script>
<script>var _ = function (string) {return string.toLocaleString();};</script>
+ <script src="/loleaflet/%VERSION%/errormessages.js"></script>
<!--The "controls" div holds map controls such as the Zoom button and
it's separated from the map in order to have the controls on the top
@@ -102,10 +103,10 @@
var timestamp = getParameterByName('timestamp');
var closebutton = getParameterByName('closebutton');
if (wopiSrc === '' && filePath === '') {
- vex.dialog.alert('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: file_path=/path/to/doc/');
+ vex.dialog.alert(wrongwopisrc);
}
if (host === '') {
- vex.dialog.alert('The host URL is empty. The loolwsd server is probably misconfigured, please contact the administrator.');
+ vex.dialog.alert(emptyhosturl);
}
var docURL = wopiSrc !== '' ? wopiSrc : filePath;
More information about the Libreoffice-commits
mailing list