[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jul 10 12:51:05 UTC 2020
loleaflet/css/notebookbar.css | 6 ++++++
loleaflet/images/lc_aligncenter.svg | 1 +
loleaflet/images/lc_aligndown.svg | 1 +
loleaflet/images/lc_alignmiddle.svg | 1 +
loleaflet/images/lc_alignup.svg | 1 +
loleaflet/images/lc_entergroup.svg | 1 +
loleaflet/images/lc_formatarea.svg | 1 +
loleaflet/images/lc_formatline.svg | 1 +
loleaflet/images/lc_leavegroup.svg | 1 +
loleaflet/images/lc_objectalignleft.svg | 1 +
loleaflet/images/lc_objectalignright.svg | 1 +
loleaflet/src/control/Control.NotebookbarBuilder.js | 14 +++++++++++++-
loleaflet/src/control/Control.NotebookbarWriter.js | 6 ++++++
13 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 12d5e0aabc0237c5ba1fcdc151f17b8ab6db1a0a
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 10 10:36:58 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jul 10 14:50:46 2020 +0200
notebookbar: enable Draw tab for writer
Change-Id: I32f91d35fbf2332e133db7194fd795b9471af7b1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98487
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 60d851074..a7fcfc57f 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -376,6 +376,12 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
margin-top: 20px;
}
+/* Draw tab */
+#table-Draw #table-box16 #table-first16.notebookbar,
+#table-DrawTab #table-GroupB74 #table-SectionBottom48.notebookbar {
+ display: none;
+}
+
/* Calc */
/* Home tab */
diff --git a/loleaflet/images/lc_aligncenter.svg b/loleaflet/images/lc_aligncenter.svg
new file mode 100644
index 000000000..f2e6308ee
--- /dev/null
+++ b/loleaflet/images/lc_aligncenter.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(0 -1 1 0 -.992879 24)"><g stroke-linecap="round" stroke-linejoin="round"><path d="m15.5 7.5v10h-5v-10z" fill="#fff" stroke="#808080"/><g fill="none" stroke="#4d82b8" transform="matrix(0 1 -1 0 30.005054 11.992879)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h7.9928788"/></g><path d="m7.5 4.5v16h-5v-16z" fill="#fff" stroke="#808080"/></g><rect fill="#4d82b8" height="1" ry=".474576" transform="scale(1 -1)" width="21" x="1" y="-13"/><g fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 -1 -1 0 30.005054 13)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h7.9928788"/></g></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_aligndown.svg b/loleaflet/images/lc_aligndown.svg
new file mode 100644
index 000000000..59a972c8a
--- /dev/null
+++ b/loleaflet/images/lc_aligndown.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 19.5v-10h-5v10z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><g fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 -1 -1 0 30.005054 22)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h9.9928788"/></g><rect fill="#4d82b8" height="1" ry=".5" width="20" x="2" y="21"/><path d="m15.5 19.5v-16h-5v16z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_alignmiddle.svg b/loleaflet/images/lc_alignmiddle.svg
new file mode 100644
index 000000000..6186f920d
--- /dev/null
+++ b/loleaflet/images/lc_alignmiddle.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke-linecap="round" stroke-linejoin="round"><path d="m15.5 7.5v10h-5v-10z" fill="#fff" stroke="#808080"/><g fill="none" stroke="#4d82b8" transform="matrix(0 1 -1 0 30.005054 11.992879)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h7.9928788"/></g><path d="m7.5 4.5v16h-5v-16z" fill="#fff" stroke="#808080"/></g><rect fill="#4d82b8" height="1" ry=".474576" transform="scale(1 -1)" width="21" x="1" y="-13"/><g fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 -1 -1 0 30.005054 13)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h7.9928788"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_alignup.svg b/loleaflet/images/lc_alignup.svg
new file mode 100644
index 000000000..2cbe84e1c
--- /dev/null
+++ b/loleaflet/images/lc_alignup.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m15.5 5.5v10h-5v-10z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><g fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 1 -1 0 30.005054 3)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h9.9928788"/></g><rect fill="#4d82b8" height="1" ry=".5" transform="scale(1 -1)" width="20" x="2" y="-4"/><path d="m7.5 5.5v16h-5v-16z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_entergroup.svg b/loleaflet/images/lc_entergroup.svg
new file mode 100644
index 000000000..e05b5b696
--- /dev/null
+++ b/loleaflet/images/lc_entergroup.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9 11v9h1.894531l-.40625-.40625.095703.083984c-.7599129-.587102-.7570461-1.795644.00586-2.378906l-.09961.087891 2.949219-2.945313c.093794-.09599.24152-.08936.355469-.15625a1.0001 1.0001 0 0 1 .671875-.294922h.001953s.001953.001954.001953.001954c.01-.000301.017344.007882.027344.007812v-.009766a1.0001 1.0001 0 0 1 .550781.169922c.374302.156209.699878.401132.845703.746094.21893.517899.121689 1.217962-.33789 1.662109l-.421875.421875h4.865234v-5.990234zm6.123047 8.990234.009765.009766h4.867188v-.009766z" fill="#fff"/><path d="m4 3c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1zm0 1h11v9h-11z" fill="#808080"/><path d="m4 4h11v9h-11z" fill="#fff"/><path d="m9 10c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h2.892578l-.998047-1h-1.894531v-6-3h7 4v5.990234h1v-5.990234c0-.554-.446-1-1-1zm11 9.990234v.009766h-4.867188l.423829.423828c.162236.156686.284675.360091.365234.576172h4.078125c.554 0 1-.446 1-1
v-.009766z" fill="#808080"/><g fill="#4d82b8"><path d="m2 2h3v3h-3z"/><path d="m19 2h3v3h-3z"/><path d="m2 19h3v3h-3z"/></g><g fill="#fff"><path d="m3 3h1v1h-1z"/><path d="m20 3h1v1h-1z"/><path d="m3 20h1v1h-1z"/></g><path d="m14.498071 14.990234a.50005.50005 0 0 0 -.34375.150391l-2.957031 2.953125a.50005.50005 0 0 0 -.002.792969l2.957032 2.960937a.50005.50005 0 1 0 .708984-.705078l-2.148437-2.152344h8.787108a.50005.50005 0 1 0 0-1h-8.783202l2.144531-2.140625a.50005.50005 0 0 0 -.363281-.859375z" fill="#4d82b8" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_formatarea.svg b/loleaflet/images/lc_formatarea.svg
new file mode 100644
index 000000000..ebd7aac9d
--- /dev/null
+++ b/loleaflet/images/lc_formatarea.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m11.307716 20.638247 9.438078-5.638247-5.708126-10.3752563-9.9336041 5.8220523z" fill="#fff" fill-rule="evenodd"/><ellipse cx="12" cy="19.725481" fill="none" rx="10" ry="2.274613"/><path d="m9 8h-5c-1 0-1 .217546-1 2.276478v5.723522c0 1 2 1 2 0v-6z" fill="#4d82b8" fill-rule="evenodd"/><g fill="none" stroke="#808080"><ellipse cx="4.962672" cy="16.187546" rx="1.752345" ry="1.741017" stroke-linecap="round" stroke-width=".95097" transform="matrix(.86821741 -.49618397 .50382625 .86380502 0 0)"/><path d="m12.488244 9.8063594v-5.2263907c0-2.8972803 5.493132-2.8080105 5.493132.1206297v4.9056967" stroke-linecap="round" stroke-width=".909468"/><path d="m5.1040639 10.446796 5.3390121 9.387521c.410089.65506 1.069393.906864 1.704955.572463l7.748423-4.541322c.589382-.407352.86271-1.172428.486324-1.842477l-5.34511-9.3982373z" stroke-width=".896453"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_formatline.svg b/loleaflet/images/lc_formatline.svg
new file mode 100644
index 000000000..bf6ead04f
--- /dev/null
+++ b/loleaflet/images/lc_formatline.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 3h18v16h-18z" fill="#fff"/><path d="m3 2c-.554 0-1 .446-1 1v16c0 .554.446 1 1 1h18c.554 0 1-.446 1-1v-16c0-.554-.446-1-1-1zm0 1h18v16h-18z" fill="#4d82b8"/><path d="m18.791016 2.9998446c-2.024439 1.4714687-4.730024 3.7411959-6.876954 6.0429688-.194876.2089383-.384252.4098921-.568359.6191406-.116389.1222132-.237166.2229163-.353515.349609-.07344.0869-.14368.18478-.214844.271485-1.3349826 1.486007-2.6346528 3.20583-3.7675784 4.83789-.3768434-.169964-.82793-.178171-1.3125.162109-.9456866.664092-.7495529 3.049617-2.6972656 3.048828.1844093.802815 2.1784206.793524 3.5253906.435547 1.2713696-.337886 1.6599002-1.525404 1.4179688-2.515625-.038668-.158268-.1149372-.320081-.2109375-.476562 1.9843886-1.685837 3.4256901-3.102846 4.4296871-4.175782.270428-.278544.595111-.642696.957032-1.046874 1.353947-1.5119865 3.289303-3.8939765 5.671875-7.5527344z" fill="#808080"/><path d="m7.0097656 15.120938c-.3768434-.169964-.82793-.178
171-1.3125.162109-.9456866.664092-.7495529 3.049617-2.6972656 3.048828.1844093.802815 2.1784206.793524 3.5253906.435547 1.2713696-.337886 1.6599002-1.525404 1.4179688-2.515625-.0386682-.158268-.1149372-.320081-.2109375-.476562z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_leavegroup.svg b/loleaflet/images/lc_leavegroup.svg
new file mode 100644
index 000000000..5bd9a2dfb
--- /dev/null
+++ b/loleaflet/images/lc_leavegroup.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m4 3c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1zm0 1h11v9h-11z" fill="#808080"/><path d="m4 4h11v9h-11z" fill="#fff"/><g fill="#808080"><path d="m9 10c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h8.076172c.08822-.229036.224537-.442298.402344-.601562l.396484-.398438h-8.875v-9h11v3.873047l1 .998047v-4.871094c0-.554-.446-1-1-1z"/><path d="m2 2h3v3h-3z"/><path d="m19 2h3v3h-3z"/><path d="m2 19h3v3h-3z"/></g><g fill="#fff"><path d="m9 11v9h8.875l.009766-.009766h-6.363282c-.420168.005943-.867654-.182805-1.138672-.484375-.271015-.30157-.382812-.666177-.382812-1.015625 0-.349447.111796-.714055.382812-1.015625.271018-.30157.718504-.490275 1.138672-.484375h6.351563l-.421875-.421875c-.452852-.438274-.556085-1.125408-.347656-1.640625.207997-.514149.758145-.9356 1.386718-.9375h.001954c.404468-.001027.793315.161987 1.076171.451172l.431641.431641v-3.873047z"/><path d="m3 3h1v1h-1z"/><path d="m20 3h1v
1h-1z"/><path d="m3 20h1v1h-1z"/></g><path d="m18.494141 14.990234a.50005.50005 0 0 0 -.347657.859375l2.144532 2.140625h-8.783204a.50005.50005 0 1 0 0 1h8.78711l-2.148438 2.152344a.50005.50005 0 1 0 .707032.705078l2.957031-2.960937a.50005.50005 0 0 0 -.0039-.796875l-2.953125-2.949219a.50005.50005 0 0 0 -.359375-.150391z" fill="#4d82b8" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_objectalignleft.svg b/loleaflet/images/lc_objectalignleft.svg
new file mode 100644
index 000000000..d51301c47
--- /dev/null
+++ b/loleaflet/images/lc_objectalignleft.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(0 -1 -1 0 25 25)"><path d="m7.5 19.5v-10h-5v10z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><g fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 -1 -1 0 30.005054 22)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h9.9928788"/></g><rect fill="#4d82b8" height="1" ry=".5" width="20" x="2" y="21"/><path d="m15.5 19.5v-16h-5v16z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_objectalignright.svg b/loleaflet/images/lc_objectalignright.svg
new file mode 100644
index 000000000..cab9fb366
--- /dev/null
+++ b/loleaflet/images/lc_objectalignright.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(0 -1 1 0 0 25)"><path d="m7.5 19.5v-10h-5v10z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><g fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 -1 -1 0 30.005054 22)"><path d="m5.507121 6.5-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m2.5071212 9.4949499h9.9928788"/></g><rect fill="#4d82b8" height="1" ry=".5" width="20" x="2" y="21"/><path d="m15.5 19.5v-16h-5v16z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 36265b450..52e1454c8 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -82,7 +82,6 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:SelectObject'] = function() {};
this._toolitemHandlers['.uno:BibliographyComponent'] = function() {};
this._toolitemHandlers['.uno:ViewDataSourceBrowser'] = function() {};
- this._toolitemHandlers['.uno:FormatArea'] = function() {};
this._toolitemHandlers['.uno:SetBorderStyle'] = function() {};
this._toolitemHandlers['.uno:LineStyle'] = function() {};
this._toolitemHandlers['.uno:InsertFormula'] = function() {};
@@ -132,6 +131,19 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:PhotoAlbumDialog'] = function() {};
this._toolitemHandlers['.uno:AutoFormat'] = function() {};
this._toolitemHandlers['.uno:Spacing'] = function() {};
+ this._toolitemHandlers['.uno:ToggleObjectRotateMode'] = function() {};
+ this._toolitemHandlers['.uno:RotateRight'] = function() {};
+ this._toolitemHandlers['.uno:ToggleObjectBezierMode'] = function() {};
+ this._toolitemHandlers['.uno:AnchorMenu'] = function() {};
+ this._toolitemHandlers['.uno:ExtrusionToggle'] = function() {};
+ this._toolitemHandlers['.uno:ExtrusionDepthFloater'] = function() {};
+ this._toolitemHandlers['.uno:ExtrusionDirectionFloater'] = function() {};
+ this._toolitemHandlers['.uno:Extrusion3DColor'] = function() {};
+ this._toolitemHandlers['.uno:ExtrusionSurfaceFloater'] = function() {};
+ this._toolitemHandlers['.uno:FontworkShapeType'] = function() {};
+ this._toolitemHandlers['.uno:FontworkSameLetterHeights'] = function() {};
+ this._toolitemHandlers['.uno:FontworkAlignmentFloater'] = function() {};
+ this._toolitemHandlers['.uno:FontworkCharacterSpacingFloater'] = function() {};
this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] = function() {};
},
diff --git a/loleaflet/src/control/Control.NotebookbarWriter.js b/loleaflet/src/control/Control.NotebookbarWriter.js
index 726673b95..f46e0a08b 100644
--- a/loleaflet/src/control/Control.NotebookbarWriter.js
+++ b/loleaflet/src/control/Control.NotebookbarWriter.js
@@ -45,6 +45,12 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
'name': 'TableLabel',
'context': 'Table'
},
+ {
+ 'text': _('~Draw'),
+ 'id': '10',
+ 'name': 'DrawLabel',
+ 'context': 'Draw'
+ },
{
'text': _('~Help'),
'id': '-2',
More information about the Libreoffice-commits
mailing list