[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
Marco Cecchetti (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 8 10:44:55 UTC 2019
loleaflet/css/toolbar.css | 22 +++++++++++++++++++++-
loleaflet/images/lc_hyperlinkdialog.svg | 1 +
loleaflet/images/lc_insertauthoritiesentry.svg | 1 +
loleaflet/images/lc_insertcolumnbreak.svg | 14 ++++++++++++++
loleaflet/images/lc_insertcomment.svg | 2 +-
loleaflet/images/lc_insertdatefield.svg | 1 +
loleaflet/images/lc_insertendnote.svg | 1 +
loleaflet/images/lc_insertfootnote.svg | 1 +
loleaflet/images/lc_insertgraphic.svg | 1 +
loleaflet/images/lc_insertgraphicremote.svg | 1 +
loleaflet/images/lc_insertindexesentry.svg | 1 +
loleaflet/images/lc_insertmultiindex.svg | 1 +
loleaflet/images/lc_insertobjectchart.svg | 1 +
loleaflet/images/lc_insertpagebreak.svg | 1 +
loleaflet/images/lc_insertpagecountfield.svg | 1 +
loleaflet/images/lc_insertpagenumberfield.svg | 1 +
loleaflet/images/lc_insertsection.svg | 1 +
loleaflet/images/lc_inserttimefield.svg | 1 +
loleaflet/images/lc_inserttitlefield.svg | 1 +
loleaflet/images/lc_inserttopicfield.svg | 1 +
loleaflet/src/control/Control.JSDialogBuilder.js | 18 +++++++++++++++---
loleaflet/src/control/Control.Menubar.js | 8 ++++----
22 files changed, 72 insertions(+), 9 deletions(-)
New commits:
commit 172c9ca384b5e579cd6de35c6d7ca6e80142f54e
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Tue Oct 8 08:50:08 2019 +0200
Commit: Marco Cecchetti <marco.cecchetti at collabora.com>
CommitDate: Tue Oct 8 12:43:32 2019 +0200
loleaflet: adding icons to insert menu entries
Change-Id: I24664aa41f208ccd70331f37a8e1d031eefc43fd
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ccbd50fdf..021a98d3c 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -935,7 +935,7 @@ tr.useritem > td > img {
margin: 0px;
padding: 0px;
border: solid 1px #fff;
- padding-left: 74px !important;
+ padding-left: 32px !important;
display: flex;
flex-direction: row;
align-items: center;
@@ -966,6 +966,10 @@ tr.useritem > td > img {
vertical-align: middle;
}
+.sub-menu-title {
+ padding-left: 42px;
+}
+
.sub-menu-arrow {
margin-right: 40px;
background: transparent;
@@ -973,3 +977,19 @@ tr.useritem > td > img {
font-weight: bold;
color: #aaa !important;
}
+
+.menu-entry-icon {
+ width: 32px;
+ height: 32px;
+ background: transparent;
+}
+
+.menu-entry-with-icon {
+ padding-left: 10px;
+}
+
+/* Don't forget to update it when you change one of the two above!
+menu-entry-with-icon.padding-left + menu-entry-icon.width */
+.menu-entry-no-icon {
+ padding-left: 42px;
+}
\ No newline at end of file
diff --git a/loleaflet/images/lc_hyperlinkdialog.svg b/loleaflet/images/lc_hyperlinkdialog.svg
new file mode 100644
index 000000000..0aab5a02d
--- /dev/null
+++ b/loleaflet/images/lc_hyperlinkdialog.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m10.5 3a7.5 7.5 0 0 0 -7.5 7.5 7.5 7.5 0 0 0 .8730469 3.5h13.2558591a7.5 7.5 0 0 0 .871094-3.5 7.5 7.5 0 0 0 -7.5-7.5z" fill="#fff"/><g fill="#808080"><path d="m10.5 2a8.5 8.5 0 0 0 -8.5 8.5 8.5 8.5 0 0 0 .7636719 3.5h1.109375a7.5 7.5 0 0 1 -.8730469-3.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5 7.5 7.5 0 0 1 -.871094 3.5h1.105469a8.5 8.5 0 0 0 .765625-3.5 8.5 8.5 0 0 0 -8.5-8.5z"/><path d="m2.637553 10h15.845709v1h-15.845709z"/><path d="m9.5410156 2.2128906c-2.4584665 3.9164445-3.0789627 7.8785134-2.078125 11.7871094h1.015625c-1.0472131-3.729976-.482262-7.4446328 1.9101564-11.2558594z" fill-rule="evenodd"/><path d="m11.458984 2.2128906-.847656.53125c2.392419 3.8112266 2.957367 7.5258834 1.910156 11.2558594h1.015625c1.000838-3.908596.380337-7.8706648-2.078125-11.7871094z" fill-rule="evenodd"/></g><path d="m4 5.5017908c4.2087338 1.1063541 8.492323 1.5417482 13 0" fill="none" stroke="#808080"/><path d="m17.061525 1
5.008214c-.853771.129397-1.567844.693907-1.905351 1.467242-.070974.162553-.118148.345055-.156174.530704h8c-.02609-.124991-.05348-.26222-.09367-.374615-.346295-.966556-1.268692-1.623331-2.342634-1.623331h-3.12732c-.126904 0-.252859-.01848-.374815 0zm-2.061525 5.99384c.235196 1.130787 1.239282 1.997946 2.43634 1.997946h3.12732c1.197048 0 2.201154-.867159 2.43634-1.997946z" fill="#4d82b8"/><path d="m7.061525 15.008214c-.853771.129397-1.567844.693907-1.905351 1.467242-.070974.162553-.118148.345055-.156174.530704h8c-.02609-.124991-.05348-.26222-.09367-.374615-.346295-.966556-1.268692-1.623331-2.342634-1.623331h-3.12732c-.126904 0-.252859-.01848-.374815 0zm-2.061525 5.99384c.235196 1.130787 1.239282 1.997946 2.43634 1.997946h3.12732c1.197048 0 2.201154-.867159 2.43634-1.997946z" fill="#4d82b8"/><rect fill="#4d82b8" height="2" ry=".988609" width="8" x="10" y="18"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertauthoritiesentry.svg b/loleaflet/images/lc_insertauthoritiesentry.svg
new file mode 100644
index 000000000..4c999760f
--- /dev/null
+++ b/loleaflet/images/lc_insertauthoritiesentry.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3h14v18h-14z" fill="#fff"/><path d="m4.5 2c-.277 0-.653652.2695221-.5.5v1.5h-.5c-.277 0-.5.223-.5.5v3c0 .277.223.5.5.5h.5v8h-.5c-.277 0-.5.223-.5.5v3c0 .277.223.5.5.5h.5v1.5c0 .277.223.5.5.5h15c .277 0 .5-.223.5-.5v-19c0-.277-.223-.5-.5-.5zm.5 1h14v18h-14v-1.5-3-9-3z" fill="#808080"/><g fill="#d65532"><rect height="2" ry=".961864" width="8" x="8" y="13"/><path d="m8 10c-1.104522 0-2 .895478-2 2v4c0 1.104597.8954308 2 2 2h1v-1h-1c-.5522842 0-1-.447701-1-1v-.28125-3.71875c0-.552299.4267669-1 1-1h1v-1z"/><path d="m16 10c1.104522 0 2 .895478 2 2v4c0 1.104597-.895431 2-2 2h-1v-1h1c .552284 0 1-.447701 1-1v-.28125-3.71875c0-.552299-.426767-1-1-1h-1v-1z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertcolumnbreak.svg b/loleaflet/images/lc_insertcolumnbreak.svg
new file mode 100644
index 000000000..eda22cde9
--- /dev/null
+++ b/loleaflet/images/lc_insertcolumnbreak.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M 5,3 V 21 H 20 V 3 Z"
+ style="fill:#ffffff"
+ />
+ <path
+ style="fill:#808080"
+ d="M 5,2 C 4.446,2 4,2.446 4,3 v 18 c 0,0.554 0.446,1 1,1 h 15 c 0.554,0 1,-0.446 1,-1 V 3 C 21,2.446 20.554,2 20,2 Z M 5,3 H 20 V 21 H 5 Z M 6.5,5 C 6.223,5 6,5.223 6,5.5 6,5.777 6.223,6 6.5,6 h 4 C 10.777,6 11,5.777 11,5.5 11,5.223 10.777,5 10.5,5 Z m 0,4 C 6.223,9 6,9.223 6,9.5 6,9.777 6.223,10 6.5,10 h 4 C 10.777,10 11,9.777 11,9.5 11,9.223 10.777,9 10.5,9 Z m 8,0 C 14.223,9 14,9.223 14,9.5 14,9.777 14.223,10 14.5,10 h 4 C 18.777,10 19,9.777 19,9.5 19,9.223 18.777,9 18.5,9 Z m -8,3 C 6.223,12 6,12.223 6,12.5 6,12.777 6.223,13 6.5,13 h 4 C 10.777,13 11,12.777 11,12.5 11,12.223 10.777,12 10.5,12 Z m 8,0 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 4 C 18.777,13 19,12.777 19,12.5 19,12.223 18.777,12 18.5,12 Z m -8,3 C 6.223,15 6,15.223 6,15.5 6,15.777 6.223,16 6.5,16 h 4 C 10.777,16 11,15.777 11,15.5 11,15.223 10.777,15 10.5,15 Z m 8,0 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 4 C 18.777,16 19,15.777 19,15.5 19,15.223 18.777,15 18.5,15 Z m 0,3 c
-0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 4 C 18.777,19 19,18.777 19,18.5 19,18.223 18.777,18 18.5,18 Z"
+ />
+ <path
+ style="fill:#4d82b8"
+ d="M 12.5 5 C 12.223 5 12 5.223 12 5.5 L 12 18 L 8.3984375 18 C 8.1777765 18 8 18.177776 8 18.398438 L 8 18.601562 C 8 18.822224 8.1777765 19 8.3984375 19 L 12.5 19 L 12.601562 19 C 12.822224 19 13 18.822224 13 18.601562 L 13 18.5 L 13 18.398438 L 13 6 L 16.5 6 C 16.777 6 17 5.777 17 5.5 C 17 5.223 16.777 5 16.5 5 L 12.5 5 z "
+ />
+</svg>
diff --git a/loleaflet/images/lc_insertcomment.svg b/loleaflet/images/lc_insertcomment.svg
index ac434b08d..e449feccd 100644
--- a/loleaflet/images/lc_insertcomment.svg
+++ b/loleaflet/images/lc_insertcomment.svg
@@ -63,4 +63,4 @@
d="M 21.99,4 C 21.99,2.9 21.1,2 20,2 H 4 C 2.9,2 2,2.9 2,4 v 12 c 0,1.1 0.9,2 2,2 h 14 l 4,4 z M 17,11 h -4 v 4 H 11 V 11 H 7 V 9 h 4 V 5 h 2 v 4 h 4 z"
id="path1613" />
</g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertdatefield.svg b/loleaflet/images/lc_insertdatefield.svg
new file mode 100644
index 000000000..c0091b903
--- /dev/null
+++ b/loleaflet/images/lc_insertdatefield.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 6h18v14h-18z" fill="#fff"/><path d="m2 3v1 2 14c0 .554.446 1 1 1h18c .554 0 1-.446 1-1v-14-2-1h-1-18zm1 3h18v14h-10.613281-1.5625002-5.8242188z" fill="#808080"/><path d="m8 7v1.4628906c0 .1325301.049873.251106.1503906.3535156.1005174.096386.2137221.1445313.3378906.1445313h5.3378908c-.135994.1506024-.256851.3098409-.363281.4785156-.106431.1686747-.21003.3519861-.310547.5507813l-4.152344 9.0097656h1.386719c.301552 0 .537513-.07222.708984-.216797.177384-.144578.315498-.318618.416016-.523437l4.230469-9.2167972c.053215-.1144579.110794-.258895.169921-.4335938.059128-.1746988.087891-.400626.087891-.6777344v-.9316406z" fill="#808080"/><path d="m2 3h20v3h-20z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertendnote.svg b/loleaflet/images/lc_insertendnote.svg
new file mode 100644
index 000000000..021c56344
--- /dev/null
+++ b/loleaflet/images/lc_insertendnote.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-8 -4)"><path d="m11 6c-.554 0-1 .446-1 1v15c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-15c0-.554-.446-1-1-1zm0 1h9v15h-9z" fill="#808080"/><path d="m11 7h9v15h-9z" fill="#fff"/></g><g transform="translate(-4 -2)"><path d="m11 6c-.554 0-1 .446-1 1v15c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-15c0-.554-.446-1-1-1zm0 1h9v15h-9z" fill="#808080"/><path d="m11 7h9v15h-9z" fill="#fff"/></g><path d="m11 6c-.554 0-1 .446-1 1v15c0 .554.446 1 1 1h8v-1h-8v-15h9v3.283203c.296519-.175464.636031-.283203 1-.283203v-3c0-.554-.446-1-1-1z" fill="#808080"/><path d="m11 7v15h8v-8a1.0001 1.0001 0 0 1 .482422-.853516c-.252344-.334808-.482422-.702403-.482422-1.146484 0-.726734.407943-1.366449 1-1.716797v-3.283203z" fill="#fff"/><g fill="#4d82b8"><rect height="2" ry="1" width="2" x="20" y="11"/><path d="m20 14h2v9h-2z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertfootnote.svg b/loleaflet/images/lc_insertfootnote.svg
new file mode 100644
index 000000000..fb87e5561
--- /dev/null
+++ b/loleaflet/images/lc_insertfootnote.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h13v-4.892578c-.157532.018023-.317687.020854-.474609-.019531-.01639-.00417-.032669-.008672-.048829-.013672-.266932-.083795-.579671-.239065-.80664-.5625l-.47461-.646485c-.305358-.41509-.245328-.994252.138672-1.33789l1.666016-1.488282v-9.039062z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h13 .972656v-6.355469l-.066406.064453c-.02003.01975-.04088.038651-.0625.056641-.206896.170095-.516862.304399-.84375.341797v4.892578h-13v-18h13v9.039062l1-.894531v-8.144531c0-.554-.446-1-1-1z" fill="#808080"/><path d="m19.972751 22v-8.720406l-1.763785 1.712613c-.14766.121396-.292243.163885-.433751.127466-.135355-.04249-.230718-.103185-.286092-.182094l-.489123-.664643 3.662167-3.272936h1.337833v11 1h-2.027249z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertgraphic.svg b/loleaflet/images/lc_insertgraphic.svg
new file mode 100644
index 000000000..e1a05ae69
--- /dev/null
+++ b/loleaflet/images/lc_insertgraphic.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 3h18v18h-18z" fill="#fff"/><path d="m2 2v20h20v-20zm1 1h18v18h-18z" fill="#808080"/><circle cx="7.5" cy="7.5" fill="#eac282" r="2.5"/><path d="m3 21c.4875945 0 6-6 6-6l2 1.593356 5-4.593356 5 5v4z" fill="#4d82b8" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertgraphicremote.svg b/loleaflet/images/lc_insertgraphicremote.svg
new file mode 100644
index 000000000..5d380c2e7
--- /dev/null
+++ b/loleaflet/images/lc_insertgraphicremote.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 7v14h14v-9.892578l-1.542969-1.5410158c-.452851-.4382737-.556084-1.1254083-.347656-1.640625.20012-.4946799.719666-.8938566 1.318359-.9257812zm13.619141 0c .130865.0105409.25848.036637.380859.0800781v-.0800781z" fill="#fff"/><path d="m2 6v16h16v-9.894531l-1-.998047v9.892578h-14v-14h13.427734c.024855-.0013254.047146-.0117136.072266-.0117188.040181.0000043.079363.0085148.119141.0117188h.380859v.0800781c.213613.0758266.410918.1944209.572266.359375l.427734.4277344v-1.8671875z" fill="#808080"/><circle cx="6.5" cy="10.5" fill="#eac282" r="2.5"/><path d="m3 21c .4875945 0 4-5 4-5l2 1.593356 5-4.593356 3 5v3z" fill="#4d82b8" fill-rule="evenodd"/><g fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 -1 -1 0 24 17)"><path d="m8.507121 1.494946-2.9999998 2.9949499 2.9999998 3.0050501"/><path d="m5.5071212 4.4898959h9.9928788"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertindexesentry.svg b/loleaflet/images/lc_insertindexesentry.svg
new file mode 100644
index 000000000..e26fc6a01
--- /dev/null
+++ b/loleaflet/images/lc_insertindexesentry.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-14.2705905l-4-3.7294095z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-10.109375-3.6412209-.2079239c0-.4506799.09887-.4265951-.604637-1.0675892l-3.307389-3.2370335c-.709525-.7368575-.711223-.7368575-1.094804-.7368575h-.331557-.661613zm0 1h9v4c0 .554.446 1 1 1h4v13h-14z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/><g fill="#4d82b8"><rect height="2" ry="1" width="7" x="6" y="5"/><rect height="1" ry=".491011" width="8" x="6" y="9"/><rect height="1" ry=".473034" width="2" x="16" y="9"/><rect height="1" ry=".491011" width="8" x="6" y="12"/><rect height="1" ry=".473034" width="2" x="16" y="12"/><rect height="1" ry=".491011" width="8" x="6" y="15"/><rect height="1" ry=".473034" width="2" x="16" y="15"/><rect height="1" ry=".491011" width="8" x="6" y="18"/><rect height="1" ry=".473034" width="2" x="16" y="18"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertmultiindex.svg b/loleaflet/images/lc_insertmultiindex.svg
new file mode 100644
index 000000000..e26fc6a01
--- /dev/null
+++ b/loleaflet/images/lc_insertmultiindex.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-14.2705905l-4-3.7294095z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-10.109375-3.6412209-.2079239c0-.4506799.09887-.4265951-.604637-1.0675892l-3.307389-3.2370335c-.709525-.7368575-.711223-.7368575-1.094804-.7368575h-.331557-.661613zm0 1h9v4c0 .554.446 1 1 1h4v13h-14z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/><g fill="#4d82b8"><rect height="2" ry="1" width="7" x="6" y="5"/><rect height="1" ry=".491011" width="8" x="6" y="9"/><rect height="1" ry=".473034" width="2" x="16" y="9"/><rect height="1" ry=".491011" width="8" x="6" y="12"/><rect height="1" ry=".473034" width="2" x="16" y="12"/><rect height="1" ry=".491011" width="8" x="6" y="15"/><rect height="1" ry=".473034" width="2" x="16" y="15"/><rect height="1" ry=".491011" width="8" x="6" y="18"/><rect height="1" ry=".473034" width="2" x="16" y="18"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertobjectchart.svg b/loleaflet/images/lc_insertobjectchart.svg
new file mode 100644
index 000000000..75f0e4c60
--- /dev/null
+++ b/loleaflet/images/lc_insertobjectchart.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect fill="#4d82b8" height="15" ry="1" width="5" x="2" y="7"/><rect fill="#808080" height="12" ry="1" width="5" x="16" y="10"/><rect fill="#eac282" height="20" ry="1" width="5" x="9" y="2"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertpagebreak.svg b/loleaflet/images/lc_insertpagebreak.svg
new file mode 100644
index 000000000..801cbc546
--- /dev/null
+++ b/loleaflet/images/lc_insertpagebreak.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="#4d82b8"><path d="m1.495667 8.999133c-.275368.0011-.498022.22463-.498047.5v5c-.000621.424388.494386.65657.820312.384766l3-2.5c.24089-.199955.24089-.569577 0-.769532l-3-2.5c-.09052-.07512-.204633-.115924-.322265-.115234z"/><rect height="2" ry="1" width="4" x="6" y="11"/><rect height="2" ry="1" width="4" x="12" y="11"/><rect height="2" ry="1" width="4" x="18" y="11"/></g><path d="m7 14c-.554 0-1 .446-1 1v7h1v-7h14v7h1v-7c0-.554-.446-1-1-1z" fill="#808080"/><path d="m7 15h14v7h-14z" fill="#fff"/><path d="m7 10c-.554 0-1-.446-1-1v-7h1v7h14v-7h1v7c0 .554-.446 1-1 1z" fill="#808080"/><path d="m7-9h14v7h-14z" fill="#fff" transform="scale(1 -1)"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertpagecountfield.svg b/loleaflet/images/lc_insertpagecountfield.svg
new file mode 100644
index 000000000..58ac27e81
--- /dev/null
+++ b/loleaflet/images/lc_insertpagecountfield.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m13 4c0 1.0907028-.909297 2-2 2v1c1.090703 0 2 .9092972 2 2 0 1.090703-.909297 2-2 2 0 1.090703-.909297 2-2 2-1.0907028 0-2-.909297-2-2h-1c0 .726734-.4079429 1.366449-1 1.716797v8.283203h6.283203c-.175464-.296519-.283203-.636031-.283203-1 0-1.090703.909297-2 2-2v-1c-1.090703 0-2-.909297-2-2s.909297-2 2-2c0-1.090703.909297-2 2-2s2 .909297 2 2h1c0-.726734.407943-1.366449 1-1.716797v-3.5546874l-4-3.7285156zm-7 2v1h1v-1zm11 11v1h1v-1z" fill="#fff"/><path d="m12.716797 3c.175464.2965194.283203.6360307.283203 1h1v4c0 .554.446 1 1 1h4v2.283203c.296519-.175464.636031-.283203 1-.283203v-2.75-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109zm-7.716797 9.716797c-.2965194.175464-.6360307.283203-1 .283203v8c0 .554.446 1 1 1h8c-.726734 0-1.366449-.407943-1.716797-1h-6.283203z" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule
="evenodd"/><g fill="#4d82b8"><path d="m15 12c-.554 0-1 .446-1 1v1h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v3h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v1c0 .554.446 1 1 1s1-.446 1-1v-1h3v1c0 .554.446 1 1 1s1-.446 1-1v-1h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-3h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-1c0-.554-.446-1-1-1s-1 .446-1 1v1h-3v-1c0-.554-.446-1-1-1zm1 4h3v3h-3z"/><path d="m4 1c-.554 0-1 .446-1 1v1h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v3h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v1c0 .554.446 1 1 1s1-.446 1-1v-1h3v1c0 .554.446 1 1 1s1-.446 1-1v-1h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-3h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-1c0-.554-.446-1-1-1s-1 .446-1 1v1h-3v-1c0-.554-.446-1-1-1zm1 4h3v3h-3z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertpagenumberfield.svg b/loleaflet/images/lc_insertpagenumberfield.svg
new file mode 100644
index 000000000..a2d6d0003
--- /dev/null
+++ b/loleaflet/images/lc_insertpagenumberfield.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 4v17h6.283203c-.175464-.296519-.283203-.636031-.283203-1 0-1.090703.909297-2 2-2v-1c-1.090703 0-2-.909297-2-2s.909297-2 2-2c0-1.090703.909297-2 2-2s2 .909297 2 2h1c0-.726734.407943-1.366449 1-1.716797v-3.5546874l-4-3.7285156zm12 13v1h1v-1z" fill="#fff"/><path d="m5 3c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h8c-.726734 0-1.366449-.407943-1.716797-1h-6.283203v-17h9v4c0 .554.446 1 1 1h4v2.283203c.296519-.175464.636031-.283203 1-.283203v-2.75-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109z" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m15 12c-.554 0-1 .446-1 1v1h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v3h-1c-.554 0-1 .446-1 1s.446 1 1 1h1v1c0 .554.446 1 1 1s1-.446 1-1v-1h3v1c0 .554.446 1 1 1s1-.446 1-1v-1h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-3h1c.554 0 1-.446 1-1s-.446-1-1-1h-1v-1c0-.554-.446-1-
1-1s-1 .446-1 1v1h-3v-1c0-.554-.446-1-1-1zm1 4h3v3h-3z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertsection.svg b/loleaflet/images/lc_insertsection.svg
new file mode 100644
index 000000000..b59684546
--- /dev/null
+++ b/loleaflet/images/lc_insertsection.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-14.2705905l-4-3.7294095z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-10.109375-3.6412209-.2079239c0-.4506799.09887-.4265951-.604637-1.0675892l-3.307389-3.2370335c-.709525-.7368575-.711223-.7368575-1.094804-.7368575h-.331557-.661613zm0 1h9v4c0 .554.446 1 1 1h4v13h-14z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/><rect fill="#808080" height="1" ry=".5" width="7" x="6" y="5"/><rect fill="#808080" height="1" ry=".5" width="7" x="6" y="8"/><g fill="#4d82b8"><rect height="1" ry=".5" width="5" x="6" y="11"/><rect height="1" ry=".5" width="5" x="13" y="11"/><rect height="1" ry=".5" width="5" x="6" y="14"/><rect height="1" ry=".5" width="5" x="13" y="14"/></g><rect fill="#808080" height="1" ry=".482023" width="12" x="6" y="17"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_inserttimefield.svg b/loleaflet/images/lc_inserttimefield.svg
new file mode 100644
index 000000000..451441911
--- /dev/null
+++ b/loleaflet/images/lc_inserttimefield.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" fill="#fff" r="9"/><g fill="#808080"><path d="m12 2a10 10 0 0 0 -10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0 -10-10zm0 1a9 9 0 0 1 9 9 9 9 0 0 1 -9 9 9 9 0 0 1 -9-9 9 9 0 0 1 9-9z"/><rect height="9" ry=".5" width="1" x="11" y="4"/><rect height="1" ry=".5" width="8" x="11" y="12"/></g></svg>
diff --git a/loleaflet/images/lc_inserttitlefield.svg b/loleaflet/images/lc_inserttitlefield.svg
new file mode 100644
index 000000000..4883eca24
--- /dev/null
+++ b/loleaflet/images/lc_inserttitlefield.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-14.2705905l-4-3.7294095z" fill="#4d82b8"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-10.109375-3.6412209-.2079239c0-.4506799.09887-.4265951-.604637-1.0675892l-3.307389-3.2370335c-.709525-.7368575-.711223-.7368575-1.094804-.7368575h-.331557-.661613zm0 1h9v4c0 .554.446 1 1 1h4v13h-14z" fill="#808080"/><g fill="#fff"><path d="m15 7h4l-4-4z" fill-rule="evenodd"/><rect height="2" ry="1" width="6" x="9" y="10"/><rect height="1" ry=".5" width="10" x="7" y="14"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_inserttopicfield.svg b/loleaflet/images/lc_inserttopicfield.svg
new file mode 100644
index 000000000..a7a17eec4
--- /dev/null
+++ b/loleaflet/images/lc_inserttopicfield.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.5 2.5v6h-4l-3.0000045 13h3.0000045l2-10h2v5h11.999995v-14z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 825112cae..a3f920b48 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -405,11 +405,23 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
}
- var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + builder._currentDepth + ' mobile-wizard ui-widget', parentContainer);
- sectionTitle.innerHTML = title;
+ var menuEntry = L.DomUtil.create('div', 'ui-header level-' + builder._currentDepth + ' mobile-wizard ui-widget', parentContainer);
+
+ var icon = null;
+ var commandName = data.command ? data.command.substring('.uno:'.length) : data.id;
+ if (commandName && commandName.length) {
+ var iconSpan = L.DomUtil.create('span', 'menu-entry-icon', menuEntry);
+ var iconPath = 'images/lc_' + commandName.toLowerCase() + '.svg';
+ icon = L.DomUtil.create('img', '', iconSpan);
+ icon.src = iconPath;
+ }
+ var titleSpan = L.DomUtil.create('span', '', menuEntry);
+ titleSpan.innerHTML = title;
+ var paddingClass = icon ? 'menu-entry-with-icon' : 'menu-entry-no-icon';
+ L.DomUtil.addClass(titleSpan, paddingClass);
if (builder.wizard) {
- $(sectionTitle).click(function() {
+ $(menuEntry).click(function() {
if (data.executionType === 'action') {
builder.map.menubar._executeAction(undefined, data.id);
} else {
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index fbeba7af1..a2a2fc5d9 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -105,7 +105,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertPagebreak'},
{uno: '.uno:InsertColumnBreak'},
{type: 'separator'},
- {name: _UNO('.uno:HyperlinkDialog'), id: 'hyperlink', type: 'action'},
+ {name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
{uno: '.uno:InsertSymbol', mobile: false},
{name: _UNO('.uno:FormattingMarkMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertNonBreakingSpace'},
@@ -296,7 +296,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertAnnotation', 'presentation'), id: 'insertcomment', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{type: 'separator'},
- {name: _UNO('.uno:HyperlinkDialog'), id: 'hyperlink', type: 'action'},
+ {name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
{type: 'separator'},
{uno: '.uno:InsertSymbol'},
{type: 'separator'},
@@ -390,7 +390,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertObjectChart'},
{name: _UNO('.uno:InsertAnnotation', 'spreadsheet'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
- {name: _UNO('.uno:HyperlinkDialog'), id: 'hyperlink', type: 'action'},
+ {name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
{uno: '.uno:InsertSymbol', mobile: false},
{uno: '.uno:EditHeaderAndFooter', mobile: false}
]},
@@ -894,7 +894,7 @@ L.Control.Menubar = L.Control.extend({
});
} else if (id === 'about') {
this._map.showLOAboutDialog();
- } else if (id === 'hyperlink') {
+ } else if (id === 'inserthyperlink') {
this._map.showHyperlinkDialog();
} else if (id === 'keyboard-shortcuts') {
this._map.showLOKeyboardHelp();
More information about the Libreoffice-commits
mailing list