[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 4 12:57:29 UTC 2020
loleaflet/css/notebookbar.css | 10 ++++++++++
loleaflet/images/lc_combine.svg | 1 +
loleaflet/images/lc_dismantle.svg | 1 +
loleaflet/images/lc_distributeselection.svg | 1 +
loleaflet/images/lc_forward.svg | 1 +
loleaflet/images/lc_intersect.svg | 1 +
loleaflet/images/lc_merge.svg | 1 +
loleaflet/images/lc_substract.svg | 1 +
loleaflet/src/control/Control.NotebookbarBuilder.js | 16 ++++++++++++++++
loleaflet/src/control/Control.NotebookbarImpress.js | 6 ++++++
10 files changed, 39 insertions(+)
New commits:
commit 60a92ec348a6a85e966c01c664f4e422bd9fe893
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Aug 4 12:47:57 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Aug 4 14:57:10 2020 +0200
notebookbar: Draw tab for Impress
Change-Id: I8332b8c71aa9af724592377de9f6fcd171e5014d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100080
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 22991e442..15924d608 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -680,6 +680,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
margin-top: 10px;
}
+/* Draw Tab */
+
+#table-DrawTab #table-box6 #XLineColor.notebookbar {
+ margin-left: -10px;
+}
+
+#table-DrawTab #table-Draw #table-GroupB102.notebookbar {
+ margin-left: -70px;
+}
+
/* other */
.ui-drawing-area-container
diff --git a/loleaflet/images/lc_combine.svg b/loleaflet/images/lc_combine.svg
new file mode 100644
index 000000000..716fb3b7c
--- /dev/null
+++ b/loleaflet/images/lc_combine.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m10 4v4h4v9h7v-13zm4 13h-4v-9h-7v13h11z" fill="#fff"/><g fill="#4d82b8"><path d="m10 3c-.554 0-1 .446-1 1v13c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-13c0-.554-.446-1-1-1zm0 1h11v13h-11z"/><path d="m3 7c-.554 0-1 .446-1 1v13c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-13c0-.554-.446-1-1-1zm0 1h11v13h-11z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_dismantle.svg b/loleaflet/images/lc_dismantle.svg
new file mode 100644
index 000000000..9aea821c0
--- /dev/null
+++ b/loleaflet/images/lc_dismantle.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m10 4v4h-7v13h11v-4h7v-13z" fill="#fff"/><path d="m10 3c-.554 0-1 .446-1 1v3h-6c-.554 0-1 .446-1 1v13c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-3h6c.554 0 1-.446 1-1v-13c0-.554-.446-1-1-1zm0 1h11v13h-6v-9c0-.554-.446-1-1-1h-4zm-7 4h11v13h-11z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_distributeselection.svg b/loleaflet/images/lc_distributeselection.svg
new file mode 100644
index 000000000..e581f95db
--- /dev/null
+++ b/loleaflet/images/lc_distributeselection.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5.53125 2.0996094c-.277 0-.5.223-.5.5v1.2402344l1-.9980469v-.2421875c0-.277-.223-.5-.5-.5zm-.5 5.0390625v14.4609371c0 .277.223.5.5.5s.5-.223.5-.5v-13.4570309z" fill="#4d82b8"/><path d="m2.5 8.5v10h6v-8.5078125c-.3801894-.0016116-.7890672-.1651207-1.0644531-.4414063l-1.046875-1.0507812z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><path d="m18.5 2c-.277 0-.5.223-.5.5v.3730469l1 .9980469v-1.3710938c0-.277-.223-.5-.5-.5zm.5 5.1074219-1 1.0039062v13.3886719c0 .277.223.5.5.5s.5-.223.5-.5z" fill="#4d82b8"/><path d="m18.609375 7.5-2.044922 2.0507812c-.275386.2762857-.684264.4397945-1.064453.4414063v10.5078125h6v-13z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><path d="m8.5039062 1.9906284c-.1345094-.0001797-.2633926.0540499-.3574218.1503906l-2.953125 2.9511719c-.2598107.2006705-.258843.5935846.00195.7929687l2.9492187 2.9589844c.470586.4721232 1.1776173-.2
34908.7070313-.7070312l-2.140625-2.1484375h10.5781246l-2.140624 2.1484375c-.470586.472123.236445 1.1791542.707031.7070312l2.949219-2.9589844c.260796-.1993841.261764-.5922982.002-.7929687l-2.953169-2.9511719c-.09403-.096341-.222913-.1505703-.357422-.1503906-.4471.0006667-.667685.5446939-.347656.8574219l2.140624 2.140625h-10.5781245l2.140625-2.140625c.320029-.3127281.0994439-.8567554-.3476563-.8574219z" fill="#4d82b8" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_forward.svg b/loleaflet/images/lc_forward.svg
new file mode 100644
index 000000000..c0f1b54ae
--- /dev/null
+++ b/loleaflet/images/lc_forward.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2.9492188 11c-.5263 0-.9492188.422919-.9492188.949219v9.101562c0 .5263.4229188.949219.9492188.949219h11.1015622c.5263 0 .949219-.422919.949219-.949219v-3.050781h-1v3h-11v-9h2v-1z" fill="#808080"/><path d="m3 12v9h11v-3h-8c-.554 0-1-.446-1-1v-5z" fill="#fff"/><rect fill="#eac282" height="15" ry="1" width="16" x="6" y="2"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_intersect.svg b/loleaflet/images/lc_intersect.svg
new file mode 100644
index 000000000..4c9bd5e72
--- /dev/null
+++ b/loleaflet/images/lc_intersect.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m10 3c-.554 0-1 .446-1 1v2h1v-2h1v-1zm2 0v1h3v-1zm4 0v1h3v-1zm4 0v1h1v1h1v-1c0-.554-.446-1-1-1zm1 3v2h1v-2zm-18 1c-.554 0-1 .446-1 1v1h1v-1h1v-1zm2 0v1h3v-1zm16 2v2h1v-2zm-19 1v2h1v-2zm19 2v2h1v-2zm-19 1v2h1v-2zm19 2v2h-1v1h1c.554 0 1-.446 1-1v-2zm-19 1v2h1v-2zm14 1v1h3v-1zm-14 2v2c0 .554.446 1 1 1h2v-1h-2v-2zm12 0v2h-2v1h2c.554 0 1-.446 1-1v-2zm-8 2v1h2v-1zm3 0v1h2v-1z" fill="#808080"/><path d="m9 7v1 9c0 .554.446 1 1 1h4 1v-1-9c0-.554-.446-1-1-1h-4zm1 1h4v9h-4z" fill="#4d82b8"/><path d="m10 8v9h4v-9z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_merge.svg b/loleaflet/images/lc_merge.svg
new file mode 100644
index 000000000..d3f5df9f8
--- /dev/null
+++ b/loleaflet/images/lc_merge.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m10 4v4h-7v13h11v-4h7v-13z" fill="#fff"/><path d="m10 3c-.554 0-1 .446-1 1v4h1v-4h11v13h-6-1v1h7c.554 0 1-.446 1-1v-13c0-.554-.446-1-1-1z" fill="#4d82b8"/><path d="m3 7c-.554 0-1 .446-1 1v13c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-4h-1v4h-11v-13h7v-1z" fill="#4d82b8"/><path d="m11 7v1h1v-1zm2 0v1h1v1h1v-1c0-.554-.446-1-1-1zm-4 2v2h1v-2zm5 1v1h1v-1zm-5 2v2h1v-2zm5 0v2h1v-2zm-5 3v2c0 .554.446 1 1 1h1v-1h-1v-2zm5 0v1h1v-1zm-2 2v1h1v-1z" fill="#808080"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_substract.svg b/loleaflet/images/lc_substract.svg
new file mode 100644
index 000000000..067dac7de
--- /dev/null
+++ b/loleaflet/images/lc_substract.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 8v13h7 4v-4h-4v-9z" fill="#fff"/><path d="m10 3c-.554 0-1 .446-1 1v2h1v-2h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v2h1v-2c0-.554-.446-1-1-1zm2 4v3h1v-3zm0 4v3h1v-3zm0 4v2h-2v1h2c.554 0 1-.446 1-1v-2zm-5 2v1h2v-1z" fill="#808080"/><path d="m3 7c-.554 0-1 .446-1 1v13c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-3-1h-1-4v-9-1h-1zm0 1h6v9c0 .554.446 1 1 1h4v3h-11z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 7d88c0512..da036bf85 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -148,6 +148,22 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:FontworkCharacterSpacingFloater'] = function() {};
this._toolitemHandlers['.uno:Paste'] = function() {};
this._toolitemHandlers['.uno:DataDataPilotRun'] = function() {};
+ this._toolitemHandlers['.uno:AdvancedMode'] = function() {};
+ this._toolitemHandlers['.uno:Shear'] = function() {};
+ this._toolitemHandlers['.uno:CrookSlant'] = function() {};
+ this._toolitemHandlers['.uno:LineEndStyle'] = function() {};
+ this._toolitemHandlers['.uno:FillShadow'] = function() {};
+ this._toolitemHandlers['.uno:BezierConvert'] = function() {};
+ this._toolitemHandlers['.uno:BezierSymmetric'] = function() {};
+ this._toolitemHandlers['.uno:BezierClose'] = function() {};
+ this._toolitemHandlers['.uno:BezierEliminatePoints'] = function() {};
+ this._toolitemHandlers['.uno:BezierMove'] = function() {};
+ this._toolitemHandlers['.uno:BezierCutLine'] = function() {};
+ this._toolitemHandlers['.uno:BezierInsert'] = function() {};
+ this._toolitemHandlers['.uno:BezierEdge'] = function() {};
+ this._toolitemHandlers['.uno:BezierDelete'] = function() {};
+ this._toolitemHandlers['.uno:BezierSmooth'] = function() {};
+ this._toolitemHandlers['.uno:GlueEditMode'] = function() {};
/*Calc: Data Tab*/
this._toolitemHandlers['.uno:DataProvider'] = function() {};
diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js b/loleaflet/src/control/Control.NotebookbarImpress.js
index e0eaa620a..91653905c 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -109,6 +109,12 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.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