loleaflet/dist/images/fr01.svg | 7 +++++++
loleaflet/dist/images/fr010.svg | 10 ++++++++++
loleaflet/dist/images/fr011.svg | 10 ++++++++++
loleaflet/dist/images/fr012.svg | 6 ++++++
loleaflet/dist/images/fr02.svg | 6 ++++++
loleaflet/dist/images/fr03.svg | 6 ++++++
loleaflet/dist/images/fr04.svg | 6 ++++++
loleaflet/dist/images/fr05.svg | 6 ++++++
loleaflet/dist/images/fr06.svg | 6 ++++++
loleaflet/dist/images/fr07.svg | 6 ++++++
loleaflet/dist/images/fr08.svg | 6 ++++++
loleaflet/dist/images/fr09.svg | 6 ++++++
loleaflet/dist/images/lc_setborderstyle.svg | 10 ++++++++++
loleaflet/dist/toolbar.css | 22 ++++++++++++++++++++++
loleaflet/dist/toolbar/toolbar.js | 23 +++++++++++++++++++++++
15 files changed, 136 insertions(+)
New commits:
commit 69235ad469be14b460e0f00f6b4a8215fc222b10
Author: Henry Castro <hcas...@collabora.com>
Date: Mon Jun 18 08:19:00 2018 -0400
loleaflet: add cell borders in Calc
Change-Id: I0105ee6c98b0eb043b60b56ea80007bae967df90
Reviewed-on: https://gerrit.libreoffice.org/56091
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/dist/images/fr01.svg b/loleaflet/dist/images/fr01.svg
new file mode 100644
index 000000000..a38747a9d
--- /dev/null
+++ b/loleaflet/dist/images/fr01.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(1,-1029.3622)" />
+</svg>
diff --git a/loleaflet/dist/images/fr010.svg b/loleaflet/dist/images/fr010.svg
new file mode 100644
index 000000000..5b5ede39f
--- /dev/null
+++ b/loleaflet/dist/images/fr010.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#4d4d4d"
+ d="m 12,4 0,15 1,0 0,-15 z"
+ />
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 4 L 4 11 L 4 12 L 4 20 L 5 20 L 21 20 L 21 19 L 21 4 L 21 3
L 4 3 z M 5 4 L 20 4 L 20 11 L 5 11 L 5 4 z M 5 12 L 20 12 L 20 19 L 5 19 L 5
12 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr011.svg b/loleaflet/dist/images/fr011.svg
new file mode 100644
index 000000000..7452f5a41
--- /dev/null
+++ b/loleaflet/dist/images/fr011.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#4d4d4d"
+ d="M 4 11 L 4 12 L 21 12 L 21 11 L 4 11 z "
+ />
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 4 L 4 19 L 4 20 L 12 20 L 13 20 L 21 20 L 21 19 L 21 4 L 21
3 L 4 3 z M 5 4 L 12 4 L 12 19 L 5 19 L 5 4 z M 13 4 L 20 4 L 20 19 L 13 19 L
13 4 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr012.svg b/loleaflet/dist/images/fr012.svg
new file mode 100644
index 000000000..9cde5ef00
--- /dev/null
+++ b/loleaflet/dist/images/fr012.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 4 L 4 11 L 4 12 L 4 19 L 4 20 L 21 20 L 21 19 L 21 12 L 21
11 L 21 4 L 21 3 L 4 3 z M 5 4 L 12 4 L 12 11 L 5 11 L 5 4 z M 13 4 L 20 4 L 20
11 L 13 11 L 13 4 z M 5 12 L 12 12 L 12 19 L 5 19 L 5 12 z M 13 12 L 20 12 L 20
19 L 13 19 L 13 12 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr02.svg b/loleaflet/dist/images/fr02.svg
new file mode 100644
index 000000000..b71acc0f1
--- /dev/null
+++ b/loleaflet/dist/images/fr02.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 20 L 5 20 L 5 3 L 4 3 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr03.svg b/loleaflet/dist/images/fr03.svg
new file mode 100644
index 000000000..8fcca7d78
--- /dev/null
+++ b/loleaflet/dist/images/fr03.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 20 3 L 20 20 L 21 20 L 21 3 L 20 3 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr04.svg b/loleaflet/dist/images/fr04.svg
new file mode 100644
index 000000000..63a82d6b8
--- /dev/null
+++ b/loleaflet/dist/images/fr04.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 20 L 5 20 L 5 3 L 4 3 z M 20 3 L 20 20 L 21 20 L 21 3 L 20 3
z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr05.svg b/loleaflet/dist/images/fr05.svg
new file mode 100644
index 000000000..b1f193391
--- /dev/null
+++ b/loleaflet/dist/images/fr05.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 4 L 21 4 L 21 3 L 4 3 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr06.svg b/loleaflet/dist/images/fr06.svg
new file mode 100644
index 000000000..70f392ffe
--- /dev/null
+++ b/loleaflet/dist/images/fr06.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 19 L 4 20 L 21 20 L 21 19 L 4 19 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr07.svg b/loleaflet/dist/images/fr07.svg
new file mode 100644
index 000000000..01d35e146
--- /dev/null
+++ b/loleaflet/dist/images/fr07.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 4 L 21 4 L 21 3 L 4 3 z M 4 19 L 4 20 L 21 20 L 21 19 L 4 19
z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr08.svg b/loleaflet/dist/images/fr08.svg
new file mode 100644
index 000000000..0942743f3
--- /dev/null
+++ b/loleaflet/dist/images/fr08.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 4 L 4 19 L 4 20 L 21 20 L 21 19 L 21 4 L 21 3 L 20 3 L 5 3 L
4 3 z M 5 4 L 20 4 L 20 19 L 5 19 L 5 4 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/fr09.svg b/loleaflet/dist/images/fr09.svg
new file mode 100644
index 000000000..8241031d3
--- /dev/null
+++ b/loleaflet/dist/images/fr09.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 3 L 4 4 L 21 4 L 21 3 L 4 3 z M 4 11 L 4 12 L 21 12 L 21 11 L 4 11
z M 4 19 L 4 20 L 21 20 L 21 19 L 4 19 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/images/lc_setborderstyle.svg
b/loleaflet/dist/images/lc_setborderstyle.svg
new file mode 100644
index 000000000..93e3cf682
--- /dev/null
+++ b/loleaflet/dist/images/lc_setborderstyle.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#f47750"
+ d="M 4 4 L 4 20 L 20 20 L 20 4 L 4 4 z M 5 5 L 19 5 L 19 19 L 5 19 L 5 5
z "
+ />
+ <path
+ style="fill:#4d4d4d"
+ d="M 5 5 L 5 19 L 19 19 L 19 5 L 5 5 z M 6 6 L 18 6 L 18 18 L 6 18 L 6 6
z "
+ />
+ </svg>
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 9d04ed1bc..0ea6834a0 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -257,6 +257,27 @@ button.leaflet-control-search-next
border-style: solid;
}
+.w2ui-icon.frame01 { background: url('../images/fr01.svg') no-repeat center
!important; }
+.w2ui-icon.frame02 { background: url('../images/fr02.svg') no-repeat center
!important; }
+.w2ui-icon.frame03 { background: url('../images/fr03.svg') no-repeat center
!important; }
+.w2ui-icon.frame04 { background: url('../images/fr04.svg') no-repeat center
!important; }
+.w2ui-icon.frame05 { background: url('../images/fr05.svg') no-repeat center
!important; }
+.w2ui-icon.frame06 { background: url('../images/fr06.svg') no-repeat center
!important; }
+.w2ui-icon.frame07 { background: url('../images/fr07.svg') no-repeat center
!important; }
+.w2ui-icon.frame08 { background: url('../images/fr08.svg') no-repeat center
!important; }
+.w2ui-icon.frame09 { background: url('../images/fr09.svg') no-repeat center
!important; }
+.w2ui-icon.frame10 { background: url('../images/fr010.svg') no-repeat center
!important; }
+.w2ui-icon.frame11 { background: url('../images/fr011.svg') no-repeat center
!important; }
+.w2ui-icon.frame12 { background: url('../images/fr012.svg') no-repeat center
!important; }
+
+#insertborder-grid tr td {
+ border-style: inset;
+}
+
+#insertborder-grid tr td:hover {
+ border-style: solid;
+}
+
.w2ui-icon.accepttrackedchanges{ background:
url('../images/lc_accepttrackedchanges.svg') no-repeat center !important; }
.w2ui-icon.alignblock{ background: url('../images/lc_alignblock.svg')
no-repeat center !important; }
.w2ui-icon.alignhorizontal{ background:
url('../images/lc_alignhorizontalcenter.svg') no-repeat center !important; }
@@ -281,6 +302,7 @@ button.leaflet-control-search-next
.w2ui-icon.italic{ background: url('../images/lc_italic.svg') no-repeat center
!important; }
.w2ui-icon.insertgraphic{ background: url('../images/lc_gallery.svg')
no-repeat center !important; }
.w2ui-icon.inserttable{ background: url('../images/lc_inserttable.svg')
no-repeat center !important; }
+.w2ui-icon.insertborder{ background: url('../images/lc_setborderstyle.svg')
no-repeat center !important; }
.w2ui-icon.next{ background: url('../images/lc_downsearch.svg') no-repeat
center !important; }
.w2ui-icon.numbering{ background: url('../images/lc_defaultnumbering.svg')
no-repeat center !important; }
.w2ui-icon.presentation{ background: url('../images/lc_dia.svg') no-repeat
center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index eede37387..f232ebce3 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -241,6 +241,18 @@ function onClick(e, id, item, subItem) {
}
}
+function insertBorder() {
+ var $grid = $('#insertborder-grid');
+
+ $grid.on({
+ click: function() {
+ // TODO send map.sendUnoCommand('.uno:
com.sun.star.table.BorderLine2' );
+ $().w2overlay({ name: 'toolbar-up' });
+ console.log('click border');
+ }
+ });
+}
+
function insertTable() {
var rows = 10;
var cols = 10;
@@ -871,6 +883,17 @@ map.on('doclayerinit', function () {
switch (docType) {
case 'spreadsheet':
toolbarUp.remove('inserttable', 'styles', 'justifypara',
'defaultbullet', 'defaultnumbering', 'break-numbering');
+ toolbarUp.insert('insertshapes',
+ {type: 'drop', id: 'insertborder', img:
'insertborder', hint: _('Borders'), overlay: {onShow: insertBorder},
+ html: '<table id="insertborder-grid"><tr><td
class="w2ui-tb-image w2ui-icon frame01"></td>' +
+ '<td class="w2ui-tb-image w2ui-icon
frame02"></td><td class="w2ui-tb-image w2ui-icon frame03"></td>' +
+ '<td class="w2ui-tb-image w2ui-icon
frame04"></td></tr><tr><td class="w2ui-tb-image w2ui-icon frame05"></td>' +
+ '<td class="w2ui-tb-image w2ui-icon
frame06"></td><td class="w2ui-tb-image w2ui-icon frame07"></td>' +
+ '<td class="w2ui-tb-image w2ui-icon
frame08"></td></tr><tr><td class="w2ui-tb-image w2ui-icon frame09"></td>' +
+ '<td class="w2ui-tb-image w2ui-icon
frame10"></td><td class="w2ui-tb-image w2ui-icon frame11"></td>' +
+ '<td class="w2ui-tb-image w2ui-icon
frame12"></td></tr></table>'
+ }
+ );
statusbar.disable('zoomreset', 'zoomout', 'zoomin',
'zoomlevel');
statusbar.insert('left', [
{type: 'break', id:'break1'},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
