[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 51 commits - loleaflet/build loleaflet/debug loleaflet/dist loleaflet/Makefile loleaflet/po loleaflet/reference.html loleaflet/src scripts/unocommandsl10n.sh
Pranav Kant
pranavk at collabora.com
Mon May 23 15:10:56 UTC 2016
dev/null |binary
loleaflet/Makefile | 7
loleaflet/build/deps.js | 85 -
loleaflet/debug/document/document_simple_example.html | 125 -
loleaflet/debug/document/loleaflet.html | 5
loleaflet/dist/contextMenu/jquery.contextMenu.css | 16
loleaflet/dist/images/lc_checkbox.png |binary
loleaflet/dist/images/lc_inserttable.png |binary
loleaflet/dist/images/lc_radiobutton.png |binary
loleaflet/dist/images/sc_inserttable.png |binary
loleaflet/dist/l10n/uno-localizations.json | 122 +
loleaflet/dist/l10n/uno/ab.json | 1
loleaflet/dist/l10n/uno/af.json | 1
loleaflet/dist/l10n/uno/am.json | 1
loleaflet/dist/l10n/uno/an.json | 1
loleaflet/dist/l10n/uno/ar.json | 1
loleaflet/dist/l10n/uno/as.json | 1
loleaflet/dist/l10n/uno/ast.json | 1
loleaflet/dist/l10n/uno/az.json | 1
loleaflet/dist/l10n/uno/be.json | 1
loleaflet/dist/l10n/uno/bg.json | 1
loleaflet/dist/l10n/uno/bn-IN.json | 1
loleaflet/dist/l10n/uno/bn.json | 1
loleaflet/dist/l10n/uno/bo.json | 1
loleaflet/dist/l10n/uno/br.json | 1
loleaflet/dist/l10n/uno/brx.json | 1
loleaflet/dist/l10n/uno/bs.json | 1
loleaflet/dist/l10n/uno/ca-valencia.json | 1
loleaflet/dist/l10n/uno/ca.json | 1
loleaflet/dist/l10n/uno/cs.json | 1
loleaflet/dist/l10n/uno/cy.json | 1
loleaflet/dist/l10n/uno/da.json | 1
loleaflet/dist/l10n/uno/de.json | 1
loleaflet/dist/l10n/uno/dgo.json | 1
loleaflet/dist/l10n/uno/dz.json | 1
loleaflet/dist/l10n/uno/el.json | 1
loleaflet/dist/l10n/uno/en-GB.json | 1
loleaflet/dist/l10n/uno/en-ZA.json | 1
loleaflet/dist/l10n/uno/eo.json | 1
loleaflet/dist/l10n/uno/es.json | 1
loleaflet/dist/l10n/uno/et.json | 1
loleaflet/dist/l10n/uno/eu.json | 1
loleaflet/dist/l10n/uno/fa.json | 1
loleaflet/dist/l10n/uno/fi.json | 1
loleaflet/dist/l10n/uno/fr.json | 1
loleaflet/dist/l10n/uno/ga.json | 1
loleaflet/dist/l10n/uno/gd.json | 1
loleaflet/dist/l10n/uno/gl.json | 1
loleaflet/dist/l10n/uno/gu.json | 1
loleaflet/dist/l10n/uno/gug.json | 1
loleaflet/dist/l10n/uno/he.json | 1
loleaflet/dist/l10n/uno/hi.json | 1
loleaflet/dist/l10n/uno/hr.json | 1
loleaflet/dist/l10n/uno/hu.json | 1
loleaflet/dist/l10n/uno/id.json | 1
loleaflet/dist/l10n/uno/is.json | 1
loleaflet/dist/l10n/uno/it.json | 1
loleaflet/dist/l10n/uno/ja.json | 1
loleaflet/dist/l10n/uno/jv.json | 1
loleaflet/dist/l10n/uno/ka.json | 1
loleaflet/dist/l10n/uno/kk.json | 1
loleaflet/dist/l10n/uno/kl.json | 1
loleaflet/dist/l10n/uno/km.json | 1
loleaflet/dist/l10n/uno/kmr-Latn.json | 1
loleaflet/dist/l10n/uno/kn.json | 1
loleaflet/dist/l10n/uno/ko.json | 1
loleaflet/dist/l10n/uno/kok.json | 1
loleaflet/dist/l10n/uno/ks.json | 1
loleaflet/dist/l10n/uno/ky.json | 1
loleaflet/dist/l10n/uno/lb.json | 1
loleaflet/dist/l10n/uno/lo.json | 1
loleaflet/dist/l10n/uno/lt.json | 1
loleaflet/dist/l10n/uno/lv.json | 1
loleaflet/dist/l10n/uno/mai.json | 1
loleaflet/dist/l10n/uno/mk.json | 1
loleaflet/dist/l10n/uno/ml.json | 1
loleaflet/dist/l10n/uno/mn.json | 1
loleaflet/dist/l10n/uno/mni.json | 1
loleaflet/dist/l10n/uno/mr.json | 1
loleaflet/dist/l10n/uno/my.json | 1
loleaflet/dist/l10n/uno/nb.json | 1
loleaflet/dist/l10n/uno/ne.json | 1
loleaflet/dist/l10n/uno/nl.json | 1
loleaflet/dist/l10n/uno/nn.json | 1
loleaflet/dist/l10n/uno/nr.json | 1
loleaflet/dist/l10n/uno/nso.json | 1
loleaflet/dist/l10n/uno/oc.json | 1
loleaflet/dist/l10n/uno/om.json | 1
loleaflet/dist/l10n/uno/or.json | 1
loleaflet/dist/l10n/uno/pa-IN.json | 1
loleaflet/dist/l10n/uno/pl.json | 1
loleaflet/dist/l10n/uno/pt-BR.json | 1
loleaflet/dist/l10n/uno/pt.json | 1
loleaflet/dist/l10n/uno/ro.json | 1
loleaflet/dist/l10n/uno/ru.json | 1
loleaflet/dist/l10n/uno/rw.json | 1
loleaflet/dist/l10n/uno/sa-IN.json | 1
loleaflet/dist/l10n/uno/sah.json | 1
loleaflet/dist/l10n/uno/sat.json | 1
loleaflet/dist/l10n/uno/sd.json | 1
loleaflet/dist/l10n/uno/si.json | 1
loleaflet/dist/l10n/uno/sid.json | 1
loleaflet/dist/l10n/uno/sk.json | 1
loleaflet/dist/l10n/uno/sl.json | 1
loleaflet/dist/l10n/uno/sq.json | 1
loleaflet/dist/l10n/uno/sr-Latn.json | 1
loleaflet/dist/l10n/uno/sr.json | 1
loleaflet/dist/l10n/uno/ss.json | 1
loleaflet/dist/l10n/uno/st.json | 1
loleaflet/dist/l10n/uno/sv.json | 1
loleaflet/dist/l10n/uno/sw-TZ.json | 1
loleaflet/dist/l10n/uno/ta.json | 1
loleaflet/dist/l10n/uno/te.json | 1
loleaflet/dist/l10n/uno/tg.json | 1
loleaflet/dist/l10n/uno/th.json | 1
loleaflet/dist/l10n/uno/ti.json | 1
loleaflet/dist/l10n/uno/tn.json | 1
loleaflet/dist/l10n/uno/tr.json | 1
loleaflet/dist/l10n/uno/ts.json | 1
loleaflet/dist/l10n/uno/tt.json | 1
loleaflet/dist/l10n/uno/ug.json | 1
loleaflet/dist/l10n/uno/uk.json | 1
loleaflet/dist/l10n/uno/ur.json | 1
loleaflet/dist/l10n/uno/uz.json | 1
loleaflet/dist/l10n/uno/ve.json | 1
loleaflet/dist/l10n/uno/vi.json | 1
loleaflet/dist/l10n/uno/xh.json | 1
loleaflet/dist/l10n/uno/zh-CN.json | 1
loleaflet/dist/l10n/uno/zh-TW.json | 1
loleaflet/dist/l10n/uno/zu.json | 1
loleaflet/dist/loleaflet-help.html | 6
loleaflet/dist/loleaflet.css | 17
loleaflet/dist/loleaflet.html | 6
loleaflet/dist/partsPreviewControl.css | 2
loleaflet/dist/smartmenus/jquery.smartmenus.js | 1214 ++++++++++++++++++
loleaflet/dist/smartmenus/sm-core-css.css | 14
loleaflet/dist/smartmenus/sm-simple.css | 287 ++++
loleaflet/dist/spreadsheet.css | 14
loleaflet/dist/toolbar.css | 33
loleaflet/dist/toolbar/toolbar.js | 173 +-
loleaflet/po/help-hu.po | 14
loleaflet/po/help-sl.po | 14
loleaflet/po/ui-fr.po | 306 ++--
loleaflet/po/ui-hu.po | 336 ++--
loleaflet/po/ui-sl.po | 336 ++--
loleaflet/reference.html | 68 -
loleaflet/src/control/Control.Buttons.js | 171 --
loleaflet/src/control/Control.ColumnHeader.js | 62
loleaflet/src/control/Control.ContextMenu.js | 151 ++
loleaflet/src/control/Control.Fonts.js | 147 --
loleaflet/src/control/Control.Formulabar.js | 28
loleaflet/src/control/Control.InsertImg.js | 25
loleaflet/src/control/Control.Menubar.js | 339 +++++
loleaflet/src/control/Control.Parts.js | 104 -
loleaflet/src/control/Control.PartsPreview.js | 5
loleaflet/src/control/Control.Presentation.js | 109 -
loleaflet/src/control/Control.RowHeader.js | 62
loleaflet/src/control/Control.Search.js | 135 --
loleaflet/src/control/Control.StatusIndicator.js | 34
loleaflet/src/control/Control.Styles.js | 149 --
loleaflet/src/control/Control.Tabs.js | 5
loleaflet/src/control/Control.Zoom.js | 102 -
loleaflet/src/control/Parts.js | 2
loleaflet/src/dom/Draggable.js | 2
loleaflet/src/layer/tile/TileLayer.js | 15
loleaflet/src/map/Map.js | 4
scripts/unocommandsl10n.sh | 12
167 files changed, 3150 insertions(+), 1832 deletions(-)
New commits:
commit 0fa24854487f8340ddcb20bd2b7d1b76b1f87426
Author: Pranav Kant <pranavk at collabora.com>
Date: Mon May 23 20:08:06 2016 +0530
loleaflet: Enforce linting during make
Change-Id: I509b13cb9f70c6de66b1906b76c4a968e05322f4
(cherry picked from commit d2a7be0b6ed9f9d82e2cff5687841ab22562d747)
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 7886d98..9615de2 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -11,6 +11,7 @@ DRAW_VERSION=0.2.4
all:
npm install
jake build
+ jake lint
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist ../../dist/plugins/draw-$(DRAW_VERSION)
commit aecc0d3aa195d855fc2fd6455b96c52bbc72eff0
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 15:23:24 2016 +0200
Ctrl + Down Arrow in fact jumps to the beginning of next paragraph
(cherry picked from commit b946b3b8c21a930eceef72b2bb0a9489adf6db83)
diff --git a/loleaflet/dist/loleaflet-help.html b/loleaflet/dist/loleaflet-help.html
index 8ce9288..ddb854b 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -98,7 +98,7 @@
<tr> <td class="function">Select to beginning of paragraph</td> <td class="shortcut">Ctrl + Shift + Arrow Up</td> </tr>
<tr> <td class="function">Move cursor down one line</td> <td class="shortcut">Arrow Down</td> </tr>
<tr> <td class="function">Select lines in downwards direction</td> <td class="shortcut">Shift + Arrow Down</td> </tr>
- <tr> <td class="function">Move cursor to end of the previous paragraph</td> <td class="shortcut">Ctrl + Arrow Down</td> </tr>
+ <tr> <td class="function">Move cursor to beginning of the next paragraph</td> <td class="shortcut">Ctrl + Arrow Down</td> </tr>
<tr> <td class="function">Select to end of paragraph</td> <td class="shortcut">Ctrl + Shift + Arrow Down</td> </tr>
<tr> <td class="function">Go to beginning of line</td> <td class="shortcut">Home</td> </tr>
<tr> <td class="function">Go and select to the beginning of a line</td> <td class="shortcut">Shift + Home</td> </tr>
@@ -215,7 +215,7 @@
<tr> <td class="function">Select to beginning of paragraph</td> <td class="shortcut">Ctrl + Shift + Arrow Up</td> </tr>
<tr> <td class="function">Move cursor down one line</td> <td class="shortcut">Arrow Down</td> </tr>
<tr> <td class="function">Select lines in downwards direction</td> <td class="shortcut">Shift + Arrow Down</td> </tr>
- <tr> <td class="function">Move cursor to end of the previous paragraph</td> <td class="shortcut">Ctrl + Arrow Down</td> </tr>
+ <tr> <td class="function">Move cursor to beginning of the next paragraph</td> <td class="shortcut">Ctrl + Arrow Down</td> </tr>
<tr> <td class="function">Select to end of paragraph</td> <td class="shortcut">Ctrl + Shift + Arrow Down</td> </tr>
<tr> <td class="function">Go to beginning of line</td> <td class="shortcut">Home</td> </tr>
<tr> <td class="function">Go and select to the beginning of a line</td> <td class="shortcut">Shift + Home</td> </tr>
commit 9abfd416b791f01606255ff5e547ef213469cea3
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon May 23 15:12:00 2016 +0200
typo: horizontaly → horizontally
(cherry picked from commit 2bc0f09a227220656ea45d8da3f5c9786d10db2a)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index d3bc568..ad13560 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -34,7 +34,7 @@ $(function () {
{ type: 'button', id: 'backcolor', img: 'backcolor', hint: _("Highlighting") },
{ type: 'break' },
{ type: 'button', id: 'alignleft', img: 'alignleft', hint: _("Align left"), uno: 'LeftPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}' },
- { type: 'button', id: 'alignhorizontal', img: 'alignhorizontal', hint: _("Center horizontaly"), uno: 'CenterPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"2"}}' },
+ { type: 'button', id: 'alignhorizontal', img: 'alignhorizontal', hint: _("Center horizontally"), uno: 'CenterPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"2"}}' },
{ type: 'button', id: 'alignright', img: 'alignright', hint: _("Align right"), uno: 'RightPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}' },
{ type: 'button', id: 'alignblock', img: 'alignblock', hint: _("Justified"), uno: 'JustifyPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}' },
{ type: 'break' },
diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js
index aebaf11..9924510 100644
--- a/loleaflet/src/dom/Draggable.js
+++ b/loleaflet/src/dom/Draggable.js
@@ -104,7 +104,7 @@ L.Draggable = L.Evented.extend({
offset = offset.add(correction);
}
if (this._map.getDocSize().x < this._map.getSize().x) {
- // don't pan horizontaly when the document fits in the viewing
+ // don't pan horizontally when the document fits in the viewing
// area horizontally (docWidth < viewAreaWidth)
offset.x = 0;
}
commit 02f2cd5a589819ec99cd860a9ee0839a8bd5435f
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 13:32:01 2016 +0200
loleaflet: update translations (test)
(cherry picked from commit b5ce034fde18a8e6ba00bf6418e5a981cc5b0c39)
diff --git a/loleaflet/po/help-hu.po b/loleaflet/po/help-hu.po
index 8c99705..fc24fde 100644
--- a/loleaflet/po/help-hu.po
+++ b/loleaflet/po/help-hu.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LoLeaflet Help\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-29 15:41+0200\n"
+"POT-Creation-Date: 2016-05-23 13:29+0200\n"
"PO-Revision-Date: 2016-01-10 22:10+0100\n"
"Last-Translator: Andras Timar <andras.timar at collabora.com>\n"
"Language-Team: Hungarian <hu at li.org>\n"
@@ -911,6 +911,18 @@ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:166"
msgid "Ctrl + D"
msgstr "Ctrl + D"
+#: dist/loleaflet-help.html+html.body.div.table.tr.td:167
+#, fuzzy
+msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167"
+msgid "Select All"
+msgstr "Mindent kijelöl"
+
+#: dist/loleaflet-help.html+html.body.div.table.tr.td:167
+#, fuzzy
+msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167"
+msgid "Ctrl + A"
+msgstr "Ctrl + A"
+
#: dist/loleaflet-help.html+html.body.div.table.tr.td:168
msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:168"
msgid "Align Center"
diff --git a/loleaflet/po/help-sl.po b/loleaflet/po/help-sl.po
index af5523a..6085142 100644
--- a/loleaflet/po/help-sl.po
+++ b/loleaflet/po/help-sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LibreOffice Online - Help\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-29 15:41+0200\n"
+"POT-Creation-Date: 2016-05-23 13:29+0200\n"
"PO-Revision-Date: 2016-03-10 00:44+0100\n"
"Last-Translator: Martin Srebotnjak <miles at filmsi.net>\n"
"Language-Team: sl.libreoffice.org <users at sl.libreoffice.org>\n"
@@ -914,6 +914,18 @@ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:166"
msgid "Ctrl + D"
msgstr "Krmilka + D"
+#: dist/loleaflet-help.html+html.body.div.table.tr.td:167
+#, fuzzy
+msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167"
+msgid "Select All"
+msgstr "Izberi vse"
+
+#: dist/loleaflet-help.html+html.body.div.table.tr.td:167
+#, fuzzy
+msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167"
+msgid "Ctrl + A"
+msgstr "Krmilka + A"
+
#: dist/loleaflet-help.html+html.body.div.table.tr.td:168
msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:168"
msgid "Align Center"
diff --git a/loleaflet/po/ui-fr.po b/loleaflet/po/ui-fr.po
index 947ebc9..230fc1a 100644
--- a/loleaflet/po/ui-fr.po
+++ b/loleaflet/po/ui-fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LoLeaflet Toolbar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-29 15:41+0200\n"
+"POT-Creation-Date: 2016-05-23 13:29+0200\n"
"PO-Revision-Date: 2015-12-20 14:14+0100\n"
"Last-Translator: Andras Timar <andras.timar at collabora.com>\n"
"Language-Team: French <fr at li.org>\n"
@@ -17,301 +17,333 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: dist/toolbar/toolbar.js:21 dist/toolbar/toolbar.js:29
-#: dist/toolbar/toolbar.js:37 dist/toolbar/toolbar.js:45
-msgid "File"
-msgstr "Fichier"
-
-#: dist/toolbar/toolbar.js:22 dist/toolbar/toolbar.js:30
-#: dist/toolbar/toolbar.js:38 dist/toolbar/toolbar.js:46
-msgid "Download as PDF document (.pdf)"
-msgstr "Télécharger en PDF (.pdf)"
-
-#: dist/toolbar/toolbar.js:23
-msgid "Download as ODF Text document (.odt)"
-msgstr "Télécharger en ODF Document texte (.odt)"
-
-#: dist/toolbar/toolbar.js:24
-msgid "Download as Microsoft Word 2003 (.doc)"
-msgstr "Télécharger en Microsoft Word 2003 (.doc)"
-
-#: dist/toolbar/toolbar.js:25
-msgid "Download as Microsoft Word (.docx)"
-msgstr "Télécharger en Microsoft Word (.docx)"
-
-#: dist/toolbar/toolbar.js:26 dist/toolbar/toolbar.js:34
-#: dist/toolbar/toolbar.js:42 dist/toolbar/toolbar.js:47
-msgid "Print"
-msgstr "Impression"
-
-#: dist/toolbar/toolbar.js:31
-msgid "Download as ODF Presentation (.odp)"
-msgstr "Download as ODF Présentation (.odp)"
-
-#: dist/toolbar/toolbar.js:32
-msgid "Download as Microsoft Powerpoint 2003 (.ppt)"
-msgstr "Télécharger en Microsoft Powerpoint 2003 (.ppt)"
-
-#: dist/toolbar/toolbar.js:33
-msgid "Download as Microsoft Powerpoint (.pptx)"
-msgstr "Télécharger en Microsoft Powerpoint (.pptx)"
-
-#: dist/toolbar/toolbar.js:39
-msgid "Download as ODF Spreadsheet (.ods)"
-msgstr "Télécharger en ODF Classeur (.ods)"
-
-#: dist/toolbar/toolbar.js:40
-msgid "Download as Microsoft Excel 2003 (.xls)"
-msgstr "Télécharger en Microsoft Excel 2003 (.xls)"
-
-#: dist/toolbar/toolbar.js:41
-msgid "Download as Microsoft Excel (.xlsx)"
-msgstr "Télécharger en Microsoft Excel (.xlsx)"
-
-#: dist/toolbar/toolbar.js:50
+#: dist/toolbar/toolbar.js:17
msgid "Save"
msgstr "Enregistrer"
-#: dist/toolbar/toolbar.js:52
+#: dist/toolbar/toolbar.js:19
msgid "Undo"
msgstr "Annuler"
-#: dist/toolbar/toolbar.js:53
+#: dist/toolbar/toolbar.js:20
msgid "Redo"
msgstr "Rétablir"
-#: dist/toolbar/toolbar.js:59
+#: dist/toolbar/toolbar.js:26
msgid "Bold"
msgstr "Gras"
-#: dist/toolbar/toolbar.js:60
+#: dist/toolbar/toolbar.js:27
msgid "Italic"
msgstr "Italique"
-#: dist/toolbar/toolbar.js:61
+#: dist/toolbar/toolbar.js:28
msgid "Underline"
msgstr "Soulignage"
-#: dist/toolbar/toolbar.js:62
+#: dist/toolbar/toolbar.js:29
msgid "Strikeout"
msgstr "Barré"
-#: dist/toolbar/toolbar.js:65
+#: dist/toolbar/toolbar.js:32
msgid "Font Color"
msgstr "Couleur de police"
-#: dist/toolbar/toolbar.js:67
+#: dist/toolbar/toolbar.js:34
msgid "Highlighting"
msgstr "Mise en évidence"
-#: dist/toolbar/toolbar.js:69
+#: dist/toolbar/toolbar.js:36
msgid "Align left"
msgstr "Aligner à gauche"
-#: dist/toolbar/toolbar.js:70
+#: dist/toolbar/toolbar.js:37
msgid "Center horizontaly"
msgstr "Centre horizontal"
-#: dist/toolbar/toolbar.js:71
+#: dist/toolbar/toolbar.js:38
msgid "Align right"
msgstr "Aligner à droite"
-#: dist/toolbar/toolbar.js:72
+#: dist/toolbar/toolbar.js:39
msgid "Justified"
msgstr "Justifié"
-#: dist/toolbar/toolbar.js:74
+#: dist/toolbar/toolbar.js:41
msgid "Bullets on/off"
msgstr "(Dés)activer les puces"
-#: dist/toolbar/toolbar.js:75
+#: dist/toolbar/toolbar.js:42
msgid "Numbering on/off"
msgstr "(Dés)activer la numérotation"
-#: dist/toolbar/toolbar.js:77
+#: dist/toolbar/toolbar.js:44
msgid "Increase Indent"
msgstr "Augmenter le retrait"
-#: dist/toolbar/toolbar.js:78
+#: dist/toolbar/toolbar.js:45
msgid "Decrease Indent"
msgstr "Réduire le retrait"
-#: dist/toolbar/toolbar.js:80
+#: dist/toolbar/toolbar.js:47
+msgid "Insert Comment"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:48
msgid "Insert Graphic"
msgstr "Insérer une image"
-#: dist/toolbar/toolbar.js:82
+#: dist/toolbar/toolbar.js:50
+msgid "Insert Table"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:52
msgid "Help"
msgstr "Aide"
-#: dist/toolbar/toolbar.js:84
+#: dist/toolbar/toolbar.js:54
msgid "More"
msgstr ""
-#: dist/toolbar/toolbar.js:85
+#: dist/toolbar/toolbar.js:55
msgid "Close Document"
msgstr "Fermer le document"
-#: dist/toolbar/toolbar.js:96
+#: dist/toolbar/toolbar.js:77
msgid "Sum"
msgstr "Somme"
-#: dist/toolbar/toolbar.js:97
+#: dist/toolbar/toolbar.js:78
msgid "Function"
msgstr "Fonction"
-#: dist/toolbar/toolbar.js:98
+#: dist/toolbar/toolbar.js:79
msgid "Cancel"
msgstr "Annuler"
-#: dist/toolbar/toolbar.js:99
+#: dist/toolbar/toolbar.js:80
msgid "Accept"
msgstr "Accepter"
-#: dist/toolbar/toolbar.js:110
+#: dist/toolbar/toolbar.js:91
msgid "First Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:111
+#: dist/toolbar/toolbar.js:92
msgid "Previous Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:112
+#: dist/toolbar/toolbar.js:93
msgid "Next Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:113
+#: dist/toolbar/toolbar.js:94
msgid "Last Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:129
+#: dist/toolbar/toolbar.js:104
+msgid "Fullscreen presentation"
+msgstr "Présentation en plein écran"
+
+#: dist/toolbar/toolbar.js:106
+msgid "Insert Page"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:107
+msgid "Duplicate Page"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:108
+msgid "Delete Page"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:120
+msgid "Search:"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:125
msgid "Search backwards"
msgstr "Recherche vers le haut"
-#: dist/toolbar/toolbar.js:130
+#: dist/toolbar/toolbar.js:126
msgid "Search forward"
msgstr "Recherche vers le bas"
-#: dist/toolbar/toolbar.js:131
+#: dist/toolbar/toolbar.js:127
msgid "Cancel the search"
msgstr "Annuler la recherche"
-#: dist/toolbar/toolbar.js:133
-msgid "Enable editing"
-msgstr "Activer l'édition"
-
-#: dist/toolbar/toolbar.js:134
-msgid "Enable selection"
-msgstr "Activer la sélection"
-
-#: dist/toolbar/toolbar.js:135
-msgid "Fullscreen presentation"
-msgstr "Présentation en plein écran"
-
-#: dist/toolbar/toolbar.js:136 src/control/Control.Presentation.js:16
-msgid "Insert Page"
+#: dist/toolbar/toolbar.js:132 dist/toolbar/toolbar.js:861
+msgid "Take edit lock (others can only view)"
msgstr ""
-#: dist/toolbar/toolbar.js:137 src/control/Control.Presentation.js:17
-msgid "Duplicate Page"
+#: dist/toolbar/toolbar.js:133 dist/toolbar/toolbar.js:862
+#: dist/toolbar/toolbar.js:954
+msgid "VIEWING"
msgstr ""
-#: dist/toolbar/toolbar.js:138 src/control/Control.Presentation.js:18
-msgid "Delete Page"
+#: dist/toolbar/toolbar.js:135
+msgid "Previous page"
msgstr ""
-#: dist/toolbar/toolbar.js:140
-msgid "Previous page/part"
-msgstr "Page précédente"
-
-#: dist/toolbar/toolbar.js:141
-msgid "Next page/part"
-msgstr "Page suivante"
+#: dist/toolbar/toolbar.js:136
+msgid "Next page"
+msgstr ""
-#: dist/toolbar/toolbar.js:143
-msgid "Reset"
+#: dist/toolbar/toolbar.js:138
+msgid "Reset zoom"
msgstr ""
-#: dist/toolbar/toolbar.js:144
+#: dist/toolbar/toolbar.js:139
msgid "Zoom out"
msgstr "Réduire"
-#: dist/toolbar/toolbar.js:146
+#: dist/toolbar/toolbar.js:141
msgid "Zoom in"
msgstr "Agrandir"
-#: dist/toolbar/toolbar.js:302 src/control/Control.Presentation.js:78
+#: dist/toolbar/toolbar.js:159
+msgid "You are viewing now."
+msgstr ""
+
+#: dist/toolbar/toolbar.js:159
+msgid "Click here to take edit."
+msgstr ""
+
+#: dist/toolbar/toolbar.js:273
msgid "Are you sure you want to delete this page?"
msgstr ""
-#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:790
+#: dist/toolbar/toolbar.js:398 dist/toolbar/toolbar.js:756
msgid "Size"
msgstr "Taille"
-#: dist/toolbar/toolbar.js:777
+#: dist/toolbar/toolbar.js:739
msgid "Style"
msgstr "Style"
-#: dist/toolbar/toolbar.js:785
+#: dist/toolbar/toolbar.js:751
msgid "Font"
msgstr "Police"
-#: src/control/Control.Tabs.js:27
+#: dist/toolbar/toolbar.js:775
+msgid "Previous slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:776
+msgid "Next slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:855
+msgid "You are editing (others can only view)"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:857
+msgid "EDITING"
+msgstr ""
+
+#: src/control/Control.Tabs.js:39
msgid "Insert sheet before this"
msgstr ""
-#: src/control/Control.Tabs.js:28
+#: src/control/Control.Tabs.js:40
msgid "Insert sheet after this"
msgstr ""
-#: src/control/Control.Tabs.js:29
+#: src/control/Control.Tabs.js:41
msgid "Delete sheet"
msgstr ""
-#: src/control/Control.Tabs.js:33
+#: src/control/Control.Tabs.js:45
msgid "Are you sure you want to delete this sheet?"
msgstr ""
-#: src/control/Control.Tabs.js:42
+#: src/control/Control.Tabs.js:54
msgid "Rename sheet"
msgstr ""
-#: src/control/Control.Tabs.js:46
+#: src/control/Control.Tabs.js:58
msgid "Enter new sheet name"
msgstr ""
#: src/core/Socket.js:14
-msgid "Socket connection error: "
-msgstr ""
-
-#: src/core/Socket.js:108
-msgid "Unexpected loolserver message."
+msgid "Oops, there is a problem connecting to LibreOffice Online : "
msgstr ""
-#: src/core/Socket.js:112
+#: src/core/Socket.js:132
msgid "Unsupported server version."
msgstr ""
-#: src/core/Socket.js:123
+#: src/core/Socket.js:145
msgid "Document requires password to view."
msgstr ""
-#: src/core/Socket.js:126
+#: src/core/Socket.js:148
msgid "Document requires password to modify."
msgstr ""
-#: src/core/Socket.js:128
+#: src/core/Socket.js:150
msgid "Hit Cancel to open in view-only mode."
msgstr ""
-#: src/core/Socket.js:132
+#: src/core/Socket.js:154
msgid "Wrong password provided. Please try again."
msgstr ""
-#: src/core/Socket.js:239
-msgid "Socket connection error"
+#: src/core/Socket.js:291
+msgid ""
+"Well, this is embarrassing, we cannot connect to your document. Please try "
+"again."
msgstr ""
-#: src/core/Socket.js:243
-msgid "Socket connection closed"
+#: src/core/Socket.js:294
+msgid "We are sorry, this is an unexpected connection error. Please try again."
msgstr ""
+
+#~ msgid "File"
+#~ msgstr "Fichier"
+
+#~ msgid "Download as PDF document (.pdf)"
+#~ msgstr "Télécharger en PDF (.pdf)"
+
+#~ msgid "Download as ODF Text document (.odt)"
+#~ msgstr "Télécharger en ODF Document texte (.odt)"
+
+#~ msgid "Download as Microsoft Word 2003 (.doc)"
+#~ msgstr "Télécharger en Microsoft Word 2003 (.doc)"
+
+#~ msgid "Download as Microsoft Word (.docx)"
+#~ msgstr "Télécharger en Microsoft Word (.docx)"
+
+#~ msgid "Print"
+#~ msgstr "Impression"
+
+#~ msgid "Download as ODF Presentation (.odp)"
+#~ msgstr "Download as ODF Présentation (.odp)"
+
+#~ msgid "Download as Microsoft Powerpoint 2003 (.ppt)"
+#~ msgstr "Télécharger en Microsoft Powerpoint 2003 (.ppt)"
+
+#~ msgid "Download as Microsoft Powerpoint (.pptx)"
+#~ msgstr "Télécharger en Microsoft Powerpoint (.pptx)"
+
+#~ msgid "Download as ODF Spreadsheet (.ods)"
+#~ msgstr "Télécharger en ODF Classeur (.ods)"
+
+#~ msgid "Download as Microsoft Excel 2003 (.xls)"
+#~ msgstr "Télécharger en Microsoft Excel 2003 (.xls)"
+
+#~ msgid "Download as Microsoft Excel (.xlsx)"
+#~ msgstr "Télécharger en Microsoft Excel (.xlsx)"
+
+#~ msgid "Enable editing"
+#~ msgstr "Activer l'édition"
+
+#~ msgid "Enable selection"
+#~ msgstr "Activer la sélection"
+
+#~ msgid "Previous page/part"
+#~ msgstr "Page précédente"
+
+#~ msgid "Next page/part"
+#~ msgstr "Page suivante"
diff --git a/loleaflet/po/ui-hu.po b/loleaflet/po/ui-hu.po
index 4d90204..4b87e1c 100644
--- a/loleaflet/po/ui-hu.po
+++ b/loleaflet/po/ui-hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LoLeaflet Toolbar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-29 15:41+0200\n"
+"POT-Creation-Date: 2016-05-23 13:29+0200\n"
"PO-Revision-Date: 2016-02-15 10:39+0100\n"
"Last-Translator: Andras Timar <andras.timar at collabora.com>\n"
"Language-Team: Hungarian <hu at li.org>\n"
@@ -17,302 +17,350 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.5\n"
-#: dist/toolbar/toolbar.js:21 dist/toolbar/toolbar.js:29
-#: dist/toolbar/toolbar.js:37 dist/toolbar/toolbar.js:45
-msgid "File"
-msgstr "Fájl"
-
-#: dist/toolbar/toolbar.js:22 dist/toolbar/toolbar.js:30
-#: dist/toolbar/toolbar.js:38 dist/toolbar/toolbar.js:46
-msgid "Download as PDF document (.pdf)"
-msgstr "Letöltés PDF dokumentumként (.pdf)"
-
-#: dist/toolbar/toolbar.js:23
-msgid "Download as ODF Text document (.odt)"
-msgstr "Letöltés ODF dokumentumként (.odt)"
-
-#: dist/toolbar/toolbar.js:24
-msgid "Download as Microsoft Word 2003 (.doc)"
-msgstr "Letöltés Microsoft Word 2003 dokumentumként (.doc)"
-
-#: dist/toolbar/toolbar.js:25
-msgid "Download as Microsoft Word (.docx)"
-msgstr "Letöltés Microsoft Word dokumentumként (.docx)"
-
-#: dist/toolbar/toolbar.js:26 dist/toolbar/toolbar.js:34
-#: dist/toolbar/toolbar.js:42 dist/toolbar/toolbar.js:47
-msgid "Print"
-msgstr "Nyomtatás"
-
-#: dist/toolbar/toolbar.js:31
-msgid "Download as ODF Presentation (.odp)"
-msgstr "Letöltés ODF bemutatóként (.odp)"
-
-#: dist/toolbar/toolbar.js:32
-msgid "Download as Microsoft Powerpoint 2003 (.ppt)"
-msgstr "Letöltés Microsoft Powerpoint 2003 dokumentumként (.ppt)"
-
-#: dist/toolbar/toolbar.js:33
-msgid "Download as Microsoft Powerpoint (.pptx)"
-msgstr "Letöltés Microsoft PowerPoint dokumentumként (.pptx)"
-
-#: dist/toolbar/toolbar.js:39
-msgid "Download as ODF Spreadsheet (.ods)"
-msgstr "Letöltés ODF munkafüzetként (.ods)"
-
-#: dist/toolbar/toolbar.js:40
-msgid "Download as Microsoft Excel 2003 (.xls)"
-msgstr "Letöltés Microsoft Excel 2003 dokumentumként (.xls)"
-
-#: dist/toolbar/toolbar.js:41
-msgid "Download as Microsoft Excel (.xlsx)"
-msgstr "Letöltés Microsoft Excel dokumentumként (.xlsx)"
-
-#: dist/toolbar/toolbar.js:50
+#: dist/toolbar/toolbar.js:17
msgid "Save"
msgstr "Mentés"
-#: dist/toolbar/toolbar.js:52
+#: dist/toolbar/toolbar.js:19
msgid "Undo"
msgstr "Visszavonás"
-#: dist/toolbar/toolbar.js:53
+#: dist/toolbar/toolbar.js:20
msgid "Redo"
msgstr "Újra"
-#: dist/toolbar/toolbar.js:59
+#: dist/toolbar/toolbar.js:26
msgid "Bold"
msgstr "Félkövér"
-#: dist/toolbar/toolbar.js:60
+#: dist/toolbar/toolbar.js:27
msgid "Italic"
msgstr "Dőlt"
-#: dist/toolbar/toolbar.js:61
+#: dist/toolbar/toolbar.js:28
msgid "Underline"
msgstr "Aláhúzott"
-#: dist/toolbar/toolbar.js:62
+#: dist/toolbar/toolbar.js:29
msgid "Strikeout"
msgstr "Áthúzott"
-#: dist/toolbar/toolbar.js:65
+#: dist/toolbar/toolbar.js:32
msgid "Font Color"
msgstr "Betűszín"
-#: dist/toolbar/toolbar.js:67
+#: dist/toolbar/toolbar.js:34
msgid "Highlighting"
msgstr "Kiemelés"
-#: dist/toolbar/toolbar.js:69
+#: dist/toolbar/toolbar.js:36
msgid "Align left"
msgstr "Balra igazítás"
-#: dist/toolbar/toolbar.js:70
+#: dist/toolbar/toolbar.js:37
msgid "Center horizontaly"
msgstr "Középre igazítás"
-#: dist/toolbar/toolbar.js:71
+#: dist/toolbar/toolbar.js:38
msgid "Align right"
msgstr "Jobbra igazítás"
-#: dist/toolbar/toolbar.js:72
+#: dist/toolbar/toolbar.js:39
msgid "Justified"
msgstr "Sorkizárás"
-#: dist/toolbar/toolbar.js:74
+#: dist/toolbar/toolbar.js:41
msgid "Bullets on/off"
msgstr "Felsorolás be/ki"
-#: dist/toolbar/toolbar.js:75
+#: dist/toolbar/toolbar.js:42
msgid "Numbering on/off"
msgstr "Számozás be/ki"
-#: dist/toolbar/toolbar.js:77
+#: dist/toolbar/toolbar.js:44
msgid "Increase Indent"
msgstr "Behúzás növelése"
-#: dist/toolbar/toolbar.js:78
+#: dist/toolbar/toolbar.js:45
msgid "Decrease Indent"
msgstr "Behúzás csökkentése"
-#: dist/toolbar/toolbar.js:80
+#: dist/toolbar/toolbar.js:47
+msgid "Insert Comment"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:48
msgid "Insert Graphic"
msgstr "Kép beszúrása"
-#: dist/toolbar/toolbar.js:82
+#: dist/toolbar/toolbar.js:50
+#, fuzzy
+msgid "Insert Table"
+msgstr "Dia beszúrása"
+
+#: dist/toolbar/toolbar.js:52
msgid "Help"
msgstr "Súgó"
-#: dist/toolbar/toolbar.js:84
+#: dist/toolbar/toolbar.js:54
msgid "More"
msgstr "További ikonok"
-#: dist/toolbar/toolbar.js:85
+#: dist/toolbar/toolbar.js:55
msgid "Close Document"
msgstr "Dokumentum bezárása"
-#: dist/toolbar/toolbar.js:96
+#: dist/toolbar/toolbar.js:77
msgid "Sum"
msgstr "Összeg"
-#: dist/toolbar/toolbar.js:97
+#: dist/toolbar/toolbar.js:78
msgid "Function"
msgstr "Függvény"
-#: dist/toolbar/toolbar.js:98
+#: dist/toolbar/toolbar.js:79
msgid "Cancel"
msgstr "Mégse"
-#: dist/toolbar/toolbar.js:99
+#: dist/toolbar/toolbar.js:80
msgid "Accept"
msgstr "Elfogadás"
-#: dist/toolbar/toolbar.js:110
+#: dist/toolbar/toolbar.js:91
msgid "First Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:111
+#: dist/toolbar/toolbar.js:92
msgid "Previous Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:112
+#: dist/toolbar/toolbar.js:93
msgid "Next Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:113
+#: dist/toolbar/toolbar.js:94
msgid "Last Sheet"
msgstr ""
-#: dist/toolbar/toolbar.js:129
-msgid "Search backwards"
-msgstr "Keresés visszafelé"
-
-#: dist/toolbar/toolbar.js:130
-msgid "Search forward"
-msgstr "Keresés előre"
-
-#: dist/toolbar/toolbar.js:131
-msgid "Cancel the search"
-msgstr "Keresés leállítása"
-
-#: dist/toolbar/toolbar.js:133
-msgid "Enable editing"
-msgstr "Szerkesztés engedélyezése"
-
-#: dist/toolbar/toolbar.js:134
-msgid "Enable selection"
-msgstr "Kijelölés engedélyezése"
-
-#: dist/toolbar/toolbar.js:135
+#: dist/toolbar/toolbar.js:104
msgid "Fullscreen presentation"
msgstr "Teljes képernyős bemutató"
-#: dist/toolbar/toolbar.js:136 src/control/Control.Presentation.js:16
+#: dist/toolbar/toolbar.js:106
msgid "Insert Page"
msgstr "Dia beszúrása"
-#: dist/toolbar/toolbar.js:137 src/control/Control.Presentation.js:17
+#: dist/toolbar/toolbar.js:107
msgid "Duplicate Page"
msgstr "Dia megkettőzése"
-#: dist/toolbar/toolbar.js:138 src/control/Control.Presentation.js:18
+#: dist/toolbar/toolbar.js:108
msgid "Delete Page"
msgstr "Dia törlése"
-#: dist/toolbar/toolbar.js:140
-msgid "Previous page/part"
-msgstr "Előző oldal/rész"
+#: dist/toolbar/toolbar.js:120
+msgid "Search:"
+msgstr "Keresés:"
-#: dist/toolbar/toolbar.js:141
-msgid "Next page/part"
-msgstr "Következő oldal/rész"
+#: dist/toolbar/toolbar.js:125
+msgid "Search backwards"
+msgstr "Keresés visszafelé"
+
+#: dist/toolbar/toolbar.js:126
+msgid "Search forward"
+msgstr "Keresés előre"
-#: dist/toolbar/toolbar.js:143
-msgid "Reset"
-msgstr "Alaphelyzet"
+#: dist/toolbar/toolbar.js:127
+msgid "Cancel the search"
+msgstr "Keresés leállítása"
-#: dist/toolbar/toolbar.js:144
+#: dist/toolbar/toolbar.js:132 dist/toolbar/toolbar.js:861
+msgid "Take edit lock (others can only view)"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:133 dist/toolbar/toolbar.js:862
+#: dist/toolbar/toolbar.js:954
+msgid "VIEWING"
+msgstr "FIGYELÉS"
+
+#: dist/toolbar/toolbar.js:135
+msgid "Previous page"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:136
+msgid "Next page"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:138
+msgid "Reset zoom"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:139
msgid "Zoom out"
msgstr "Kicsinyítés"
-#: dist/toolbar/toolbar.js:146
+#: dist/toolbar/toolbar.js:141
msgid "Zoom in"
msgstr "Nagyítás"
-#: dist/toolbar/toolbar.js:302 src/control/Control.Presentation.js:78
+#: dist/toolbar/toolbar.js:159
+msgid "You are viewing now."
+msgstr ""
+
+#: dist/toolbar/toolbar.js:159
+msgid "Click here to take edit."
+msgstr ""
+
+#: dist/toolbar/toolbar.js:273
msgid "Are you sure you want to delete this page?"
msgstr "Biztosan törli ezt az oldalt?"
-#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:790
+#: dist/toolbar/toolbar.js:398 dist/toolbar/toolbar.js:756
msgid "Size"
msgstr "Méret"
-#: dist/toolbar/toolbar.js:777
+#: dist/toolbar/toolbar.js:739
msgid "Style"
msgstr "Stílus"
-#: dist/toolbar/toolbar.js:785
+#: dist/toolbar/toolbar.js:751
msgid "Font"
msgstr "Betűkészlet"
-#: src/control/Control.Tabs.js:27
+#: dist/toolbar/toolbar.js:775
+msgid "Previous slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:776
+msgid "Next slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:855
+msgid "You are editing (others can only view)"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:857
+msgid "EDITING"
+msgstr "SZERKESZTÉS"
+
+#: src/control/Control.Tabs.js:39
msgid "Insert sheet before this"
msgstr "Munkalap beillesztése ez elé"
-#: src/control/Control.Tabs.js:28
+#: src/control/Control.Tabs.js:40
msgid "Insert sheet after this"
msgstr "Munkalap beillesztése e mögé"
-#: src/control/Control.Tabs.js:29
+#: src/control/Control.Tabs.js:41
msgid "Delete sheet"
msgstr "Munkalap törlése"
-#: src/control/Control.Tabs.js:33
+#: src/control/Control.Tabs.js:45
msgid "Are you sure you want to delete this sheet?"
msgstr "Biztosan törli ezt a munkalapot?"
-#: src/control/Control.Tabs.js:42
+#: src/control/Control.Tabs.js:54
msgid "Rename sheet"
msgstr "Munkalap átnevezése"
-#: src/control/Control.Tabs.js:46
+#: src/control/Control.Tabs.js:58
msgid "Enter new sheet name"
msgstr "Adja meg az munkalapnevet"
#: src/core/Socket.js:14
-#, fuzzy
-msgid "Socket connection error: "
-msgstr "Socket kapcsolat hiba"
-
-#: src/core/Socket.js:108
-msgid "Unexpected loolserver message."
-msgstr "Váratlan loolserver-üzenet."
+msgid "Oops, there is a problem connecting to LibreOffice Online : "
+msgstr ""
-#: src/core/Socket.js:112
+#: src/core/Socket.js:132
msgid "Unsupported server version."
msgstr "Nem támogatott kiszolgálóverzió."
-#: src/core/Socket.js:123
+#: src/core/Socket.js:145
msgid "Document requires password to view."
msgstr ""
-#: src/core/Socket.js:126
+#: src/core/Socket.js:148
msgid "Document requires password to modify."
msgstr ""
-#: src/core/Socket.js:128
+#: src/core/Socket.js:150
msgid "Hit Cancel to open in view-only mode."
msgstr ""
-#: src/core/Socket.js:132
+#: src/core/Socket.js:154
msgid "Wrong password provided. Please try again."
msgstr ""
-#: src/core/Socket.js:239
-msgid "Socket connection error"
-msgstr "Socket kapcsolat hiba"
+#: src/core/Socket.js:291
+msgid ""
+"Well, this is embarrassing, we cannot connect to your document. Please try "
+"again."
+msgstr ""
+
+#: src/core/Socket.js:294
+msgid "We are sorry, this is an unexpected connection error. Please try again."
+msgstr ""
+
+#~ msgid "File"
+#~ msgstr "Fájl"
+
+#~ msgid "Download as PDF document (.pdf)"
+#~ msgstr "Letöltés PDF dokumentumként (.pdf)"
+
+#~ msgid "Download as ODF Text document (.odt)"
+#~ msgstr "Letöltés ODF dokumentumként (.odt)"
+
+#~ msgid "Download as Microsoft Word 2003 (.doc)"
+#~ msgstr "Letöltés Microsoft Word 2003 dokumentumként (.doc)"
+
+#~ msgid "Download as Microsoft Word (.docx)"
+#~ msgstr "Letöltés Microsoft Word dokumentumként (.docx)"
+
+#~ msgid "Print"
+#~ msgstr "Nyomtatás"
+
+#~ msgid "Download as ODF Presentation (.odp)"
+#~ msgstr "Letöltés ODF bemutatóként (.odp)"
+
+#~ msgid "Download as Microsoft Powerpoint 2003 (.ppt)"
+#~ msgstr "Letöltés Microsoft Powerpoint 2003 dokumentumként (.ppt)"
+
+#~ msgid "Download as Microsoft Powerpoint (.pptx)"
+#~ msgstr "Letöltés Microsoft PowerPoint dokumentumként (.pptx)"
+
+#~ msgid "Download as ODF Spreadsheet (.ods)"
+#~ msgstr "Letöltés ODF munkafüzetként (.ods)"
+
+#~ msgid "Download as Microsoft Excel 2003 (.xls)"
+#~ msgstr "Letöltés Microsoft Excel 2003 dokumentumként (.xls)"
+
+#~ msgid "Download as Microsoft Excel (.xlsx)"
+#~ msgstr "Letöltés Microsoft Excel dokumentumként (.xlsx)"
+
+#~ msgid "Enable editing"
+#~ msgstr "Szerkesztés engedélyezése"
+
+#~ msgid "Enable selection"
+#~ msgstr "Kijelölés engedélyezése"
+
+#~ msgid "Previous page/part"
+#~ msgstr "Előző oldal/rész"
+
+#~ msgid "Next page/part"
+#~ msgstr "Következő oldal/rész"
+
+#~ msgid "Reset"
+#~ msgstr "Alaphelyzet"
+
+#, fuzzy
+#~ msgid "Socket connection error: "
+#~ msgstr "Socket kapcsolat hiba"
+
+#~ msgid "Unexpected loolserver message."
+#~ msgstr "Váratlan loolserver-üzenet."
+
+#~ msgid "Socket connection error"
+#~ msgstr "Socket kapcsolat hiba"
-#: src/core/Socket.js:243
-msgid "Socket connection closed"
-msgstr "Socket kapcsolat bezáródott"
+#~ msgid "Socket connection closed"
+#~ msgstr "Socket kapcsolat bezáródott"
diff --git a/loleaflet/po/ui-sl.po b/loleaflet/po/ui-sl.po
index 74675d6..da69cc5 100644
--- a/loleaflet/po/ui-sl.po
+++ b/loleaflet/po/ui-sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LibreOffice Online UI\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-29 15:41+0200\n"
+"POT-Creation-Date: 2016-05-23 13:29+0200\n"
"PO-Revision-Date: 2016-02-28 23:04+0100\n"
"Last-Translator: Martin Srebotnjak <miles at filmsi.net>\n"
"Language-Team: sl.libreoffice.org <users at sl.libreoffice.org>\n"
@@ -18,302 +18,350 @@ msgstr ""
"X-Accelerator-Marker: ~\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: dist/toolbar/toolbar.js:21 dist/toolbar/toolbar.js:29
-#: dist/toolbar/toolbar.js:37 dist/toolbar/toolbar.js:45
-msgid "File"
-msgstr "Datoteka"
-
-#: dist/toolbar/toolbar.js:22 dist/toolbar/toolbar.js:30
-#: dist/toolbar/toolbar.js:38 dist/toolbar/toolbar.js:46
-msgid "Download as PDF document (.pdf)"
-msgstr "Prenesi kot dokument PDF (.pdf)"
-
-#: dist/toolbar/toolbar.js:23
-msgid "Download as ODF Text document (.odt)"
-msgstr "Prenesi kot besedilni dokument ODF (.odt)"
-
-#: dist/toolbar/toolbar.js:24
-msgid "Download as Microsoft Word 2003 (.doc)"
-msgstr "Prenesi kot Microsoft Word 2003 (.doc)"
-
-#: dist/toolbar/toolbar.js:25
-msgid "Download as Microsoft Word (.docx)"
-msgstr "Prenesi kot Microsoft Word (.docx)"
-
-#: dist/toolbar/toolbar.js:26 dist/toolbar/toolbar.js:34
-#: dist/toolbar/toolbar.js:42 dist/toolbar/toolbar.js:47
-msgid "Print"
-msgstr "Natisni"
-
-#: dist/toolbar/toolbar.js:31
-msgid "Download as ODF Presentation (.odp)"
-msgstr "Prenesi kot predstavitev ODF (.odp)"
-
-#: dist/toolbar/toolbar.js:32
-msgid "Download as Microsoft Powerpoint 2003 (.ppt)"
-msgstr "Prenesi kot Microsoft Powerpoint 2003 (.ppt)"
-
-#: dist/toolbar/toolbar.js:33
-msgid "Download as Microsoft Powerpoint (.pptx)"
-msgstr "Prenesi kot Microsoft Powerpoint (.pptx)"
-
-#: dist/toolbar/toolbar.js:39
-msgid "Download as ODF Spreadsheet (.ods)"
-msgstr "Prenesi kot preglednico ODF (.ods)"
-
-#: dist/toolbar/toolbar.js:40
-msgid "Download as Microsoft Excel 2003 (.xls)"
-msgstr "Prenesi kot Microsoft Excel 2003 (.xls)"
-
-#: dist/toolbar/toolbar.js:41
-msgid "Download as Microsoft Excel (.xlsx)"
-msgstr "Prenesi kot Microsoft Excel (.xlsx)"
-
-#: dist/toolbar/toolbar.js:50
+#: dist/toolbar/toolbar.js:17
msgid "Save"
msgstr "Shrani"
-#: dist/toolbar/toolbar.js:52
+#: dist/toolbar/toolbar.js:19
msgid "Undo"
msgstr "Razveljavi"
-#: dist/toolbar/toolbar.js:53
+#: dist/toolbar/toolbar.js:20
msgid "Redo"
msgstr "Ponovi"
-#: dist/toolbar/toolbar.js:59
+#: dist/toolbar/toolbar.js:26
msgid "Bold"
msgstr "Krepko"
-#: dist/toolbar/toolbar.js:60
+#: dist/toolbar/toolbar.js:27
msgid "Italic"
msgstr "Ležeče"
-#: dist/toolbar/toolbar.js:61
+#: dist/toolbar/toolbar.js:28
msgid "Underline"
msgstr "Podčrtano"
-#: dist/toolbar/toolbar.js:62
+#: dist/toolbar/toolbar.js:29
msgid "Strikeout"
msgstr "Prečrtano"
-#: dist/toolbar/toolbar.js:65
+#: dist/toolbar/toolbar.js:32
msgid "Font Color"
msgstr "Barva pisave"
-#: dist/toolbar/toolbar.js:67
+#: dist/toolbar/toolbar.js:34
msgid "Highlighting"
msgstr "Poudarjanje"
-#: dist/toolbar/toolbar.js:69
+#: dist/toolbar/toolbar.js:36
msgid "Align left"
msgstr "Poravnaj levo"
-#: dist/toolbar/toolbar.js:70
+#: dist/toolbar/toolbar.js:37
msgid "Center horizontaly"
msgstr "Vodoravno na sredino"
-#: dist/toolbar/toolbar.js:71
+#: dist/toolbar/toolbar.js:38
msgid "Align right"
msgstr "Poravnaj desno"
-#: dist/toolbar/toolbar.js:72
+#: dist/toolbar/toolbar.js:39
msgid "Justified"
msgstr "Obojestransko"
-#: dist/toolbar/toolbar.js:74
+#: dist/toolbar/toolbar.js:41
msgid "Bullets on/off"
msgstr "Oznake vključene/izključene"
-#: dist/toolbar/toolbar.js:75
+#: dist/toolbar/toolbar.js:42
msgid "Numbering on/off"
msgstr "Oštevilčevanje vključeno/izključeno"
-#: dist/toolbar/toolbar.js:77
+#: dist/toolbar/toolbar.js:44
msgid "Increase Indent"
msgstr "Povečaj zamik"
-#: dist/toolbar/toolbar.js:78
+#: dist/toolbar/toolbar.js:45
msgid "Decrease Indent"
msgstr "Zmanjšaj zamik"
-#: dist/toolbar/toolbar.js:80
+#: dist/toolbar/toolbar.js:47
+msgid "Insert Comment"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:48
msgid "Insert Graphic"
msgstr "Vstavi sliko"
-#: dist/toolbar/toolbar.js:82
+#: dist/toolbar/toolbar.js:50
+#, fuzzy
+msgid "Insert Table"
+msgstr "Vstavi stran"
+
+#: dist/toolbar/toolbar.js:52
msgid "Help"
msgstr "Pomoč"
-#: dist/toolbar/toolbar.js:84
+#: dist/toolbar/toolbar.js:54
msgid "More"
msgstr "Dodatno"
-#: dist/toolbar/toolbar.js:85
+#: dist/toolbar/toolbar.js:55
msgid "Close Document"
msgstr "Zapri dokument"
-#: dist/toolbar/toolbar.js:96
+#: dist/toolbar/toolbar.js:77
msgid "Sum"
msgstr "Vsota"
-#: dist/toolbar/toolbar.js:97
+#: dist/toolbar/toolbar.js:78
msgid "Function"
msgstr "Funkcija"
-#: dist/toolbar/toolbar.js:98
+#: dist/toolbar/toolbar.js:79
msgid "Cancel"
msgstr "Prekliči"
-#: dist/toolbar/toolbar.js:99
+#: dist/toolbar/toolbar.js:80
msgid "Accept"
msgstr "Sprejmi"
-#: dist/toolbar/toolbar.js:110
+#: dist/toolbar/toolbar.js:91
msgid "First Sheet"
msgstr "Prvi delovni list"
-#: dist/toolbar/toolbar.js:111
+#: dist/toolbar/toolbar.js:92
msgid "Previous Sheet"
msgstr "Prejšnji delovni list"
-#: dist/toolbar/toolbar.js:112
+#: dist/toolbar/toolbar.js:93
msgid "Next Sheet"
msgstr "Naslednji delovni list"
-#: dist/toolbar/toolbar.js:113
+#: dist/toolbar/toolbar.js:94
msgid "Last Sheet"
msgstr "Zadnji delovni list"
-#: dist/toolbar/toolbar.js:129
-msgid "Search backwards"
-msgstr "Išči nazaj"
-
-#: dist/toolbar/toolbar.js:130
-msgid "Search forward"
-msgstr "Išči naprej"
-
-#: dist/toolbar/toolbar.js:131
-msgid "Cancel the search"
-msgstr "Prekliči iskanje"
-
-#: dist/toolbar/toolbar.js:133
-msgid "Enable editing"
-msgstr "Omogoči urejanje"
-
-#: dist/toolbar/toolbar.js:134
-msgid "Enable selection"
-msgstr "Omogoči izbiranje"
-
-#: dist/toolbar/toolbar.js:135
+#: dist/toolbar/toolbar.js:104
msgid "Fullscreen presentation"
msgstr "Celozaslonska predstavitev"
-#: dist/toolbar/toolbar.js:136 src/control/Control.Presentation.js:16
+#: dist/toolbar/toolbar.js:106
msgid "Insert Page"
msgstr "Vstavi stran"
-#: dist/toolbar/toolbar.js:137 src/control/Control.Presentation.js:17
+#: dist/toolbar/toolbar.js:107
msgid "Duplicate Page"
msgstr "Podvoji stran"
-#: dist/toolbar/toolbar.js:138 src/control/Control.Presentation.js:18
+#: dist/toolbar/toolbar.js:108
msgid "Delete Page"
msgstr "Izbriši stran"
-#: dist/toolbar/toolbar.js:140
-msgid "Previous page/part"
-msgstr "Prejšnja stran/del"
+#: dist/toolbar/toolbar.js:120
+msgid "Search:"
+msgstr ""
-#: dist/toolbar/toolbar.js:141
-msgid "Next page/part"
-msgstr "Naslednja stran/del"
+#: dist/toolbar/toolbar.js:125
+msgid "Search backwards"
+msgstr "Išči nazaj"
+
+#: dist/toolbar/toolbar.js:126
+msgid "Search forward"
+msgstr "Išči naprej"
+
+#: dist/toolbar/toolbar.js:127
+msgid "Cancel the search"
+msgstr "Prekliči iskanje"
+
+#: dist/toolbar/toolbar.js:132 dist/toolbar/toolbar.js:861
+msgid "Take edit lock (others can only view)"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:133 dist/toolbar/toolbar.js:862
+#: dist/toolbar/toolbar.js:954
+msgid "VIEWING"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:135
+msgid "Previous page"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:136
+msgid "Next page"
+msgstr ""
-#: dist/toolbar/toolbar.js:143
-msgid "Reset"
-msgstr "Ponastavi"
+#: dist/toolbar/toolbar.js:138
+msgid "Reset zoom"
+msgstr ""
-#: dist/toolbar/toolbar.js:144
+#: dist/toolbar/toolbar.js:139
msgid "Zoom out"
msgstr "Približaj"
-#: dist/toolbar/toolbar.js:146
+#: dist/toolbar/toolbar.js:141
msgid "Zoom in"
msgstr "Oddalji"
-#: dist/toolbar/toolbar.js:302 src/control/Control.Presentation.js:78
+#: dist/toolbar/toolbar.js:159
+msgid "You are viewing now."
+msgstr ""
+
+#: dist/toolbar/toolbar.js:159
+msgid "Click here to take edit."
+msgstr ""
+
+#: dist/toolbar/toolbar.js:273
msgid "Are you sure you want to delete this page?"
msgstr "Ali ste prepričani, da želite izbrisati to stran?"
-#: dist/toolbar/toolbar.js:428 dist/toolbar/toolbar.js:790
+#: dist/toolbar/toolbar.js:398 dist/toolbar/toolbar.js:756
msgid "Size"
msgstr "Velikost"
-#: dist/toolbar/toolbar.js:777
+#: dist/toolbar/toolbar.js:739
msgid "Style"
msgstr "Slog"
-#: dist/toolbar/toolbar.js:785
+#: dist/toolbar/toolbar.js:751
msgid "Font"
msgstr "Pisava"
-#: src/control/Control.Tabs.js:27
+#: dist/toolbar/toolbar.js:775
+msgid "Previous slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:776
+msgid "Next slide"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:855
+msgid "You are editing (others can only view)"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:857
+msgid "EDITING"
+msgstr ""
+
+#: src/control/Control.Tabs.js:39
msgid "Insert sheet before this"
msgstr "Vstavi delovni list pred tem"
-#: src/control/Control.Tabs.js:28
+#: src/control/Control.Tabs.js:40
msgid "Insert sheet after this"
msgstr "Vstavi delovni list za tem"
-#: src/control/Control.Tabs.js:29
+#: src/control/Control.Tabs.js:41
msgid "Delete sheet"
msgstr "Izbriši delovni list"
-#: src/control/Control.Tabs.js:33
+#: src/control/Control.Tabs.js:45
msgid "Are you sure you want to delete this sheet?"
msgstr "Ali ste prepričani, da želite izbrisati ta delovni list?"
-#: src/control/Control.Tabs.js:42
+#: src/control/Control.Tabs.js:54
msgid "Rename sheet"
msgstr "Preimenuj delovni list"
-#: src/control/Control.Tabs.js:46
+#: src/control/Control.Tabs.js:58
msgid "Enter new sheet name"
msgstr "Vnesite ime za nov delovni list"
#: src/core/Socket.js:14
-#, fuzzy
-msgid "Socket connection error: "
-msgstr "Napaka povezave vtiča"
-
-#: src/core/Socket.js:108
-msgid "Unexpected loolserver message."
-msgstr "Nepričakovano sporočilo loolserver."
+msgid "Oops, there is a problem connecting to LibreOffice Online : "
+msgstr ""
-#: src/core/Socket.js:112
+#: src/core/Socket.js:132
msgid "Unsupported server version."
msgstr "Nepodprta različica strežnika."
-#: src/core/Socket.js:123
+#: src/core/Socket.js:145
msgid "Document requires password to view."
msgstr "Za ogled dokumenta je potrebno geslo."
-#: src/core/Socket.js:126
+#: src/core/Socket.js:148
msgid "Document requires password to modify."
msgstr "Za spreminjanje dokumenta je potrebno geslo."
-#: src/core/Socket.js:128
+#: src/core/Socket.js:150
msgid "Hit Cancel to open in view-only mode."
msgstr "Pritisnite Prekliči za odpiranje v oglednem načinu."
-#: src/core/Socket.js:132
+#: src/core/Socket.js:154
msgid "Wrong password provided. Please try again."
msgstr "Vnesli ste napačno geslo. Poskusite znova."
-#: src/core/Socket.js:239
-msgid "Socket connection error"
-msgstr "Napaka povezave vtiča"
+#: src/core/Socket.js:291
+msgid ""
+"Well, this is embarrassing, we cannot connect to your document. Please try "
+"again."
+msgstr ""
+
+#: src/core/Socket.js:294
+msgid "We are sorry, this is an unexpected connection error. Please try again."
+msgstr ""
+
+#~ msgid "File"
+#~ msgstr "Datoteka"
+
+#~ msgid "Download as PDF document (.pdf)"
+#~ msgstr "Prenesi kot dokument PDF (.pdf)"
+
+#~ msgid "Download as ODF Text document (.odt)"
+#~ msgstr "Prenesi kot besedilni dokument ODF (.odt)"
+
+#~ msgid "Download as Microsoft Word 2003 (.doc)"
+#~ msgstr "Prenesi kot Microsoft Word 2003 (.doc)"
+
+#~ msgid "Download as Microsoft Word (.docx)"
+#~ msgstr "Prenesi kot Microsoft Word (.docx)"
+
+#~ msgid "Print"
+#~ msgstr "Natisni"
+
+#~ msgid "Download as ODF Presentation (.odp)"
+#~ msgstr "Prenesi kot predstavitev ODF (.odp)"
+
+#~ msgid "Download as Microsoft Powerpoint 2003 (.ppt)"
+#~ msgstr "Prenesi kot Microsoft Powerpoint 2003 (.ppt)"
+
+#~ msgid "Download as Microsoft Powerpoint (.pptx)"
+#~ msgstr "Prenesi kot Microsoft Powerpoint (.pptx)"
+
+#~ msgid "Download as ODF Spreadsheet (.ods)"
+#~ msgstr "Prenesi kot preglednico ODF (.ods)"
+
+#~ msgid "Download as Microsoft Excel 2003 (.xls)"
+#~ msgstr "Prenesi kot Microsoft Excel 2003 (.xls)"
+
+#~ msgid "Download as Microsoft Excel (.xlsx)"
+#~ msgstr "Prenesi kot Microsoft Excel (.xlsx)"
+
+#~ msgid "Enable editing"
+#~ msgstr "Omogoči urejanje"
+
+#~ msgid "Enable selection"
+#~ msgstr "Omogoči izbiranje"
+
+#~ msgid "Previous page/part"
+#~ msgstr "Prejšnja stran/del"
+
+#~ msgid "Next page/part"
+#~ msgstr "Naslednja stran/del"
+
+#~ msgid "Reset"
+#~ msgstr "Ponastavi"
+
+#, fuzzy
+#~ msgid "Socket connection error: "
+#~ msgstr "Napaka povezave vtiča"
+
+#~ msgid "Unexpected loolserver message."
+#~ msgstr "Nepričakovano sporočilo loolserver."
+
+#~ msgid "Socket connection error"
+#~ msgstr "Napaka povezave vtiča"
-#: src/core/Socket.js:243
-msgid "Socket connection closed"
-msgstr "Povezava vtiča zaprta"
+#~ msgid "Socket connection closed"
+#~ msgstr "Povezava vtiča zaprta"
commit 3b95594699eaa5d5aaa5387c860822b2ae6b0633
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 13:29:16 2016 +0200
loleaflet: add --from-code=UTF-8 to xgettext call
(cherry picked from commit 1af287e437cc61d6563bc9cec890e343e0010c91)
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 7b5c838..7886d98 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -28,7 +28,9 @@ dist: all
rm -rf loleaflet-$(VERSION)
pot:
- xgettext --keyword=_ --output=po/loleaflet-ui.pot dist/toolbar/toolbar.js src/control/Control.Tabs.js \
+ xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+ dist/toolbar/toolbar.js \
+ src/control/Control.Tabs.js \
src/core/Socket.js
html2po --pot --input=dist/loleaflet-help.html --output=po/loleaflet-help.pot
commit 8e795ae155fa1110eabf5d85b881d17fb16a2310
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 13:25:26 2016 +0200
loleaflet: add l10n support to VIEVING/EDITING labels
(cherry picked from commit 5271a9106989e4f78b9e9d5500af53220e3d7350)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 9e6320f..d3bc568 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -130,7 +130,7 @@ $(function () {
{ type: 'html', id: 'modifiedstatuslabel', html: '<div id="modifiedstatuslabel" class="loleaflet-font"></div>' },
{ type: 'break' },
{ type: 'button', id: 'takeedit', img: 'edit', hint: _("Take edit lock (others can only view)")},
- { type: 'html', id: 'takeeditlabel', html: '<div id="takeeditlabel" class="loleaflet-font">VIEWING</div>' },
+ { type: 'html', id: 'takeeditlabel', html: '<div id="takeeditlabel" class="loleaflet-font">' + _("VIEWING") + '</div>' },
{ type: 'break' },
{ type: 'button', id: 'prev', img: 'prev', hint: _("Previous page") },
{ type: 'button', id: 'next', img: 'next', hint: _("Next page") },
@@ -854,12 +854,12 @@ map.on('editlock', function (e) {
toolbar.disable('takeedit');
toolbar.set('takeedit', {hint: _('You are editing (others can only view)')});
- $('#takeeditlabel').html('EDITING');
+ $('#takeeditlabel').html(_('EDITING'));
}
else {
toolbar.enable('takeedit');
toolbar.set('takeedit', {hint: _('Take edit lock (others can only view)')});
- $('#takeeditlabel').html('VIEWING');
+ $('#takeeditlabel').html(_('VIEWING'));
$('#tb_toolbar-down_item_takeedit')
.w2overlay({
html: takeEditPopupMessage,
@@ -951,7 +951,7 @@ map.on('editlock', function (e) {
map.on('mouseup keypress', function(e) {
if (!map._editlock) {
- $('#takeeditlabel').html('VIEWING');
+ $('#takeeditlabel').html(_('VIEWING'));
$('#tb_toolbar-down_item_takeedit')
.w2overlay({
html: takeEditPopupMessage,
commit b251a3998b8f7c4cb3d5b8ca3969667dceb25e53
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 13:16:28 2016 +0200
loleaflet: bccu#1818 position formula toolbar to left
(cherry picked from commit 9fc6c563354687913eceeecd3f68a89304525ce3)
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 51d38dc..d5545af 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -59,8 +59,7 @@
/* center the toolbar */
#tb_presentation-toolbar_item_left,
-#tb_toolbar-up_item_left,
-#tb_formulabar_item_left {
+#tb_toolbar-up_item_left {
width: 50%;
}
commit 4f1b8fc923f16337417ce232967cb932076fd94f
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 12:48:38 2016 +0200
loleaflet: hide 'Insert Table' for spreadsheets, get it right finally
(cherry picked from commit d173a21b282ac306cec4027a65c855162b494171)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 5e393be..9e6320f 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -533,9 +533,11 @@ map.on('updatepermission', function (e) {
else if (docType === 'drawing') {
toolbar.hide('annotation');
}
+ else if (docType === 'spreadsheet') {
+ toolbar.hide('inserttable');
+ }
else if (docType !== 'spreadsheet') {
toolbar.hide('annotation');
- toolbar.hide('inserttable');
}
}
});
commit 61003c0d70dac4c5d177550bcf6bce36b5ece33d
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 11:51:59 2016 +0200
loleaflet: hide 'Insert Table' for spreadsheets, disable 'Insert Table' in view mode
(cherry picked from commit c3b55e40faff4b3488d7710d888513d684f9cf15)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 5874651..5e393be 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -152,7 +152,7 @@ $(function () {
});
var formatButtons = ['undo', 'redo', 'save',
- 'bold', 'italic', 'underline', 'strikeout', 'annotation', 'inserttable-html',
+ 'bold', 'italic', 'underline', 'strikeout', 'annotation', 'inserttable',
'fontcolor', 'backcolor', 'bullet', 'numbering', 'alignleft', 'alignhorizontal', 'alignright', 'alignblock',
'incrementindent', 'decrementindent', 'insertgraphic'];
@@ -535,7 +535,7 @@ map.on('updatepermission', function (e) {
}
else if (docType !== 'spreadsheet') {
toolbar.hide('annotation');
- toolbar.hide('inserttable-html');
+ toolbar.hide('inserttable');
}
}
});
commit 9989bdc16e7803c0967df8f8a31cf0ecdc257c68
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 11:30:14 2016 +0200
loleaflet: hide 'Insert Table' for spreadsheets, disable 'Insert Table' in view mode
(cherry picked from commit cb24e246ccdad6f8120a9efe0dae1c36779c1352)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 9791b71..5874651 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -152,7 +152,7 @@ $(function () {
});
var formatButtons = ['undo', 'redo', 'save',
- 'bold', 'italic', 'underline', 'strikeout', 'annotation',
+ 'bold', 'italic', 'underline', 'strikeout', 'annotation', 'inserttable-html',
'fontcolor', 'backcolor', 'bullet', 'numbering', 'alignleft', 'alignhorizontal', 'alignright', 'alignblock',
'incrementindent', 'decrementindent', 'insertgraphic'];
@@ -535,6 +535,7 @@ map.on('updatepermission', function (e) {
}
else if (docType !== 'spreadsheet') {
toolbar.hide('annotation');
+ toolbar.hide('inserttable-html');
}
}
});
commit 631620fbba641abaddeaee9506a96b630115f65f
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 11:27:15 2016 +0200
loleaflet: Enable l10n for 'take edit' note
(cherry picked from commit 7126135146a32b94a62f53685d250ad45375e53d)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index e80622f..9791b71 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -156,7 +156,7 @@ var formatButtons = ['undo', 'redo', 'save',
'fontcolor', 'backcolor', 'bullet', 'numbering', 'alignleft', 'alignhorizontal', 'alignright', 'alignblock',
'incrementindent', 'decrementindent', 'insertgraphic'];
-var takeEditPopupMessage = '<div>You are viewing now.<br/>Click here to take edit</div>';
+var takeEditPopupMessage = '<div>' + _("You are viewing now.") + '<br/>' + _("Click here to take edit.") + '</div>';
var takeEditPopupTimeout = null;
function onSearch(e) {
commit eef90f9aa2b727591f9f4a46abe93a129a12fdd0
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 11:09:33 2016 +0200
loleaflet: Set font for table picker
(cherry picked from commit c091cd20eb2241e0412f54111ac820d2b4204963)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index fd7d6b8..e80622f 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -46,7 +46,7 @@ $(function () {
{ type: 'break', id: 'incdecindent' },
{ type: 'button', id: 'annotation', img: 'annotation', hint: _("Insert Comment"), uno: 'InsertAnnotation' },
{ type: 'button', id: 'insertgraphic', img: 'insertgraphic', hint: _("Insert Graphic") },
- { type: 'html', id: 'inserttable-html', html: '<div id="tablePicker" class="evo-pop" style="position:absolute !important;display:none"><div id="tpstatus"></div><table id="insert-table"></table></div>' },
+ { type: 'html', id: 'inserttable-html', html: '<div id="tablePicker" class="evo-pop loleaflet-font" style="position:absolute !important;display:none"><div id="tpstatus"></div><table id="insert-table"></table></div>' },
{ type: 'button', id: 'inserttable', img: 'inserttable', hint: _("Insert Table") },
{ type: 'break' },
{ type: 'button', id: 'help', img: 'help', hint: _("Help") },
@@ -1042,7 +1042,7 @@ function walkCells() {
var cellIndex = this.cellIndex + 1;
var rowIndex = this.parentNode.rowIndex + 1;
var div = document.getElementById('tpstatus');
- div.innerHTML = cellIndex + " x " + rowIndex;
+ div.innerHTML = cellIndex + " × " + rowIndex;
for (var j = 0; j < cells.length; j++) {
var celly = cells[j];
if (celly.parentNode.rowIndex < rowIndex & celly.cellIndex < cellIndex) {
commit 28bddf9e6c4f4df74c2bf23b5a6cefd831627a71
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 10:58:55 2016 +0200
loleaflet: Set font for zoom percentage
(cherry picked from commit 491a41933d71df437628d733e7fd2a97eac1de66)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index aae6ce1..fd7d6b8 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -137,7 +137,7 @@ $(function () {
{ type: 'break', id: 'prevnextbreak' },
{ type: 'button', id: 'zoomreset', img: 'zoomreset', hint: _("Reset zoom") },
{ type: 'button', id: 'zoomout', img: 'zoomout', hint: _("Zoom out") },
- { type: 'html', id: 'zoomlevel', html: '<div id="zoomlevel">100%</div>'},
+ { type: 'html', id: 'zoomlevel', html: '<div id="zoomlevel" class="loleaflet-font">100%</div>'},
{ type: 'button', id: 'zoomin', img: 'zoomin', hint: _("Zoom in") }
],
onClick: function (e) {
commit ca8b6fb45322a4545981390b56e257b9284fc6af
Author: Pranav Kant <pranavk at collabora.com>
Date: Mon May 23 14:24:00 2016 +0530
loleaflet: Fix lint errors
Change-Id: Ib4447ebecf8e95cb1ac9432fcf8ca2f8b0859550
(cherry picked from commit a2f9e2c255a0960d0e3bab5cdd83daecbda7f146)
diff --git a/loleaflet/src/control/Control.ColumnHeader.js b/loleaflet/src/control/Control.ColumnHeader.js
index c928e93..ba5caca 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -2,7 +2,7 @@
* Control.ColumnHeader
*/
-/* global */
+/* global $ _ */
L.Control.ColumnHeader = L.Control.extend({
onAdd: function (map) {
map.on('updatepermission', this._onUpdatePermission, this);
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index f0cfc52..50781da 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -2,7 +2,7 @@
* Control.ContextMenu
*/
-/* global */
+/* global $ map _ */
L.Control.ContextMenu = L.Control.extend({
options: {
SEPARATOR: '---------',
@@ -62,9 +62,9 @@ L.Control.ContextMenu = L.Control.extend({
selector: '.leaflet-layer',
className: 'loleaflet-font',
trigger: 'none',
- build: function(triggerEle, e) {
+ build: function() {
return {
- callback: function(key, options) {
+ callback: function(key) {
map.sendUnoCommand(key);
},
items: contextMenu
@@ -80,63 +80,60 @@ L.Control.ContextMenu = L.Control.extend({
var contextMenu = {};
var sepIdx = 1, itemName;
var isLastItemText = false;
- for (var idx in obj['menu']) {
- var item = obj['menu'][idx];
- if (item['enabled'] === 'false') {
+ for (var idx in obj.menu) {
+ var item = obj.menu[idx];
+ if (item.enabled === 'false') {
continue;
}
- if (item['type'] === 'separator') {
+ if (item.type === 'separator') {
if (isLastItemText) {
contextMenu['sep' + sepIdx++] = this.options.SEPARATOR;
}
isLastItemText = false;
}
- else {
- if (item['type'] === 'command') {
- // Only show whitelisted items
- // Command name (excluding '.uno:') starts from index = 5
- var commandName = item['command'].substring(5);
- if (this.options.whitelist.general.indexOf(commandName) === -1 &&
- !(docType === 'text' && this.options.whitelist.text.indexOf(commandName) !== -1) &&
- !(docType === 'spreadsheet' && this.options.whitelist.spreadsheet.indexOf(commandName) !== -1) &&
- !(docType === 'presentation' && this.options.whitelist.presentation.indexOf(commandName) !== -1) &&
- !(docType === 'drawing' && this.options.whitelist.drawing.indexOf(commandName) !== -1)) {
- continue;
- }
+ else if (item.type === 'command') {
+ // Only show whitelisted items
+ // Command name (excluding '.uno:') starts from index = 5
+ var commandName = item.command.substring(5);
+ if (this.options.whitelist.general.indexOf(commandName) === -1 &&
+ !(docType === 'text' && this.options.whitelist.text.indexOf(commandName) !== -1) &&
+ !(docType === 'spreadsheet' && this.options.whitelist.spreadsheet.indexOf(commandName) !== -1) &&
+ !(docType === 'presentation' && this.options.whitelist.presentation.indexOf(commandName) !== -1) &&
+ !(docType === 'drawing' && this.options.whitelist.drawing.indexOf(commandName) !== -1)) {
+ continue;
+ }
- itemName = item['text'].replace('~', '');
- contextMenu[item['command']] = {
- name: _(itemName)
- };
-
- if (item['checktype'] === 'checkmark') {
- if (item['checked'] === 'true') {
- contextMenu[item['command']]['icon'] = 'checkmark';
- }
- } else if (item['checktype'] === 'radio') {
- if (item['checked'] === 'true') {
- contextMenu[item['command']]['icon'] = 'radio';
- }
- }
+ itemName = item.text.replace('~', '');
+ contextMenu[item.command] = {
+ name: _(itemName)
+ };
- isLastItemText = true;
- } else if (item['type'] === 'menu') {
- itemName = item['text'].replace('~', '');
- var submenu = this._createContextMenuStructure(item);
- // ignore submenus with all items disabled
- if (Object.keys(submenu).length === 0) {
- continue;
+ if (item.checktype === 'checkmark') {
+ if (item.checked === 'true') {
+ contextMenu[item.command.icon] = 'checkmark';
+ }
+ } else if (item.checktype === 'radio') {
+ if (item.checked === 'true') {
+ contextMenu[item.command.icon] = 'radio';
}
+ }
- contextMenu[item['command']] = {
- name: itemName,
- items: submenu
- };
- isLastItemText = true;
+ isLastItemText = true;
+ } else if (item.type === 'menu') {
+ itemName = item.text.replace('~', '');
+ var submenu = this._createContextMenuStructure(item);
+ // ignore submenus with all items disabled
+ if (Object.keys(submenu).length === 0) {
+ continue;
}
- }
+ contextMenu[item.command] = {
+ name: itemName,
+ items: submenu
+ };
+ isLastItemText = true;
+ }
}
// Remove separator, if present, at the end
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 09ad026..2e6da81 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -2,8 +2,8 @@
* Control.Menubar
*/
-/* global $ _ map */
-L.Control.menubar = L.Control.extend({
+/* global $ _ map title vex */
+L.Control.Menubar = L.Control.extend({
options: {
text: [
{name: 'File', type: 'menu', menu: [{name: 'Save', type: 'unocommand', uno: '.uno:Save'},
@@ -157,8 +157,9 @@ L.Control.menubar = L.Control.extend({
},
_onUpdatePermission: function() {
- if (this._initialized || !this._menubarCont)
+ if (this._initialized || !this._menubarCont) {
return;
+ }
// Add dcoument specific menu
var docType = this._map.getDocType();
@@ -255,16 +256,14 @@ L.Control.menubar = L.Control.extend({
} else if (document.documentElement.webkitRequestFullscreen) {
document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
}
- } else {
- if (document.exitFullscreen) {
- document.exitFullscreen();
- } else if (document.msExitFullscreen) {
- document.msExitFullscreen();
- } else if (document.mozCancelFullScreen) {
- document.mozCancelFullScreen();
- } else if (document.webkitExitFullscreen) {
- document.webkitExitFullscreen();
- }
+ } else if (document.exitFullscreen) {
+ document.exitFullscreen();
+ } else if (document.msExitFullscreen) {
+ document.msExitFullscreen();
+ } else if (document.mozCancelFullScreen) {
+ document.mozCancelFullScreen();
+ } else if (document.webkitExitFullscreen) {
+ document.webkitExitFullscreen();
}
} else if (id === 'fullscreen-presentation' && map.getDocType() === 'presentation') {
map.fire('fullscreen');
@@ -274,7 +273,7 @@ L.Control.menubar = L.Control.extend({
map.duplicatePage();
} else if (id === 'deletepage') {
vex.dialog.confirm({
- message: _("Are you sure you want to delete this slide?"),
+ message: _('Are you sure you want to delete this slide?'),
callback: this._onDeleteSlide
}, this);
}
@@ -303,22 +302,22 @@ L.Control.menubar = L.Control.extend({
for (var i in menu) {
var liItem = L.DomUtil.create('li', '');
var aItem = L.DomUtil.create('a', '', liItem);
- aItem.innerHTML = menu[i]['name'];
+ aItem.innerHTML = menu[i].name;
- if (menu[i]['type'] === 'menu') {
+ if (menu[i].type === 'menu') {
var ulItem = L.DomUtil.create('ul', '', liItem);
- var subitemList = this._createMenu(menu[i]['menu']);
+ var subitemList = this._createMenu(menu[i].menu);
for (var j in subitemList) {
ulItem.appendChild(subitemList[j]);
}
- } else if (menu[i]['type'] === 'unocommand') {
+ } else if (menu[i].type === 'unocommand') {
$(aItem).data('type', 'unocommand');
- $(aItem).data('uno', menu[i]['uno']);
- } else if (menu[i]['type'] === 'separator') {
+ $(aItem).data('uno', menu[i].uno);
+ } else if (menu[i].type === 'separator') {
$(aItem).addClass('separator');
- } else if (menu[i]['type'] === 'action') {
+ } else if (menu[i].type === 'action') {
$(aItem).data('type', 'action');
- $(aItem).data('id', menu[i]['id']);
+ $(aItem).data('id', menu[i].id);
}
itemList.push(liItem);
@@ -336,5 +335,5 @@ L.Control.menubar = L.Control.extend({
});
L.control.menubar = function (options) {
- return new L.Control.menubar(options);
+ return new L.Control.Menubar(options);
};
diff --git a/loleaflet/src/control/Control.PartsPreview.js b/loleaflet/src/control/Control.PartsPreview.js
index ad9d6b5..092bf6e 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -2,7 +2,7 @@
* L.Control.PartsPreview
*/
-/* global $ */
+/* global $ map */
L.Control.PartsPreview = L.Control.extend({
options: {
autoUpdate: true
@@ -78,8 +78,9 @@ L.Control.PartsPreview = L.Control.extend({
},
_setPart: function (e) {
- if (!map._editlock)
+ if (!map._editlock) {
return;
+ }
var part = $('.parts-preview .mCSB_container .preview-frame').index(e.target.parentNode);
if (part !== null) {
this._map.setPart(parseInt(part));
diff --git a/loleaflet/src/control/Control.RowHeader.js b/loleaflet/src/control/Control.RowHeader.js
index 2285839..091612d 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -2,7 +2,7 @@
* L.Control.RowHeader
*/
-/* global */
+/* global $ _ */
L.Control.RowHeader = L.Control.extend({
onAdd: function (map) {
map.on('updatepermission', this._onUpdatePermission, this);
diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js
index 8cd3be8..863dc4d 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -2,7 +2,7 @@
* L.Control.Tabs is used to switch sheets in Calc
*/
-/* global $ vex _ */
+/* global $ vex _ map */
L.Control.Tabs = L.Control.extend({
onAdd: function(map) {
map.on('updatepermission', this._onUpdatePermission, this);
@@ -135,8 +135,9 @@ L.Control.Tabs = L.Control.extend({
},
_setPart: function (e) {
- if (!map._editlock)
+ if (!map._editlock) {
return;
+ }
var part = e.target.id.match(/\d+/g)[0];
if (part !== null) {
this._map.setPart(parseInt(part));
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index dfa4222..8cbe56c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -288,10 +288,11 @@ L.TileLayer = L.GridLayer.extend({
}
else if (textMsg.startsWith('invalidatetiles:') && textMsg.match('EMPTY')) {
var msg = 'invalidatetiles: ';
- if (this._docType == 'text')
+ if (this._docType === 'text') {
msg += 'part=0 ';
- else
+ } else {
msg += 'part=' + this._selectedPart + ' ';
+ }
msg += 'x=0 y=0 ';
msg += 'width=' + this._docWidthTwips + ' ';
msg += 'height=' + this._docHeightTwips;
@@ -465,9 +466,11 @@ L.TileLayer = L.GridLayer.extend({
this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
}
- var horizontalDirection = 0,
- verticalDirection = 0;
- var sign = function(x) {return x>0?1:x<0?-1:x;}
+ var horizontalDirection = 0;
+ var verticalDirection = 0;
+ var sign = function(x) {
+ return x > 0 ? 1 : x < 0 ? -1 : x;
+ };
if (!this._isEmptyRectangle(this._prevCellCursor) && !this._isEmptyRectangle(this._cellCursor)) {
horizontalDirection = sign(this._cellCursor.getWest() - this._prevCellCursor.getWest());
verticalDirection = sign(this._cellCursor.getNorth() - this._prevCellCursor.getNorth());
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1c0bcd9..0b4ee8b 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -733,7 +733,7 @@ L.Map = L.Evented.extend({
map._active = false;
clearTimeout(vex.timer);
- options = $.extend({}, vex.defaultOptions, {contentCSS: {'background':'rgba(0, 0, 0, 0)'}});
+ var options = $.extend({}, vex.defaultOptions, {contentCSS: {'background':'rgba(0, 0, 0, 0)'}});
options.id = vex.globalID;
vex.dialogID = options.id;
vex.globalID += 1;
@@ -746,7 +746,7 @@ L.Map = L.Evented.extend({
options.$vexOverlay.bind('click.vex', function(e) {
if (e.target !== this) {
- return;
+ return 0;
}
return map._activate();
});
commit 52fb0b03b9af2fa26f25b7fb129a7f897423757f
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 23 10:42:10 2016 +0200
loleaflet: Set font for Search label and enable l10n
(cherry picked from commit 624823f721ebcfad3b01811585eb9cfd6022b685)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 84f7af5..aae6ce1 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -116,8 +116,8 @@ $(function () {
name: 'toolbar-down',
items: [
{ type: 'html', id: 'search',
- html: '<div style="padding: 3px 10px;">'+
- ' Search:'+
+ html: '<div style="padding: 3px 10px;" class="loleaflet-font">'+
+ ' ' + _("Search:") +
' <input size="10" id="search-input" onkeypress="onSearch(event)"' +
'style="padding: 3px; border-radius: 2px; border: 1px solid silver"/>'+
'</div>'
commit 973a3cc0540f386f8ec1a68b36ab15af0193135b
Author: Pranav Kant <pranavk at collabora.com>
Date: Mon May 23 10:59:34 2016 +0530
loleaflet: Disable menubar items for view only mode
Change-Id: Ic1a3c876df343598cf0b53f033ea9e35053e6a06
(cherry picked from commit 6104e3e4bf5fd0b98e4c71e62c074cad84d5f37b)
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 33e47d6..09ad026 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -130,7 +130,12 @@ L.Control.menubar = L.Control.extend({
}
],
- commandStates: {}
+ commandStates: {},
+
+ allowedViewModeActions: ['downloadas-pdf', 'downloadas-odt', 'downloadas-doc', 'downloadas-docx',
+ 'downloadas-odp', 'downloadas-ppt', 'downloadas-pptx',
+ 'downloadas-ods', 'downloadas-xls', 'downloadas-xlsx',
+ 'fullscreen', 'zoomin', 'zoomout', 'zoomreset']
},
onAdd: function (map) {
@@ -189,6 +194,24 @@ L.Control.menubar = L.Control.extend({
$(items).each(function() {
var aItem = this;
var type = $(aItem).data('type');
+ var id = $(aItem).data('id');
+ if (!map._editlock) {
+ var found = false;
+ for (var i in self.options.allowedViewModeActions) {
+ if (self.options.allowedViewModeActions[i] === id) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ $(aItem).addClass('disabled');
+ } else {
+ $(aItem).removeClass('disabled');
+ }
+
+ return;
+ }
+
if (type === 'unocommand') {
var unoCommand = $(aItem).data('uno');
if (self.options.commandStates[unoCommand] === 'disabled') {
commit c3216ec31f383f2fea6dc3d407482a823296d227
Author: Pranav Kant <pranavk at collabora.com>
Date: Mon May 23 10:51:49 2016 +0530
beforeFirstShow -> beforeShow
Change-Id: I8bdcc91220873c40d4161ade9a853233227476ab
(cherry picked from commit 1e806b0a46202769a60cdb802143f80bc78f72de)
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 9effb33..33e47d6 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -180,10 +180,10 @@ L.Control.menubar = L.Control.extend({
this._initialized = true;
$('#main-menu').bind('select.smapi', {self: this}, this._onItemSelected);
- $('#main-menu').bind('beforeshow.smapi', {self: this}, this._beforeFirstShow);
+ $('#main-menu').bind('beforeshow.smapi', {self: this}, this._beforeShow);
},
- _beforeFirstShow: function(e, menu) {
+ _beforeShow: function(e, menu) {
var self = e.data.self;
var items = $(menu).children().children('a').not('.has-submenu');
$(items).each(function() {
commit 41fa3006c06d2f76f701520ee42000f219a261ce
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 20 18:19:16 2016 +0530
loleaflet: Use same font-family wherever possible
"Segoe UI", Tahoma, Arial, Helvetica, sans-serif; 12px
Change-Id: I8927c31ca4641eaa3181e4f76bac2e112893fcd8
(cherry picked from commit ffd230e1f95343c6d39bf17354ade3762df8fad5)
diff --git a/loleaflet/dist/contextMenu/jquery.contextMenu.css b/loleaflet/dist/contextMenu/jquery.contextMenu.css
index 5b1bc7e..b74941f 100644
--- a/loleaflet/dist/contextMenu/jquery.contextMenu.css
+++ b/loleaflet/dist/contextMenu/jquery.contextMenu.css
@@ -103,8 +103,8 @@
.context-menu-item {
position: relative;
- padding: 3px 28px;
- color: #2f2f2f;
+ padding: 5px 28px;
+ color: #000;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index a7c7597..15d7f9e 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -29,3 +29,9 @@
body {
margin: 0;
}
+
+.loleaflet-font {
+ font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif !important;
+ font-size: 12px !important;
+ font-weight: normal !important;
+}
\ No newline at end of file
diff --git a/loleaflet/dist/smartmenus/sm-simple.css b/loleaflet/dist/smartmenus/sm-simple.css
index 1f080df..ac38a70 100644
--- a/loleaflet/dist/smartmenus/sm-simple.css
+++ b/loleaflet/dist/smartmenus/sm-simple.css
@@ -6,7 +6,7 @@
/* make room for the toggle button (sub indicator) */
padding-right: 58px;
color: #555555;
- font-family: "Lucida Sans Unicode", "Lucida Sans", "Lucida Grande", Arial, sans-serif;
+ font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
font-size: 12px;
font-weight: normal;
line-height: 15px;
@@ -46,7 +46,7 @@
background: #fff;
}
.sm-simple ul a, .sm-simple ul a:hover, .sm-simple ul a:focus, .sm-simple ul a:active {
- font-size: 14px;
+ font-size: 12px;
border-left: 8px solid transparent;
}
.sm-simple ul ul a,
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 8e1c0f3..7537600 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -38,7 +38,7 @@
padding-top: 3px;
padding-bottom: 3px;
- font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+ font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
display: inline-block;
border: 1px solid darkgrey;
background-color: lightgrey;
@@ -99,7 +99,7 @@
.spreadsheet-header-column {
border-right: 1px solid darkgrey;
- font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+ font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
display: inline-block;
text-align: center;
@@ -146,7 +146,7 @@
.spreadsheet-header-row {
border-bottom: 1px solid darkgrey;
- font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+ font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
text-overflow: ellipsis;
text-align: center;
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 022d383..51d38dc 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -166,10 +166,15 @@ button.leaflet-control-search-next
/* select box */
.select2-results__option {
padding: 5px;
- font-size: 14px;
+ font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
+ font-size: 12px;
overflow: hidden;
text-overflow: ellipsis;
}
+.select2-selection__rendered {
+ font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
.styles-select {
width: 180px;
}
@@ -272,4 +277,4 @@ button.leaflet-control-search-next
#tablePicker div {
text-align:left;
-}
\ No newline at end of file
+}
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 1ca5a02..84f7af5 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -127,10 +127,10 @@ $(function () {
{ type: 'button', id: 'cancelsearch', img: 'cancel', hint: _("Cancel the search"), hidden: true },
{ type: 'html', id: 'left' },
{ type: 'html', id: 'right' },
- { type: 'html', id: 'modifiedstatuslabel', html: '<div id="modifiedstatuslabel"></div>' },
+ { type: 'html', id: 'modifiedstatuslabel', html: '<div id="modifiedstatuslabel" class="loleaflet-font"></div>' },
{ type: 'break' },
{ type: 'button', id: 'takeedit', img: 'edit', hint: _("Take edit lock (others can only view)")},
- { type: 'html', id: 'takeeditlabel', html: '<div id="takeeditlabel">VIEWING</div>' },
+ { type: 'html', id: 'takeeditlabel', html: '<div id="takeeditlabel" class="loleaflet-font">VIEWING</div>' },
{ type: 'break' },
{ type: 'button', id: 'prev', img: 'prev', hint: _("Previous page") },
{ type: 'button', id: 'next', img: 'next', hint: _("Next page") },
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 3b83992..f0cfc52 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -60,6 +60,7 @@ L.Control.ContextMenu = L.Control.extend({
var contextMenu = this._createContextMenuStructure(obj);
$.contextMenu({
selector: '.leaflet-layer',
+ className: 'loleaflet-font',
trigger: 'none',
build: function(triggerEle, e) {
return {
commit a460a3fc4c4fdedc1b7e916c22abe001499b18d0
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 20 14:21:13 2016 +0530
loleaflet: More consistent styling to match LO desktop
Selection background color is now consistent across context menu
and menubars.
Don't change the cursor to 'pointer' in context menus on hover.
Change-Id: I25d1fcba113f2c27a8ab6d028244afd75c28cd59
(cherry picked from commit 3d266a4d6077df0036ce3f9e462a57eefe897164)
diff --git a/loleaflet/dist/contextMenu/jquery.contextMenu.css b/loleaflet/dist/contextMenu/jquery.contextMenu.css
index f8de521..5b1bc7e 100644
--- a/loleaflet/dist/contextMenu/jquery.contextMenu.css
+++ b/loleaflet/dist/contextMenu/jquery.contextMenu.css
@@ -128,8 +128,8 @@
.context-menu-item.context-menu-hover {
color: #fff;
- cursor: pointer;
- background-color: #2980b9;
+ cursor: default;
+ background-color: #538ecd;
}
.context-menu-item.context-menu-disabled {
diff --git a/loleaflet/dist/smartmenus/sm-simple.css b/loleaflet/dist/smartmenus/sm-simple.css
index 624d06e..1f080df 100644
--- a/loleaflet/dist/smartmenus/sm-simple.css
+++ b/loleaflet/dist/smartmenus/sm-simple.css
@@ -138,13 +138,15 @@ collapsible to desktop (navbar + dropdowns)
}
.sm-simple a, .sm-simple a:hover, .sm-simple a:focus, .sm-simple a:active, .sm-simple a.highlighted {
padding: 5px 15px;
- color: #555;
+ color: #000;
}
.sm-simple a:hover, .sm-simple a:focus, .sm-simple a:active, .sm-simple a.highlighted {
- background: #eee;
+ background: #538ecd;
+ color: #fff;
}
.sm-simple > li > a:hover, .sm-simple > li > a:focus, .sm-simple > li > a:active, .sm-simple > li > a.highlighted {
background: #fff;
+ color: #000;
border-color: #bbbbbb;
border-bottom: 1px solid #bbb;
}
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index e907e16..9effb33 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -171,6 +171,8 @@ L.Control.menubar = L.Control.extend({
showOnClick: true,
hideTimeout: 0,
hideDuration: 0,
+ showDuration: 0,
+ showTimeout: 0,
collapsibleHideDuration: 0,
subIndicatorsPos: 'append',
subIndicatorsText: '›'
commit 3d6e86d1579ab29ba2d971eed62679d988f7dcb1
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 20 15:45:48 2016 +0530
loleaflet: Fix errors in new draggable table grid toolbar button
Change-Id: Ic5c1ecbe0753017ad4b4c57ef74ae28d724c00a4
(cherry picked from commit 461d88e38d1cd402a5d672ab28ab04ca66aef377)
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 71ec95b..1ca5a02 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1067,22 +1067,23 @@ function walkCells() {
walkCells();
} else if (table.rows[0].cells.length>3 && cellIndex < table.rows[0].cells.length-1 ) {
for (var j = 0; j < table.rows.length; j++) {
- var tr = table.rows[j]
+ var tr = table.rows[j];
tr.deleteCell(table.rows[0].cells.length-1);
}
walkCells();
}
- }
+ };
+
cell.onclick = function(){
var cellIndex = this.cellIndex + 1;
var rowIndex = this.parentNode.rowIndex + 1;
var msg = 'uno .uno:InsertTable {' +
- ' "Columns": { "type": "long","value": '
- cellIndex +
- ' }, "Rows": { "type": "long","value": '
- rowIndex +' }}';
+ ' "Columns": { "type": "long","value": ' +
+ cellIndex +
+ ' }, "Rows": { "type": "long","value": ' +
+ rowIndex +' }}';
map._socket.sendMessage(msg);
L.DomUtil.get('tablePicker').style.display = 'none';
- }
+ };
}
-}
\ No newline at end of file
+}
commit 6595e3b483c6c67d920160ed01865ac069469933
Author: Faruk Uzun <farukuzun at collabora.com>
Date: Sun May 1 15:07:49 2016 +0300
loleaflet: add draggable table grid button to toolbar
You can insert tables to text documents and
it is working same as the desktop version.
Change-Id: I5d516e31c8b7453ca7f8306df3b9c17764e94098
(cherry picked from commit 5846748e2a7a376302fec11eb9058f1f64b99977)
diff --git a/loleaflet/dist/images/lc_inserttable.png b/loleaflet/dist/images/lc_inserttable.png
new file mode 100644
index 0000000..7f65679
Binary files /dev/null and b/loleaflet/dist/images/lc_inserttable.png differ
diff --git a/loleaflet/dist/images/sc_inserttable.png b/loleaflet/dist/images/sc_inserttable.png
new file mode 100644
index 0000000..015ebb4
Binary files /dev/null and b/loleaflet/dist/images/sc_inserttable.png differ
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 4be8d61..022d383 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -222,6 +222,7 @@ button.leaflet-control-search-next
.w2ui-icon.insertpage{ background: url('/loleaflet/dist/images/lc_insertpage.png') no-repeat center !important; }
.w2ui-icon.italic{ background: url('/loleaflet/dist/images/lc_italic.png') no-repeat center !important; }
.w2ui-icon.insertgraphic{ background: url('/loleaflet/dist/images/lc_gallery.png') no-repeat center !important; }
+.w2ui-icon.inserttable{ background: url('/loleaflet/dist/images/lc_inserttable.png') no-repeat center !important; }
.w2ui-icon.next{ background: url('/loleaflet/dist/images/lc_downsearch.png') no-repeat center !important; }
.w2ui-icon.numbering{ background: url('/loleaflet/dist/images/lc_defaultnumbering.png') no-repeat center !important; }
.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/lc_dia.png') no-repeat center !important; }
@@ -253,3 +254,22 @@ button.leaflet-control-search-next
right:-10px;
cursor:pointer;
}
+
+
+#tablePicker table {
+ border: 1px solid #808080;
+}
+
+#tablePicker td {
+ border: 1px solid #808080 !important;
+ width: 15px;
+ height: 15px;
+}
+
+#tablePicker td:hover {
+ background: #87CEFA;
+}
+
+#tablePicker div {
+ text-align:left;
+}
\ No newline at end of file
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 16618e4..71ec95b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -46,6 +46,8 @@ $(function () {
{ type: 'break', id: 'incdecindent' },
{ type: 'button', id: 'annotation', img: 'annotation', hint: _("Insert Comment"), uno: 'InsertAnnotation' },
{ type: 'button', id: 'insertgraphic', img: 'insertgraphic', hint: _("Insert Graphic") },
+ { type: 'html', id: 'inserttable-html', html: '<div id="tablePicker" class="evo-pop" style="position:absolute !important;display:none"><div id="tpstatus"></div><table id="insert-table"></table></div>' },
+ { type: 'button', id: 'inserttable', img: 'inserttable', hint: _("Insert Table") },
{ type: 'break' },
{ type: 'button', id: 'help', img: 'help', hint: _("Help") },
{ type: 'html', id: 'right' },
@@ -288,6 +290,14 @@ function onClick(id) {
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
+ else if (id === 'inserttable') {
+ // toggles tablePicker
+ if (L.DomUtil.get('tablePicker').style.display == 'none') {
+ L.DomUtil.get('tablePicker').style.display = '';
+ } else {
+ L.DomUtil.get('tablePicker').style.display = 'none';
+ }
+ }
else if (id === 'fontcolor') {
// absolutely no idea why, but without the timeout, the popup is
// closed as soon as it is opend
@@ -1007,3 +1017,72 @@ function resizeToolbar() {
toolbar.uncheck('more');
}
}
+
+// tablePicker - init
+$(function() {
+ $( "#tablePicker" ).draggable();
+ tbl = document.getElementById('insert-table');
+ for (var i = 0; i < 3; i++) {
+ var tr = tbl.insertRow();
+ for (var j = 0; j < 3; j++) {
+ var td = tr.insertCell();
+ }
+ }
+ walkCells();
+});
+
+// tablePicker - GUI
+function walkCells() {
+ var table = document.getElementById('insert-table');
+ var cells = table.getElementsByTagName("td");
+
+ for (var i = 0; i < cells.length; i++) {
+ var cell = cells[i];
+ cell.onmouseover = function() {
+ var cellIndex = this.cellIndex + 1;
+ var rowIndex = this.parentNode.rowIndex + 1;
+ var div = document.getElementById('tpstatus');
+ div.innerHTML = cellIndex + " x " + rowIndex;
+ for (var j = 0; j < cells.length; j++) {
+ var celly = cells[j];
+ if (celly.parentNode.rowIndex < rowIndex & celly.cellIndex < cellIndex) {
+ celly.style.background = '#87CEFA';
+ } else {
+ celly.style.background = '';
+ }
+ }
+ if (cellIndex == table.rows[0].cells.length) {
+ for (var k = 0; k < table.rows.length; k++) {
+ table.rows[k].insertCell();
+ walkCells();
+ }
+ } else if (rowIndex == table.rows.length) {
+ var tr = table.insertRow();
+ for (var j = 0; j < table.rows[0].cells.length; j++) {
+ var td = tr.insertCell();
+ }
+ walkCells();
+ } else if ((table.rows.length>3 && rowIndex < table.rows.length-1)) {
+ table.deleteRow(table.rows.length-1);
+ walkCells();
+ } else if (table.rows[0].cells.length>3 && cellIndex < table.rows[0].cells.length-1 ) {
+ for (var j = 0; j < table.rows.length; j++) {
+ var tr = table.rows[j]
+ tr.deleteCell(table.rows[0].cells.length-1);
+ }
+ walkCells();
+ }
+ }
+ cell.onclick = function(){
+ var cellIndex = this.cellIndex + 1;
+ var rowIndex = this.parentNode.rowIndex + 1;
+ var msg = 'uno .uno:InsertTable {' +
+ ' "Columns": { "type": "long","value": '
+ cellIndex +
+ ' }, "Rows": { "type": "long","value": '
+ rowIndex +' }}';
+ map._socket.sendMessage(msg);
+ L.DomUtil.get('tablePicker').style.display = 'none';
+ }
+ }
+}
\ No newline at end of file
commit 061e1b99c9c0c3fef4aa91373e426f7a6bce33e5
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 20 13:43:01 2016 +0530
loleaflet: menubar: Decrease separator height
Change-Id: I3c96bbc227ba911861e5d13902ad4f8dbb414549
(cherry picked from commit acfb9922d5bafd479fe3e1449493aa25dfc74ebe)
diff --git a/loleaflet/dist/smartmenus/sm-simple.css b/loleaflet/dist/smartmenus/sm-simple.css
index 2d3de53..624d06e 100644
--- a/loleaflet/dist/smartmenus/sm-simple.css
+++ b/loleaflet/dist/smartmenus/sm-simple.css
@@ -211,7 +211,7 @@ collapsible to desktop (navbar + dropdowns)
}
.sm-simple a.separator {
height: 1px;
- margin: 9px 0;
+ margin: 4px 0;
overflow: hidden;
padding-top: 0;
padding-bottom: 0;
commit ff854b3d5a36ae442528d8567828dcd529018207
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 20 13:38:57 2016 +0530
loleaflet: Change 'Table' menubar structure to match LO
... useful for translation.
Change-Id: If3116351ea5b29c2cae866a7ac417c074ac35043
(cherry picked from commit 8717b0417ebdbff478da5ee0f7b10f234ed92639)
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 96f3d25..e907e16 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -31,16 +31,18 @@ L.Control.menubar = L.Control.extend({
{name: 'Zoom out', id: 'zoomout', type: 'action'},
{name: 'Zoom reset', id: 'zoomreset', type: 'action'}]
},
- {name: 'Tables', type: 'menu', menu: [{name: 'Insert row before', type: 'unocommand', uno: '.uno:InsertRowsBefore'},
- {name: 'Insert row after', type: 'unocommand', uno: '.uno:InsertRowsAfter'},
- {type: 'separator'},
- {name: 'Insert column before', type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
- {name: 'Insert column after', type: 'unocommand', uno: '.uno:InsertColumnsAfter'},
- {type: 'separator'},
- {name: 'Delete row', type: 'unocommand', uno: '.uno:DeleteRows'},
- {name: 'Delete column', type: 'unocommand', uno: '.uno:DeleteColumns'},
- {name: 'Delete table', type: 'unocommand', uno: '.uno:DeleteTable'},
- {type: 'separator'},
+ {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'}]
}
],
@@ -70,16 +72,18 @@ L.Control.menubar = L.Control.extend({
{name: 'Zoom out', id: 'zoomout', type: 'action'},
{name: 'Zoom reset', id: 'zoomreset', type: 'action'}]
},
- {name: 'Tables', type: 'menu', menu: [{name: 'Insert row before', type: 'unocommand', uno: '.uno:InsertRowsBefore'},
- {name: 'Insert row after', type: 'unocommand', uno: '.uno:InsertRowsAfter'},
- {type: 'separator'},
- {name: 'Insert column before', type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
- {name: 'Insert column after', type: 'unocommand', uno: '.uno:InsertColumnsAfter'},
- {type: 'separator'},
- {name: 'Delete row', type: 'unocommand', uno: '.uno:DeleteRows'},
- {name: 'Delete column', type: 'unocommand', uno: '.uno:DeleteColumns'},
- {name: 'Delete table', type: 'unocommand', uno: '.uno:DeleteTable'},
- {type: 'separator'},
+ {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: 'Slide', type: 'menu', menu: [{name: 'New slide', id: 'insertpage', type: 'action'},
@@ -109,17 +113,20 @@ L.Control.menubar = L.Control.extend({
},
{name: 'Insert', type: 'menu', menu: [{name: 'Image', id: 'insertgraphic', type: 'action'},
{type: 'separator'},
- {name: 'Row above', type: 'unocommand', uno: '.uno:InsertRows'},
- {name: 'Column before', type: 'unocommand', uno: '.uno:InsertColumns'},
- {type: 'separator'},
- {name: 'Delete row', type: 'unocommand', uno: '.uno:DeleteRows'},
- {name: 'Delete column', type: 'unocommand', uno: '.uno:DeleteColumns'}]
+ {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: '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'},
+ {type: 'separator'},
+ {name: 'Delete Row', type: 'unocommand', uno: '.uno:DeleteRows'},
+ {name: 'Delete Column', type: 'unocommand', uno: '.uno:DeleteColumns'}]
}
],
commit 41734003dfeeace24e71f9963207881fc9036beb
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 20 13:05:47 2016 +0530
loleaflet: Disable menubar items according to context
Change-Id: I9c2918827eebfa033a3745a57299ba556015a2bb
(cherry picked from commit 033ec745230445c7a776e15eb0d64f6f8518fe49)
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index de7737c..96f3d25 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -121,7 +121,9 @@ L.Control.menubar = L.Control.extend({
{name: 'Zoom out', id: 'zoomout', type: 'action'},
{name: 'Zoom reset', id: 'zoomreset', type: 'action'}]
}
- ]
+ ],
+
+ commandStates: {}
},
onAdd: function (map) {
@@ -131,6 +133,15 @@ L.Control.menubar = L.Control.extend({
this._menubarCont.id = 'main-menu';
map.on('updatepermission', this._onUpdatePermission, this);
+ map.on('commandstatechanged', this._onCommandStateChanged, this);
+ },
+
+ _onCommandStateChanged: function(e) {
+ // Store information about enabled/disabled commands
+ // Used later just before showing menu to enable/disable menu items
+ if (e.state === 'enabled' || e.state === 'disabled') {
+ this.options.commandStates[e.commandName] = e.state;
+ }
},
_onUpdatePermission: function() {
@@ -160,6 +171,24 @@ L.Control.menubar = L.Control.extend({
this._initialized = true;
$('#main-menu').bind('select.smapi', {self: this}, this._onItemSelected);
+ $('#main-menu').bind('beforeshow.smapi', {self: this}, this._beforeFirstShow);
+ },
+
+ _beforeFirstShow: function(e, menu) {
+ var self = e.data.self;
+ var items = $(menu).children().children('a').not('.has-submenu');
+ $(items).each(function() {
+ var aItem = this;
+ var type = $(aItem).data('type');
+ if (type === 'unocommand') {
+ var unoCommand = $(aItem).data('uno');
+ if (self.options.commandStates[unoCommand] === 'disabled') {
+ $(aItem).addClass('disabled');
+ } else if (self.options.commandStates[unoCommand] === 'enabled') {
+ $(aItem).removeClass('disabled');
+ }
+ }
+ });
},
_executeAction: function(id) {
commit 0a05c779f7bc176e91093402f366bf4e17504067
Author: Pranav Kant <pranavk at collabora.com>
Date: Fri May 20 12:03:20 2016 +0530
loleaflet: Dont change cursor on disabled items
Change-Id: If709e58a426be3d0f0bdbf52ae81a04c87790518
(cherry picked from commit 17b3748a52b99112935e1099b89c70833cf51589)
diff --git a/loleaflet/dist/smartmenus/sm-simple.css b/loleaflet/dist/smartmenus/sm-simple.css
index c7d0a58..2d3de53 100644
--- a/loleaflet/dist/smartmenus/sm-simple.css
+++ b/loleaflet/dist/smartmenus/sm-simple.css
@@ -125,6 +125,9 @@ collapsible to desktop (navbar + dropdowns)
user-select: none;
cursor: default;
}
+.sm-simple a.disabled {
+ cursor: default;
+}
.sm-simple > li > a.has-submenu {
padding-left: 15px;
padding-right: 15px;
commit 08bdaa3bda4c2d57904c3efc71766e2e10f674aa
Author: Pranav Kant <pranavk at collabora.com>
Date: Thu May 19 16:07:10 2016 +0530
loleaflet: Prevent user from selecting menubar items
... and don't change the cursor while hovering over items
Change-Id: I221048451fdda2ac66c1f2e500732836ed66fe03
(cherry picked from commit 887f6314ab341ba73add9184bd9ff147c1cb9a5b)
diff --git a/loleaflet/dist/smartmenus/sm-simple.css b/loleaflet/dist/smartmenus/sm-simple.css
index 2b44254..c7d0a58 100644
--- a/loleaflet/dist/smartmenus/sm-simple.css
+++ b/loleaflet/dist/smartmenus/sm-simple.css
@@ -117,6 +117,13 @@ collapsible to desktop (navbar + dropdowns)
/* ...end */
.sm-simple {
background: #efefef;
+ -webkit-touch-callout: none; /* iOS Safari */
+ -webkit-user-select: none; /* Chrome/Safari/Opera */
+ -khtml-user-select: none; /* Konqueror */
+ -moz-user-select: none; /* Firefox */
+ -ms-user-select: none; /* Internet Explorer/Edge */
+ user-select: none;
+ cursor: default;
}
.sm-simple > li > a.has-submenu {
padding-left: 15px;
commit a66ae150602585d39f65ae826e40d082130031b4
Author: Pranav Kant <pranavk at collabora.com>
Date: Thu May 19 16:02:45 2016 +0530
loleaflet: Don't move text when highlighted
Change-Id: I69602c4b1b4256733506983d53d289627771f291
(cherry picked from commit 6b773910d3c56d155b668034d86c347974978790)
diff --git a/loleaflet/dist/smartmenus/sm-simple.css b/loleaflet/dist/smartmenus/sm-simple.css
index 6b8263f..2b44254 100644
--- a/loleaflet/dist/smartmenus/sm-simple.css
+++ b/loleaflet/dist/smartmenus/sm-simple.css
@@ -118,6 +118,14 @@ collapsible to desktop (navbar + dropdowns)
.sm-simple {
background: #efefef;
}
+.sm-simple > li > a.has-submenu {
+ padding-left: 15px;
+ padding-right: 15px;
+ padding-top: 8px;
+ z-index: 500;
+ border-left: 1px solid #efefef;
+ border-right: 1px solid #efefef;
+}
.sm-simple a, .sm-simple a:hover, .sm-simple a:focus, .sm-simple a:active, .sm-simple a.highlighted {
padding: 5px 15px;
color: #555;
@@ -127,8 +135,11 @@ collapsible to desktop (navbar + dropdowns)
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list