[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
Michael Meeks (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 9 14:36:35 UTC 2019
loleaflet/css/toolbar.css | 2 ++
loleaflet/images/lc_insertcolumnsafter.svg | 1 +
loleaflet/images/lc_insertrowsafter.svg | 1 +
loleaflet/src/control/Control.Menubar.js | 1 +
loleaflet/src/layer/tile/CalcTileLayer.js | 12 +++++++-----
5 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit f3363723c649b0ce6c59a69c4c4eed3ac743bdef
Author: Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Oct 9 15:35:31 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Oct 9 15:35:45 2019 +0100
mobile: simplify calc quick toolbar, add row insert/remove.
Change-Id: I1bd8ca5a952bfe720dfaea82513917121ce74f6e
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index fb227886a..e8b43628e 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -796,6 +796,8 @@ button.leaflet-control-search-next
.w2ui-icon.numberformatincdecimals{ background: url('images/lc_numberformatincdecimals.svg') no-repeat center !important; }
.w2ui-icon.numberformatdecdecimals{ background: url('images/lc_numberformatdecdecimals.svg') no-repeat center !important; }
.w2ui-icon.insertobjectchart{ background: url('images/lc_drawchart.svg') no-repeat center !important; }
+.w2ui-icon.insertrowsafter{ background: url('images/lc_insertrowsafter.svg') no-repeat center !important; }
+.w2ui-icon.insertcolumnsafter{ background: url('images/lc_insertcolumnsafter.svg') no-repeat center !important; }
.w2ui-icon.autosum{ background: url('images/lc_autosum.svg') no-repeat center !important; }
.w2ui-icon.functiondialog{ background: url('images/lc_functiondialog.svg') no-repeat center !important; }
diff --git a/loleaflet/images/lc_insertcolumnsafter.svg b/loleaflet/images/lc_insertcolumnsafter.svg
new file mode 100644
index 000000000..8e3a8059b
--- /dev/null
+++ b/loleaflet/images/lc_insertcolumnsafter.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m4 6v7.992188c.0093352.000014.0179809-.002085.0273438-.001954l4.1386718.003907-1.5566406-1.556641c-.42597-.408182-.6534969-.942581-.6230469-1.537109.027506-.53727.2740242-.9994419.5957031-1.3203129.3224931-.321681.7872843-.5628737 1.3164063-.5898437.579295-.029522 1.0993584.1977208 1.5058594.6074218l.0097656-.0097656c1.2644625 1.2598084 3.4344895 3.4306594 4.5859375 4.5839844v-8.171875zm12 0v15h6v-15zm-2 11.814453c-.814477.819396-2.036003 2.036815-3.1875 3.185547h3.1875zm-10 .169922v3.015625h2.0136719c-.0051648-.51662.1715772-1.037317.5859375-1.441406l1.5722656-1.56836-4.1445312-.003906c-.0093615.000131-.0180099-.001967-.0273438-.001953z" fill="#fff"/><path d="m3 2v1 3 3 1 4.257812c.3075872-.17611.654558-.272789 1.0273438-.267578l3.9726562.003907v-.166016l-.828125-.828125h-3.171875v-3h2.2675781c.0915452-.1553592.1945998-.3003696.3144531-.4199219.3089219-.308144.7504164-.5371987 1.2519532-.5800781h-3.8339844v-3h5v3h
-.9394531c.5129047.0172874.9762995.2273132 1.34375.5976562l.0097656-.0097656c.1615926.1609979.3959249.3963622.5859375.5859374v-.173828h4v-1h-4v-3h4v-4h-5-5zm9.828125 11c.345606.3458.73122.730836 1 1h.171875v-1zm-9.828125 4.716797v3.283203c0 .554.446 1 1 1h2v-1h-2v-3.015625c-.3627253.000528-.6998667-.094936-1-.267578zm7.8125 3.283203c-.293609.292904-.561446.562125-.8125.8125v.1875h4v-1z" fill="#808080"/><g fill="#4d82b8"><path d="m23 2v18.5.5.5c0 .277-.223.5-.5.5h-6.5-.5-.5v-.5-.5-19zm-1 4h-6v3h6zm0 4h-6v3h6zm0 4h-6v3h6zm0 4h-6v3h6v-.5z"/><path d="m8.0239204 21.988127c-.431173.0118-.800553-.263693-.947402-.609409s-.08821-.802293.220735-1.103576l3.2917296-3.283187-6.5751646-.0059c-.294233.0041-.580072-.12096-.757921-.318376-.177849-.197417-.255896-.44202-.255896-.679725s.07805-.482309.255896-.679726c.177849-.197416.463688-.322496.757921-.318376l6.5712576.0059-3.2840066-3.279789c-.213432-.204519-.330105-.497094-.316451-.763714.01365-.26662.13405-.495796.302777-.664099.168728-.168303.39
593-.285275.662206-.2988454.266275-.01357.558718.1015524.763781.3144704l-.0059-.0078c1.3543476 1.349362 3.8690606 3.864437 4.9170456 4.914642.514037.5239.480336 1.141229-.0078 1.576259-1.055988 1.065871-3.6697296 3.668076-4.9052456 4.900414-.181347.185168-.428604.293605-.687562.300796z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertrowsafter.svg b/loleaflet/images/lc_insertrowsafter.svg
new file mode 100644
index 000000000..9278fe221
--- /dev/null
+++ b/loleaflet/images/lc_insertrowsafter.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v11h13.0625c-.579122.01096-1.131112-.256016-1.541016-.658203l-.001953-.001953-.003906-.003906c-1.051321-1.049098-3.564976-3.561937-4.9160156-4.9179692l.0097656-.0097657c-.409701-.406501-.6369439-.9265644-.6074219-1.5058593.02697-.5291221.2681628-.9939133.5898438-1.3164063.320871-.321679.7830421-.5681971 1.3203121-.5957031.594528-.03045 1.128928.1970769 1.53711.6230468l1.55664 1.5566407-.003906-4.1386719c-.000149-.010644.001952-.0206417.001953-.03125zm13.0625 11h4.9375v-4.171875c-1.247697 1.250692-2.679539 2.688235-3.455078 3.457031-.366228.410935-.9033.703887-1.482422.714844zm1.933594-11c.000003.0106118.002101.0206025.001953.03125l.003906 4.1445312 1.568359-1.5722656c.400685-.4108699.917356-.5857567 1.429688-.5839844v-2.0195312zm-14.996094 14v3h18v-3z" fill="#fff"/><path d="m3 3c-.554 0-1 .446-1 1v11 1h20v-1-5h-.171875c-.254918.255609-.529157.52844-.828125.828125v.171875h-.171875c-.367536.368374-.61888.620388-.
998047 1h1.169922v3h-4.9375-.0625v-.005859c-.355381-.005637-.69525-.117665-1-.296875v.302734h-6v-3h3.179688c-.375537-.375559-.626752-.628358-.998047-1h-2.181641v-3h.0078125c.0000031-.0331164-.0075678-.0641326-.0058594-.0976562.0170595-.3346891.1266137-.6388643.28125-.9023438h-.2832031v-3h5.003906c.000035-.3627934.096687-.7000781.269532-1zm14.726562 0c.17322.2998241.269436.637449.269532 1h3.003906v2.0195312c.267257.0009246.532539.0349807.78125.140625.079373.0337153.144791.0896894.21875.1328126v-2.2929688c0-.554-.446-1-1-1zm-14.726562 1h5v3h-5zm0 4h5v3h-5zm0 4h5v3h-5z" fill="#808080"/><g fill="#4d82b8"><path d="m2 22v-5h20v5zm1-1h5v-3h-5zm6 0h6v-3h-6zm7 0h5v-3h-5z"/><path d="m22.000103 8.027501c.0118-.431173-.263693-.800553-.609409-.947402s-.802293-.08821-1.103576.220735l-3.283187 3.29173-.0059-6.575165c.0041-.294233-.12096-.580072-.318376-.757921-.197417-.177849-.44202-.255896-.679725-.255896s-.482309.07805-.679726.255896c-.197416.177849-.322496.463688-.318376.757921l.0059 6.571258-3
.279789-3.284007c-.204519-.213432-.497094-.330105-.763714-.316451-.26662.01365-.495796.13405-.664099.302777-.168303.168728-.285275.39593-.298845.662206-.01357.266275.101552.558718.31447.763781l-.0078-.0059c1.349362 1.354348 3.864437 3.869061 4.914642 4.917046.5239.514037 1.141229.480336 1.576259-.0078 1.065871-1.055988 3.668076-3.66973 4.900414-4.905246.185168-.181347.293605-.428604.300796-.687562z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 6019985c5..4095bf4bf 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -390,6 +390,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertAnnotation', 'spreadsheet'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
+ {name: _('Insert Shape'), id: 'insertshape', desktop: false, mobile: true, type: 'action' },
{uno: '.uno:InsertSymbol', mobile: false},
{uno: '.uno:EditHeaderAndFooter', mobile: false}
]},
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 6045d5ba1..25ca2f478 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -69,14 +69,14 @@ L.CalcTileLayer = L.TileLayer.extend({
var map = this._map;
var toolItems = [
{type: 'button', id: 'bold', img: 'bold', hint: _UNO('.uno:Bold'), uno: 'Bold'},
- {type: 'button', id: 'italic', img: 'italic', hint: _UNO('.uno:Italic'), uno: 'Italic'},
+// {type: 'button', id: 'italic', img: 'italic', hint: _UNO('.uno:Italic'), uno: 'Italic'},
{type: 'button', id: 'underline', img: 'underline', hint: _UNO('.uno:Underline'), uno: 'Underline'},
{type: 'button', id: 'strikeout', img: 'strikeout', hint: _UNO('.uno:Strikeout'), uno: 'Strikeout'},
{type: 'break'},
{type: 'text-color', id: 'fontcolor', img: 'textcolor', hint: _UNO('.uno:FontColor')},
- {type: 'color', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackgroundColor')},
+// {type: 'color', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackgroundColor')},
{type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _UNO('.uno:ToggleMergeCells', 'spreadsheet', true), uno: 'ToggleMergeCells', disabled: true},
- {type: 'break', id: 'breakmergecells'},
+// {type: 'break', id: 'breakmergecells'},
{type: 'menu', id: 'textalign', img: 'alignblock', hint: _UNO('.uno:TextAlign'),
items: [
{id: 'alignleft', text: _UNO('.uno:AlignLeft', 'spreadsheet', true), icon: 'alignleft', uno: 'AlignLeft'},
@@ -85,12 +85,14 @@ L.CalcTileLayer = L.TileLayer.extend({
{id: 'alignblock', text: _UNO('.uno:AlignBlock', 'spreadsheet', true), icon: 'alignblock', uno: 'AlignBlock'},
]},
{type: 'button', id: 'wraptext', img: 'wraptext', hint: _UNO('.uno:WrapText', 'spreadsheet', true), uno: 'WrapText', disabled: true},
- {type: 'button', id: 'numberformatcurrency', img: 'numberformatcurrency', hint: _UNO('.uno:NumberFormatCurrency', 'spreadsheet', true), uno: 'NumberFormatCurrency', disabled: true},
+ {type: 'button', id: 'insertrowsafter', img: 'insertrowsafter', hint: _UNO('.uno:InsertRowsAfter'), uno: 'InsertRowsAfter'},
+ {type: 'button', id: 'insertcolumnsafter', img: 'insertcolumnsafter', hint: _UNO('.uno:InsertColumnsAfter'), uno: 'InsertColumnsAfter'},
+/* {type: 'button', id: 'numberformatcurrency', img: 'numberformatcurrency', hint: _UNO('.uno:NumberFormatCurrency', 'spreadsheet', true), uno: 'NumberFormatCurrency', disabled: true},
{type: 'button', id: 'numberformatpercent', img: 'numberformatpercent', hint: _UNO('.uno:NumberFormatPercent', 'spreadsheet', true), uno: 'NumberFormatPercent', disabled: true},
{type: 'button', id: 'numberformatdecdecimals', img: 'numberformatdecdecimals', hint: _UNO('.uno:NumberFormatDecDecimals', 'spreadsheet', true), hidden: true, uno: 'NumberFormatDecDecimals', disabled: true},
{type: 'button', id: 'numberformatincdecimals', img: 'numberformatincdecimals', hint: _UNO('.uno:NumberFormatIncDecimals', 'spreadsheet', true), hidden: true, uno: 'NumberFormatIncDecimals', disabled: true},
{type: 'button', id: 'sum', img: 'autosum', hint: _('Sum')},
- {type: 'break', id: 'break-number'},
+ {type: 'break', id: 'break-number'}, */
];
var toolbar = $('#toolbar-up');
More information about the Libreoffice-commits
mailing list