You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/12/26 22:41:23 UTC
[incubator-hop] branch master updated: HOP-2353 Add method
getImage(IValueMeta) in GuiResource class
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new d0c7c09 HOP-2353 Add method getImage(IValueMeta) in GuiResource class
new 6c3131b Merge pull request #496 from nadment/HOP-2353
d0c7c09 is described below
commit d0c7c0953e15288c6610e77a3d676120f3262876
Author: nadment <na...@gmail.com>
AuthorDate: Sat Dec 26 19:07:36 2020 +0100
HOP-2353 Add method getImage(IValueMeta) in GuiResource class
- Update color for value meta images
- Change Boolean value meta image
- Javascript input fields with type image
---
core/src/main/resources/images/binary.svg | 240 ++++++++++-----------
core/src/main/resources/images/boolean.svg | 100 +++------
core/src/main/resources/images/date.svg | 164 +++++++-------
core/src/main/resources/images/inet.svg | 178 +++++++--------
core/src/main/resources/images/number.svg | 124 +++++------
core/src/main/resources/images/string.svg | 160 +++++++-------
core/src/main/resources/images/timestamp.svg | 46 +++-
.../javascript/ScriptValuesMetaModDialog.java | 15 +-
.../org/apache/hop/ui/core/gui/GuiResource.java | 53 ++++-
9 files changed, 530 insertions(+), 550 deletions(-)
diff --git a/core/src/main/resources/images/binary.svg b/core/src/main/resources/images/binary.svg
index f579170..8928af0 100644
--- a/core/src/main/resources/images/binary.svg
+++ b/core/src/main/resources/images/binary.svg
@@ -1,156 +1,148 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="42px"
- height="42px"
- viewBox="0 0 42 42"
- enable-background="new 0 0 42 42"
- xml:space="preserve"
- inkscape:version="0.91 r13725"
- sodipodi:docname="binary.svg"
- inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\Binary.png"
+ inkscape:export-ydpi="34.285713"
inkscape:export-xdpi="34.285713"
- inkscape:export-ydpi="34.285713"><metadata
+ inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\Binary.png"
+ sodipodi:docname="binary.svg"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ xml:space="preserve"
+ enable-background="new 0 0 42 42"
+ viewBox="0 0 42 42"
+ height="42px"
+ width="42px"
+ y="0px"
+ x="0px"
+ id="Layer_1"
+ version="1.1"><metadata
id="metadata13"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs11" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="3440"
- inkscape:window-height="1387"
- id="namedview9"
- showgrid="false"
- inkscape:zoom="16"
- inkscape:cx="-22.770458"
- inkscape:cy="25.762108"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:document-rotation="0"
+ inkscape:current-layer="Layer_1"
inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 28.984209,36.338312 c -0.286074,-0.07104 -0.511126,-0.257296 -0.593925,-0.491539 -0.03334,-0.09432 -0.04266,-0.41272 -0.04266,-1.457736 l 0,-1.337061 0.0868,-0.173031 c 0.167515,-0.333916 0.443824,-0.455261 1.030035,-0.452355 0.429846,0.0021 0.658873,0.07304 0.848553,0.262719 0.214873,0.214873 0.221096,0.262481 0.221096,1.691401 0,0.831077 -0.01215,1.318576 -0.03513,1.409847 -0.04745,0.188441 -0.236132,0.396206 -0.443455,0.488307 -0.141403,0.06282 -0.225328,0.07502 -0.559605,0. [...]
- id="path4153"
- inkscape:connector-curvature="0" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 29.476296,37.842568 c -0.152117,-0.346003 -0.291333,-0.632623 -0.309369,-0.636935 -0.01804,-0.0043 -0.160207,-0.03138 -0.315935,-0.06016 -0.71041,-0.131266 -1.190619,-0.541199 -1.354277,-1.156085 -0.06721,-0.25252 -0.06618,-2.924222 0.0012,-3.183016 0.147702,-0.567066 0.559327,-0.952539 1.206966,-1.130283 0.329364,-0.09039 1.107994,-0.0966 1.435958,-0.01144 0.619721,0.160914 1.040175,0.52758 1.221131,1.064912 0.06232,0.18505 0.06686,0.274559 0.07748,1.527562 0.01263,1.490313 -0 [...]
- id="path4161"
- inkscape:connector-curvature="0" /><g
- id="g4291"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4293"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4295"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4297"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4299"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4301"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4303"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4305"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4307"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4309"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4311"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4313"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4315"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4317"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4319"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4428"
+ inkscape:window-y="-8"
+ inkscape:window-x="-8"
+ inkscape:cy="25.762108"
+ inkscape:cx="-22.770458"
+ inkscape:zoom="16"
+ showgrid="false"
+ id="namedview9"
+ inkscape:window-height="1387"
+ inkscape:window-width="3440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4291" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4293" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4295" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4297" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4299" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4301" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4303" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4305" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4307" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4309" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4311" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4313" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4315" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4317" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4319" /><g
+ style="fill:#0e3a29;fill-opacity:1"
transform="matrix(0.1501431,0,0,0.12892384,1.3417068,3.9398084)"
- style="fill:#3d6480;fill-opacity:1"><g
- id="g4372"
- style="fill:#3d6480;fill-opacity:1"><path
- id="path4374"
+ id="g4428"><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4372"><path
+ style="fill:#0e3a29;fill-opacity:1"
+ inkscape:connector-curvature="0"
d="m 37.984,161.696 c 0,4.142 3.358,7.5 7.5,7.5 4.142,0 7.5,-3.358 7.5,-7.5 l 0,-58.627 c 0,-3.034 -1.827,-5.768 -4.63,-6.929 -2.801,-1.16 -6.028,-0.519 -8.173,1.626 L 21.177,116.77 c -2.929,2.929 -2.929,7.678 0,10.606 2.929,2.929 7.678,2.929 10.606,0 l 6.201,-6.201 0,40.521 z"
+ id="path4374" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4376"
d="m 82.279,31.807 6.201,-6.201 0,40.521 c 0,4.142 3.358,7.5 7.5,7.5 4.142,0 7.5,-3.358 7.5,-7.5 l 0,-58.627 c 0,-3.034 -1.827,-5.768 -4.63,-6.929 -2.801,-1.16 -6.028,-0.519 -8.173,1.626 L 71.673,21.201 c -2.929,2.929 -2.929,7.678 0,10.606 2.929,2.929 7.678,2.929 10.606,0 z"
+ id="path4376" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4378"
d="m 167.815,96.14 c -2.801,-1.16 -6.028,-0.519 -8.173,1.626 l -19.004,19.004 c -2.929,2.929 -2.929,7.678 0,10.606 2.929,2.929 7.678,2.929 10.606,0 l 6.201,-6.201 0,40.521 c 0,4.142 3.358,7.5 7.5,7.5 4.142,0 7.5,-3.358 7.5,-7.5 l 0,-58.627 c 0,-3.033 -1.827,-5.768 -4.63,-6.929 z"
+ id="path4378" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4380"
d="m 135.217,188.445 c -2.801,-1.16 -6.028,-0.519 -8.173,1.626 l -19.004,19.004 c -2.929,2.929 -2.929,7.678 0,10.606 2.929,2.929 7.678,2.929 10.606,0 l 6.201,-6.201 0,22.197 c 0,4.142 3.358,7.5 7.5,7.5 4.142,0 7.5,-3.358 7.5,-7.5 l 0,-40.303 c 0,-3.034 -1.827,-5.768 -4.63,-6.929 z"
+ id="path4380" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4382"
d="m 122.504,143.42 0,-22.074 c 0,-14.213 -11.563,-25.776 -25.776,-25.776 l -0.369,0 c -14.213,0 -25.776,11.563 -25.776,25.776 l 0,22.074 c 0,14.213 11.563,25.776 25.776,25.776 l 0.369,0 c 14.213,0 25.776,-11.563 25.776,-25.776 z m -15,0 c 0,5.942 -4.834,10.776 -10.776,10.776 l -0.369,0 c -5.942,0 -10.776,-4.834 -10.776,-10.776 l 0,-22.074 c 0,-5.942 4.834,-10.776 10.776,-10.776 l 0.369,0 c 5.942,0 10.776,4.834 10.776,10.776 l 0,22.074 z"
+ id="path4382" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4384"
d="m 216.745,95.569 -0.369,0 c -14.213,0 -25.776,11.563 -25.776,25.776 l 0,22.074 c 0,14.213 11.563,25.776 25.776,25.776 l 0.369,0 c 14.213,0 25.776,-11.563 25.776,-25.776 l 0,-22.074 c 0,-14.212 -11.563,-25.776 -25.776,-25.776 z m 10.776,47.851 c 0,5.942 -4.834,10.776 -10.776,10.776 l -0.369,0 c -5.942,0 -10.776,-4.834 -10.776,-10.776 l 0,-22.074 c 0,-5.942 4.834,-10.776 10.776,-10.776 l 0.369,0 c 5.942,0 10.776,4.834 10.776,10.776 l 0,22.074 z"
+ id="path4384" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4386"
d="m 147.224,0 -0.369,0 c -14.213,0 -25.776,11.563 -25.776,25.776 l 0,22.074 c 0,14.213 11.563,25.776 25.776,25.776 l 0.369,0 c 4.142,0 7.5,-3.358 7.5,-7.5 0,-4.142 -3.358,-7.5 -7.5,-7.5 l -0.369,0 c -5.942,0 -10.776,-4.834 -10.776,-10.776 l 0,-22.074 C 136.079,19.834 140.913,15 146.855,15 l 0.369,0 c 5.942,0 10.776,4.834 10.776,10.776 0,4.142 3.358,7.5 7.5,7.5 4.142,0 7.5,-3.358 7.5,-7.5 C 173.001,11.563 161.438,0 147.224,0 Z"
+ id="path4386" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4388"
d="m 216.745,0 -0.369,0 C 202.163,0 190.6,11.563 190.6,25.776 l 0,22.074 c 0,14.213 11.563,25.776 25.776,25.776 l 0.369,0 c 14.213,0 25.776,-11.563 25.776,-25.776 l 0,-22.074 C 242.521,11.563 230.958,0 216.745,0 Z m 10.776,47.851 c 0,5.942 -4.834,10.776 -10.776,10.776 l -0.369,0 c -5.942,0 -10.776,-4.834 -10.776,-10.776 l 0,-22.075 C 205.6,19.834 210.434,15 216.376,15 l 0.369,0 c 5.942,0 10.776,4.834 10.776,10.776 l 0,22.075 z"
+ id="path4388" /><path
+ style="fill:#0e3a29;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4390"
d="m 61.682,187.874 -0.369,0 c -14.213,0 -25.776,11.563 -25.776,25.776 l 0,22.074 c 0,14.213 11.563,25.776 25.776,25.776 l 0.369,0 c 14.213,0 25.776,-11.563 25.776,-25.776 l 0,-22.074 C 87.459,199.438 75.896,187.874 61.682,187.874 Z m 10.777,47.851 c 0,5.942 -4.834,10.776 -10.776,10.776 l -0.369,0 c -5.942,0 -10.776,-4.834 -10.776,-10.776 l 0,-22.075 c 0,-5.942 4.834,-10.776 10.776,-10.776 l 0.369,0 c 5.942,0 10.776,4.834 10.776,10.776 l 0,22.075 z"
- inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /></g><g
- id="g4392"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4394"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4396"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4398"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4400"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4402"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4404"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4406"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4408"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4410"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4412"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4414"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4416"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4418"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4420"
- style="fill:#3d6480;fill-opacity:1" /></g></svg>
\ No newline at end of file
+ id="path4390" /></g><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4392" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4394" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4396" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4398" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4400" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4402" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4404" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4406" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4408" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4410" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4412" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4414" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4416" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4418" /><g
+ style="fill:#0e3a29;fill-opacity:1"
+ id="g4420" /></g></svg>
diff --git a/core/src/main/resources/images/boolean.svg b/core/src/main/resources/images/boolean.svg
index 6c4503b..5df1095 100644
--- a/core/src/main/resources/images/boolean.svg
+++ b/core/src/main/resources/images/boolean.svg
@@ -1,28 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
- id="Layer_1"
x="0px"
y="0px"
- width="42px"
- height="42px"
- viewBox="0 0 42 42"
- enable-background="new 0 0 42 42"
+ viewBox="0 0 1000 1000"
+ enable-background="new 0 0 1000 1000"
xml:space="preserve"
- inkscape:version="0.91 r13725"
- sodipodi:docname="boolean.svg"><metadata
- id="metadata13"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
- id="defs11" /><sodipodi:namedview
+ id="svg2"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="boolean.svg"><defs
+ id="defs16" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
@@ -33,69 +27,25 @@
inkscape:pageshadow="2"
inkscape:window-width="3440"
inkscape:window-height="1387"
- id="namedview9"
+ id="namedview14"
showgrid="false"
- inkscape:zoom="11.313708"
- inkscape:cx="-24.8624"
- inkscape:cy="26.105632"
+ inkscape:zoom="0.472"
+ inkscape:cx="266.21966"
+ inkscape:cy="1394.7761"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 28.984209,36.338312 c -0.286074,-0.07104 -0.511126,-0.257296 -0.593925,-0.491539 -0.03334,-0.09432 -0.04266,-0.41272 -0.04266,-1.457736 l 0,-1.337061 0.0868,-0.173031 c 0.167515,-0.333916 0.443824,-0.455261 1.030035,-0.452355 0.429846,0.0021 0.658873,0.07304 0.848553,0.262719 0.214873,0.214873 0.221096,0.262481 0.221096,1.691401 0,0.831077 -0.01215,1.318576 -0.03513,1.409847 -0.04745,0.188441 -0.236132,0.396206 -0.443455,0.488307 -0.141403,0.06282 -0.225328,0.07502 -0.559605,0. [...]
- id="path4153"
- inkscape:connector-curvature="0" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 29.476296,37.842568 c -0.152117,-0.346003 -0.291333,-0.632623 -0.309369,-0.636935 -0.01804,-0.0043 -0.160207,-0.03138 -0.315935,-0.06016 -0.71041,-0.131266 -1.190619,-0.541199 -1.354277,-1.156085 -0.06721,-0.25252 -0.06618,-2.924222 0.0012,-3.183016 0.147702,-0.567066 0.559327,-0.952539 1.206966,-1.130283 0.329364,-0.09039 1.107994,-0.0966 1.435958,-0.01144 0.619721,0.160914 1.040175,0.52758 1.221131,1.064912 0.06232,0.18505 0.06686,0.274559 0.07748,1.527562 0.01263,1.490313 -0 [...]
- id="path4161"
- inkscape:connector-curvature="0" /><path
- style="fill:#3d6480;fill-opacity:1"
- inkscape:connector-curvature="0"
- d="m 31.979786,14.241812 -2.408449,-2.431421 c -0.16962,-0.171211 -0.470868,-0.171211 -0.640104,0 L 17.540601,23.307834 13.406786,19.135643 c -0.169236,-0.17121 -0.470101,-0.17121 -0.640104,0 l -2.40845,2.431034 c -0.08519,0.08599 -0.13278,0.201812 -0.13278,0.323054 0,0.121241 0.04759,0.237448 0.13278,0.323053 l 6.862317,6.926278 c 0.08826,0.0887 0.203774,0.134024 0.320052,0.134024 0.11551,0 0.231788,-0.04455 0.320052,-0.134024 L 31.979786,14.887531 c 0.08519,-0.08561 0.133163,-0.20 [...]
- id="path4151" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4153"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4155"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4157"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4159"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4161"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4163"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4165"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4167"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4169"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4171"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4173"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4175"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4177"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4179"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /><g
- style="fill:#3d6480;fill-opacity:1"
- id="g4181"
- transform="matrix(0.38375555,0,0,0.38735405,2.228629,1.713835)" /></svg>
\ No newline at end of file
+ inkscape:current-layer="svg2"
+ inkscape:document-rotation="0" /><metadata
+ id="metadata4"> Svg Vector Icons : http://www.onlinewebfonts.com/icon <rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><path
+ style="fill:#0e3a5a;fill-opacity:1;stroke-width:0.740164;stroke-linecap:round;stroke-linejoin:round"
+ d="M 108.31751,875.80277 83.155527,849.35896 466.00581,466.50864 848.8561,83.658306 875.888,110.6589 c 14.86754,14.85034 27.0319,27.40603 27.0319,27.90156 0,0.73123 -315.68657,314.10806 -703.33829,698.19243 l -66.10195,65.49367 z"
+ id="path837" /><path
+ style="fill:#0e3a5a;fill-opacity:1;stroke-width:0.740164;stroke-linecap:round;stroke-linejoin:round"
+ d="m 165.94768,431.37437 c -49.85333,-41.13182 -90.641184,-75.39365 -90.639675,-76.13738 0,-1.57365 44.255115,-60.54114 45.484265,-60.60954 0.4537,-0.0253 29.74595,23.61156 65.09391,52.52625 l 64.26911,52.57216 68.52591,-67.48819 c 37.68941,-37.11852 94.87466,-93.92455 127.07861,-126.23564 32.2038,-32.3111 64.40321,-64.126 71.55413,-70.69979 l 13.00155,-11.95235 24.90745,27.99301 c 13.69907,15.39615 24.90745,28.59933 24.90745,29.34039 0,0.74107 -72.79659,74.27639 -161.77023,163.4118 [...]
+ id="path839" /><path
+ style="fill:#0e3a5a;fill-opacity:1;stroke-width:0.740164;stroke-linecap:round;stroke-linejoin:round"
+ d="m 807.98123,859.05588 c -34.46294,-33.83772 -63.17301,-61.52311 -63.80029,-61.52311 -0.62729,0 -28.04389,26.85534 -60.92582,59.67854 l -59.78534,59.67854 -17.9448,-18.76684 c -9.86966,-10.32176 -23.34899,-24.61156 -29.95404,-31.75512 l -12.00925,-12.98827 61.01783,-57.57503 61.01768,-57.57503 -55.67447,-54.90045 -55.67461,-54.90045 26.03142,-28.21554 c 14.31727,-15.51854 26.61935,-28.08726 27.33805,-27.93048 0.71854,0.15678 27.21032,25.32902 58.87052,55.93832 l 57.56405,55.65326 [...]
+ id="path841" /></svg>
diff --git a/core/src/main/resources/images/date.svg b/core/src/main/resources/images/date.svg
index 95926ca..5820599 100644
--- a/core/src/main/resources/images/date.svg
+++ b/core/src/main/resources/images/date.svg
@@ -1,102 +1,102 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="42px"
- height="42px"
- viewBox="0 0 42 42"
- enable-background="new 0 0 42 42"
- xml:space="preserve"
- inkscape:version="0.91 r13725"
- sodipodi:docname="date.svg"
- inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\Date.png"
+ inkscape:export-ydpi="34.285713"
inkscape:export-xdpi="34.285713"
- inkscape:export-ydpi="34.285713"><metadata
+ inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\Date.png"
+ sodipodi:docname="date.svg"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ xml:space="preserve"
+ enable-background="new 0 0 42 42"
+ viewBox="0 0 42 42"
+ height="42px"
+ width="42px"
+ y="0px"
+ x="0px"
+ id="Layer_1"
+ version="1.1"><metadata
id="metadata13"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs11" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="3440"
- inkscape:window-height="1387"
- id="namedview9"
- showgrid="false"
- inkscape:zoom="7.9999999"
- inkscape:cx="-53.618082"
- inkscape:cy="37.440954"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:document-rotation="0"
+ inkscape:current-layer="Layer_1"
inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 28.984209,36.338312 c -0.286074,-0.07104 -0.511126,-0.257296 -0.593925,-0.491539 -0.03334,-0.09432 -0.04266,-0.41272 -0.04266,-1.457736 l 0,-1.337061 0.0868,-0.173031 c 0.167515,-0.333916 0.443824,-0.455261 1.030035,-0.452355 0.429846,0.0021 0.658873,0.07304 0.848553,0.262719 0.214873,0.214873 0.221096,0.262481 0.221096,1.691401 0,0.831077 -0.01215,1.318576 -0.03513,1.409847 -0.04745,0.188441 -0.236132,0.396206 -0.443455,0.488307 -0.141403,0.06282 -0.225328,0.07502 -0.559605,0. [...]
+ inkscape:window-y="-8"
+ inkscape:window-x="-8"
+ inkscape:cy="37.440954"
+ inkscape:cx="-53.618082"
+ inkscape:zoom="7.9999999"
+ showgrid="false"
+ id="namedview9"
+ inkscape:window-height="1387"
+ inkscape:window-width="3440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" /><path
+ inkscape:connector-curvature="0"
id="path4153"
- inkscape:connector-curvature="0" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 29.476296,37.842568 c -0.152117,-0.346003 -0.291333,-0.632623 -0.309369,-0.636935 -0.01804,-0.0043 -0.160207,-0.03138 -0.315935,-0.06016 -0.71041,-0.131266 -1.190619,-0.541199 -1.354277,-1.156085 -0.06721,-0.25252 -0.06618,-2.924222 0.0012,-3.183016 0.147702,-0.567066 0.559327,-0.952539 1.206966,-1.130283 0.329364,-0.09039 1.107994,-0.0966 1.435958,-0.01144 0.619721,0.160914 1.040175,0.52758 1.221131,1.064912 0.06232,0.18505 0.06686,0.274559 0.07748,1.527562 0.01263,1.490313 -0 [...]
+ d="m 28.984209,36.338312 c -0.286074,-0.07104 -0.511126,-0.257296 -0.593925,-0.491539 -0.03334,-0.09432 -0.04266,-0.41272 -0.04266,-1.457736 l 0,-1.337061 0.0868,-0.173031 c 0.167515,-0.333916 0.443824,-0.455261 1.030035,-0.452355 0.429846,0.0021 0.658873,0.07304 0.848553,0.262719 0.214873,0.214873 0.221096,0.262481 0.221096,1.691401 0,0.831077 -0.01215,1.318576 -0.03513,1.409847 -0.04745,0.188441 -0.236132,0.396206 -0.443455,0.488307 -0.141403,0.06282 -0.225328,0.07502 -0.559605,0. [...]
+ style="opacity:1;fill:#0e3a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+ inkscape:connector-curvature="0"
id="path4161"
- inkscape:connector-curvature="0" /><g
- id="g4256"
+ d="m 29.476296,37.842568 c -0.152117,-0.346003 -0.291333,-0.632623 -0.309369,-0.636935 -0.01804,-0.0043 -0.160207,-0.03138 -0.315935,-0.06016 -0.71041,-0.131266 -1.190619,-0.541199 -1.354277,-1.156085 -0.06721,-0.25252 -0.06618,-2.924222 0.0012,-3.183016 0.147702,-0.567066 0.559327,-0.952539 1.206966,-1.130283 0.329364,-0.09039 1.107994,-0.0966 1.435958,-0.01144 0.619721,0.160914 1.040175,0.52758 1.221131,1.064912 0.06232,0.18505 0.06686,0.274559 0.07748,1.527562 0.01263,1.490313 -0 [...]
+ style="opacity:1;fill:#0e3a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
transform="matrix(0.07208092,0,0,0.06731016,3.7768468,4.3730769)"
- style="fill:#3d6480;fill-opacity:1"><g
- id="g4211"
- style="fill:#3d6480;fill-opacity:1"><g
- id="_x35_4_37_"
- style="fill:#3d6480;fill-opacity:1"><g
- id="g4214"
- style="fill:#3d6480;fill-opacity:1"><path
- id="path4216"
+ id="g4256"><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4211"><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="_x35_4_37_"><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4214"><path
+ style="fill:#0e3a5a;fill-opacity:1"
+ inkscape:connector-curvature="0"
d="m 392.771,39.249 -24.462,0 0,-18.471 C 368.309,9.305 359.006,0 347.53,0 l -7.552,0 C 328.502,0 319.2,9.305 319.2,20.778 l 0,18.471 -145.355,0 0,-18.471 C 173.845,9.305 164.542,0 153.066,0 l -7.552,0 c -11.476,0 -20.777,9.305 -20.777,20.778 l 0,18.471 -32.845,0 c -30.932,0 -56.096,25.165 -56.096,56.096 l 0,333.222 c 0,30.932 25.164,56.096 56.096,56.096 l 300.879,0 c 30.932,0 56.096,-25.165 56.096,-56.096 l 0,-333.221 C 448.866,64.414 423.702,39.249 392.771,39.249 Z m 22.31 [...]
+ id="path4216" /><path
+ style="fill:#0e3a5a;fill-opacity:1"
inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /><path
- id="path4218"
d="m 239.642,327.275 c 11.083,-6.787 22.739,-13.348 34.958,-19.685 12.217,-6.332 23.418,-13.405 33.6,-21.212 10.183,-7.806 18.551,-16.912 25.115,-27.32 6.561,-10.405 9.843,-23.19 9.843,-38.353 0,-12.441 -2.322,-23.36 -6.957,-32.752 -4.642,-9.386 -11.2,-17.14 -19.687,-23.249 -8.483,-6.109 -18.667,-10.691 -30.545,-13.746 -11.88,-3.055 -24.945,-4.582 -39.201,-4.582 -15.839,0 -30.152,2.265 -42.934,6.788 -12.785,4.529 -23.588,11.147 -32.412,19.854 -8.824,8.713 -15.39,19.404 -19.6 [...]
- inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1" /></g></g></g><g
- id="g4220"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4222"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4224"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4226"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4228"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4230"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4232"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4234"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4236"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4238"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4240"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4242"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4244"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4246"
- style="fill:#3d6480;fill-opacity:1" /><g
- id="g4248"
- style="fill:#3d6480;fill-opacity:1" /></g></svg>
\ No newline at end of file
+ id="path4218" /></g></g></g><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4220" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4222" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4224" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4226" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4228" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4230" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4232" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4234" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4236" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4238" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4240" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4242" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4244" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4246" /><g
+ style="fill:#0e3a5a;fill-opacity:1"
+ id="g4248" /></g></svg>
diff --git a/core/src/main/resources/images/inet.svg b/core/src/main/resources/images/inet.svg
index edfd004..8e2e4af 100644
--- a/core/src/main/resources/images/inet.svg
+++ b/core/src/main/resources/images/inet.svg
@@ -3,105 +3,91 @@
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xml:space="preserve"
- style="enable-background:new 0 0 32.667 32.667;"
- viewBox="0 0 32.667 32.667"
- height="32px"
- width="32px"
- y="0px"
- x="0px"
- id="Capa_1"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="inet.svg"
- inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\inet.png"
+ inkscape:export-ydpi="45"
inkscape:export-xdpi="45"
- inkscape:export-ydpi="45"><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1755"
- inkscape:window-height="906"
- id="namedview34"
- showgrid="false"
- inkscape:zoom="7.375"
- inkscape:cx="-42.440678"
- inkscape:cy="16"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="Capa_1" /><metadata
- id="metadata41"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
- id="defs39" /><g
- id="g7" /><g
- id="g9" /><g
- id="g11" /><g
- id="g13" /><g
- id="g15" /><g
- id="g17" /><g
- id="g19" /><g
- id="g21" /><g
- id="g23" /><g
- id="g25" /><g
- id="g27" /><g
- id="g29" /><g
- id="g31" /><g
- id="g33" /><g
- id="g35" /><path
- id="path4720"
- d="M 15.323038,30.174721 C 6.8053101,29.410409 1.0359576,20.847357 3.3668065,12.42891 4.8736305,6.9866365 9.7912184,2.82198 15.240222,2.373432 c 5.879191,-0.4839599 11.118174,2.5465214 13.640219,7.890163 0.999334,2.117364 1.242636,3.261182 1.246967,5.862276 0.0036,2.133983 -0.01208,2.258917 -0.428807,3.427434 -0.574645,1.611315 -1.177154,2.595509 -2.263858,3.69799 -3.008161,3.051838 -7.238802,2.917631 -11.3277,-0.359347 -2.02326,-1.621507 -5.990519,-5.983865 -6.7197471,-7.388965 -0. [...]
- style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none;stroke-width:0.13841949" /><path
- id="path6157"
- d="M 15.373524,30.241532 C 9.4590171,29.71631 4.4948993,25.325331 3.1495566,19.4289 2.8853336,18.270851 2.8351108,17.767701 2.8344804,16.272355 2.8338783,14.84428 2.8624579,14.512311 3.0789071,13.433196 3.661589,10.528214 5.2289355,7.7554878 7.3851999,5.8151154 9.463012,3.9453407 11.86391,2.8004883 14.603655,2.3730424 c 0.792794,-0.123689 2.557731,-0.1513354 3.401239,-0.053278 4.178127,0.4857059 7.800699,2.7691866 10.093626,6.3624972 0.376858,0.5905832 1.062626,1.9731474 1.304089,2. [...]
- style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none" /><path
- id="path6159"
- d="M 15.373524,30.241532 C 9.4590171,29.71631 4.4948993,25.325331 3.1495566,19.4289 2.8853336,18.270851 2.8351108,17.767701 2.8344804,16.272355 2.8338783,14.84428 2.8624579,14.512311 3.0789071,13.433196 3.661589,10.528214 5.2289355,7.7554878 7.3851999,5.8151154 9.463012,3.9453407 11.86391,2.8004883 14.603655,2.3730424 c 0.792794,-0.123689 2.557731,-0.1513354 3.401239,-0.053278 4.178127,0.4857059 7.800699,2.7691866 10.093626,6.3624972 0.376858,0.5905832 1.062626,1.9731474 1.304089,2. [...]
- style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none" /><path
- id="path6161"
- d="M 15.373524,30.241532 C 9.4590171,29.71631 4.4948993,25.325331 3.1495566,19.4289 2.8853336,18.270851 2.8351108,17.767701 2.8344804,16.272355 2.8338783,14.84428 2.8624579,14.512311 3.0789071,13.433196 3.661589,10.528214 5.2289355,7.7554878 7.3851999,5.8151154 9.463012,3.9453407 11.86391,2.8004883 14.603655,2.3730424 c 0.792794,-0.123689 2.557731,-0.1513354 3.401239,-0.053278 4.178127,0.4857059 7.800699,2.7691866 10.093626,6.3624972 0.376858,0.5905832 1.062626,1.9731474 1.304089,2. [...]
- style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none" /><path
- id="path6163"
- d="M 15.373524,30.241532 C 9.4590171,29.71631 4.4948993,25.325331 3.1495566,19.4289 2.8853336,18.270851 2.8351108,17.767701 2.8344804,16.272355 2.8338783,14.84428 2.8624579,14.512311 3.0789071,13.433196 3.661589,10.528214 5.2289355,7.7554878 7.3851999,5.8151154 9.463012,3.9453407 11.86391,2.8004883 14.603655,2.3730424 c 0.792794,-0.123689 2.557731,-0.1513354 3.401239,-0.053278 4.178127,0.4857059 7.800699,2.7691866 10.093626,6.3624972 0.376858,0.5905832 1.062626,1.9731474 1.304089,2. [...]
- style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none" /><path
- id="path6165"
- d="M -6.2573729,30.241532 C -12.17188,29.71631 -17.135997,25.325331 -18.48134,19.4289 c -0.264223,-1.158049 -0.314446,-1.661199 -0.315076,-3.156545 -6.02e-4,-1.428075 0.02798,-1.760044 0.244426,-2.839159 0.582682,-2.904982 2.150029,-5.6777082 4.306293,-7.6180806 2.077812,-1.8697747 4.4787102,-3.0146271 7.2184556,-3.442073 0.7927934,-0.123689 2.5577307,-0.1513354 3.4012382,-0.053278 4.17812765,0.4857059 7.8006994,2.7691866 10.0936268,6.3624972 0.3768572,0.5905832 1.0626262,1.9731474 [...]
- style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none" /><path
- id="path6167"
- d="M -6.2573729,30.241532 C -12.17188,29.71631 -17.135997,25.325331 -18.48134,19.4289 c -0.264223,-1.158049 -0.314446,-1.661199 -0.315076,-3.156545 -6.02e-4,-1.428075 0.02798,-1.760044 0.244426,-2.839159 0.582682,-2.904982 2.150029,-5.6777082 4.306293,-7.6180806 2.077812,-1.8697747 4.4787102,-3.0146271 7.2184556,-3.442073 0.7927934,-0.123689 2.5577307,-0.1513354 3.4012382,-0.053278 4.17812765,0.4857059 7.8006994,2.7691866 10.0936268,6.3624972 0.3768572,0.5905832 1.0626262,1.9731474 [...]
- style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none" /><text
- transform="scale(1.007243,0.99280908)"
- id="text4142"
- y="443.45764"
+ inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\inet.png"
+ sodipodi:docname="inet.svg"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ version="1.1"
+ id="Capa_1"
+ x="0px"
+ y="0px"
+ width="32px"
+ height="32px"
+ viewBox="0 0 32.667 32.667"
+ style="enable-background:new 0 0 32.667 32.667;"
+ xml:space="preserve"><sodipodi:namedview
+ inkscape:document-rotation="0"
+ inkscape:current-layer="Capa_1"
+ inkscape:window-maximized="1"
+ inkscape:window-y="-8"
+ inkscape:window-x="-8"
+ inkscape:cy="16"
+ inkscape:cx="16.5094"
+ inkscape:zoom="7.375"
+ showgrid="false"
+ id="namedview34"
+ inkscape:window-height="1387"
+ inkscape:window-width="3440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" /><metadata
+ id="metadata41"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+ id="defs39" /><g
+ id="g7" /><g
+ id="g9" /><g
+ id="g11" /><g
+ id="g13" /><g
+ id="g15" /><g
+ id="g17" /><g
+ id="g19" /><g
+ id="g21" /><g
+ id="g23" /><g
+ id="g25" /><g
+ id="g27" /><g
+ id="g29" /><g
+ id="g31" /><g
+ id="g33" /><g
+ id="g35" /><path
+ style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none"
+ d="M -6.2573729,30.241532 C -12.17188,29.71631 -17.135997,25.325331 -18.48134,19.4289 c -0.264223,-1.158049 -0.314446,-1.661199 -0.315076,-3.156545 -6.02e-4,-1.428075 0.02798,-1.760044 0.244426,-2.839159 0.582682,-2.904982 2.150029,-5.6777082 4.306293,-7.6180806 2.077812,-1.8697747 4.4787102,-3.0146271 7.2184556,-3.442073 0.7927934,-0.123689 2.5577307,-0.1513354 3.4012382,-0.053278 4.17812765,0.4857059 7.8006994,2.7691866 10.0936268,6.3624972 0.3768572,0.5905832 1.0626262,1.9731474 1. [...]
+ id="path6165" /><path
+ style="opacity:0;fill:#3d6480;fill-opacity:1;stroke:none"
+ d="M -6.2573729,30.241532 C -12.17188,29.71631 -17.135997,25.325331 -18.48134,19.4289 c -0.264223,-1.158049 -0.314446,-1.661199 -0.315076,-3.156545 -6.02e-4,-1.428075 0.02798,-1.760044 0.244426,-2.839159 0.582682,-2.904982 2.150029,-5.6777082 4.306293,-7.6180806 2.077812,-1.8697747 4.4787102,-3.0146271 7.2184556,-3.442073 0.7927934,-0.123689 2.5577307,-0.1513354 3.4012382,-0.053278 4.17812765,0.4857059 7.8006994,2.7691866 10.0936268,6.3624972 0.3768572,0.5905832 1.0626262,1.9731474 1. [...]
+ id="path6167" /><text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:94.0045px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ x="-353.44058"
+ y="443.45764"
+ id="text4142"
+ transform="scale(1.007243,0.99280908)"><tspan
+ id="tspan4144"
x="-353.44058"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:94.00445557px;line-height:127.99999714%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.17499995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- xml:space="preserve"><tspan
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.17499995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- y="443.45764"
- x="-353.44058"
- id="tspan4144">URL</tspan></text>
+ y="443.45764"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.175;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">URL</tspan></text>
<text
- transform="scale(1.0453657,0.95660303)"
- id="text4169"
- y="27.364719"
- x="2.4858203"
- style="font-style:normal;font-weight:normal;font-size:33.93386459px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#3d6480;fill-opacity:1;stroke:none;stroke-width:12.26218224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- xml:space="preserve"
- sodipodi:linespacing="125%"
- inkscape:export-xdpi="95.617126"
- inkscape:export-ydpi="95.617126"><tspan
- transform="matrix(0.76601202,0,0,0.89791264,-5.9646353,2.9852619)"
- style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Trebuchet MS';-inkscape-font-specification:'Trebuchet MS Italic';fill:#3d6480;fill-opacity:1;stroke-width:14.78539467;stroke-miterlimit:4;stroke-dasharray:none"
- y="27.364719"
- x="2.4858203"
- id="tspan4171">@</tspan></text>
-</svg>
\ No newline at end of file
+ inkscape:export-ydpi="95.617126"
+ inkscape:export-xdpi="95.617126"
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:33.9339px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0e3a5a;fill-opacity:1;stroke:none;stroke-width:12.2622;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ x="2.3534081"
+ y="27.22002"
+ id="text4169"
+ transform="scale(1.0453657,0.95660303)"><tspan
+ id="tspan4171"
+ x="2.3534081"
+ y="27.22002"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Trebuchet MS';-inkscape-font-specification:'Trebuchet MS Italic';fill:#0e3a5a;fill-opacity:1;stroke-width:14.7854;stroke-miterlimit:4;stroke-dasharray:none"
+ transform="matrix(0.76601202,0,0,0.89791264,-5.9646353,2.9852619)">@</tspan></text>
+</svg>
diff --git a/core/src/main/resources/images/number.svg b/core/src/main/resources/images/number.svg
index 221a491..2050dcc 100644
--- a/core/src/main/resources/images/number.svg
+++ b/core/src/main/resources/images/number.svg
@@ -1,78 +1,70 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="42px"
- height="42px"
- viewBox="0 0 42 42"
- enable-background="new 0 0 42 42"
- xml:space="preserve"
- inkscape:version="0.91 r13725"
- sodipodi:docname="number.svg"
- inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\Number.png"
+ inkscape:export-ydpi="34.285713"
inkscape:export-xdpi="34.285713"
- inkscape:export-ydpi="34.285713"><metadata
- id="metadata13"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
- id="defs11" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="3440"
- inkscape:window-height="1387"
- id="namedview9"
- showgrid="false"
- inkscape:zoom="11.313708"
- inkscape:cx="-46.87237"
- inkscape:cy="34.292824"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 28.984209,36.338312 c -0.286074,-0.07104 -0.511126,-0.257296 -0.593925,-0.491539 -0.03334,-0.09432 -0.04266,-0.41272 -0.04266,-1.457736 l 0,-1.337061 0.0868,-0.173031 c 0.167515,-0.333916 0.443824,-0.455261 1.030035,-0.452355 0.429846,0.0021 0.658873,0.07304 0.848553,0.262719 0.214873,0.214873 0.221096,0.262481 0.221096,1.691401 0,0.831077 -0.01215,1.318576 -0.03513,1.409847 -0.04745,0.188441 -0.236132,0.396206 -0.443455,0.488307 -0.141403,0.06282 -0.225328,0.07502 -0.559605,0. [...]
- id="path4153"
- inkscape:connector-curvature="0" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 29.476296,37.842568 c -0.152117,-0.346003 -0.291333,-0.632623 -0.309369,-0.636935 -0.01804,-0.0043 -0.160207,-0.03138 -0.315935,-0.06016 -0.71041,-0.131266 -1.190619,-0.541199 -1.354277,-1.156085 -0.06721,-0.25252 -0.06618,-2.924222 0.0012,-3.183016 0.147702,-0.567066 0.559327,-0.952539 1.206966,-1.130283 0.329364,-0.09039 1.107994,-0.0966 1.435958,-0.01144 0.619721,0.160914 1.040175,0.52758 1.221131,1.064912 0.06232,0.18505 0.06686,0.274559 0.07748,1.527562 0.01263,1.490313 -0 [...]
- id="path4161"
- inkscape:connector-curvature="0" /><text
- xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
- x="-109.95511"
+ inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\Number.png"
+ sodipodi:docname="number.svg"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ xml:space="preserve"
+ enable-background="new 0 0 42 42"
+ viewBox="0 0 42 42"
+ height="42px"
+ width="42px"
+ y="0px"
+ x="0px"
+ id="Layer_1"
+ version="1.1"><metadata
+ id="metadata13"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+ id="defs11" /><sodipodi:namedview
+ inkscape:document-rotation="0"
+ inkscape:current-layer="Layer_1"
+ inkscape:window-maximized="0"
+ inkscape:window-y="6"
+ inkscape:window-x="-10"
+ inkscape:cy="34.292824"
+ inkscape:cx="-46.87237"
+ inkscape:zoom="11.313708"
+ showgrid="false"
+ id="namedview9"
+ inkscape:window-height="1198"
+ inkscape:window-width="1440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" /><text
+ id="text4136"
+ y="-7.6742535"
+ x="-109.95511"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve"><tspan
+ style="font-size:40px;line-height:1.25"
y="-7.6742535"
- id="text4136"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan4138"
- x="-109.95511"
- y="-7.6742535">#</tspan></text>
+ x="-109.95511"
+ id="tspan4138"
+ sodipodi:role="line">#</tspan></text>
<text
- xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:47.39477539px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#3d6480;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- x="0.22867462"
+ transform="scale(1.120183,0.89271126)"
+ id="text4141"
+ y="40.908997"
+ x="0.22867462"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0e3a5a;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+ xml:space="preserve"><tspan
+ style="font-size:47.3948px;line-height:1.25;fill:#0e3a5a;fill-opacity:1;"
y="40.908997"
- id="text4141"
- sodipodi:linespacing="125%"
- transform="scale(1.120183,0.89271126)"><tspan
- sodipodi:role="line"
- id="tspan4143"
- x="0.22867462"
- y="40.908997">#</tspan></text>
-</svg>
\ No newline at end of file
+ x="0.22867462"
+ id="tspan4143"
+ sodipodi:role="line">#</tspan></text>
+</svg>
diff --git a/core/src/main/resources/images/string.svg b/core/src/main/resources/images/string.svg
index 51dfcff..ba40611 100644
--- a/core/src/main/resources/images/string.svg
+++ b/core/src/main/resources/images/string.svg
@@ -1,102 +1,94 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="42px"
- height="42px"
- viewBox="0 0 42 42"
- enable-background="new 0 0 42 42"
- xml:space="preserve"
- inkscape:version="0.91 r13725"
- sodipodi:docname="string.svg"
- inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\String.png"
+ inkscape:export-ydpi="34.285713"
inkscape:export-xdpi="34.285713"
- inkscape:export-ydpi="34.285713"><metadata
+ inkscape:export-filename="C:\eclipse\workspace\pdi-expression-plugin\src\main\resources\String.png"
+ sodipodi:docname="string.svg"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ xml:space="preserve"
+ enable-background="new 0 0 42 42"
+ viewBox="0 0 42 42"
+ height="42px"
+ width="42px"
+ y="0px"
+ x="0px"
+ id="Layer_1"
+ version="1.1"><metadata
id="metadata13"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs11" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="3440"
- inkscape:window-height="1387"
- id="namedview9"
- showgrid="false"
- inkscape:zoom="16"
- inkscape:cx="-8.1173682"
- inkscape:cy="24.053477"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:document-rotation="0"
+ inkscape:current-layer="Layer_1"
inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 28.984209,36.338312 c -0.286074,-0.07104 -0.511126,-0.257296 -0.593925,-0.491539 -0.03334,-0.09432 -0.04266,-0.41272 -0.04266,-1.457736 l 0,-1.337061 0.0868,-0.173031 c 0.167515,-0.333916 0.443824,-0.455261 1.030035,-0.452355 0.429846,0.0021 0.658873,0.07304 0.848553,0.262719 0.214873,0.214873 0.221096,0.262481 0.221096,1.691401 0,0.831077 -0.01215,1.318576 -0.03513,1.409847 -0.04745,0.188441 -0.236132,0.396206 -0.443455,0.488307 -0.141403,0.06282 -0.225328,0.07502 -0.559605,0. [...]
- id="path4153"
- inkscape:connector-curvature="0" /><path
- style="opacity:1;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 29.476296,37.842568 c -0.152117,-0.346003 -0.291333,-0.632623 -0.309369,-0.636935 -0.01804,-0.0043 -0.160207,-0.03138 -0.315935,-0.06016 -0.71041,-0.131266 -1.190619,-0.541199 -1.354277,-1.156085 -0.06721,-0.25252 -0.06618,-2.924222 0.0012,-3.183016 0.147702,-0.567066 0.559327,-0.952539 1.206966,-1.130283 0.329364,-0.09039 1.107994,-0.0966 1.435958,-0.01144 0.619721,0.160914 1.040175,0.52758 1.221131,1.064912 0.06232,0.18505 0.06686,0.274559 0.07748,1.527562 0.01263,1.490313 -0 [...]
- id="path4161"
- inkscape:connector-curvature="0" /><g
- id="g4279"
- transform="matrix(0.07129873,0,0,0.09929455,2.9318982,0.25153639)"
- style="fill:#3d6480;fill-opacity:1"
+ inkscape:window-y="-8"
+ inkscape:window-x="-8"
+ inkscape:cy="24.053477"
+ inkscape:cx="-8.1173682"
+ inkscape:zoom="16"
+ showgrid="false"
+ id="namedview9"
+ inkscape:window-height="1387"
+ inkscape:window-width="3440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" /><g
+ inkscape:export-ydpi="41.939152"
inkscape:export-xdpi="41.939152"
- inkscape:export-ydpi="41.939152"><path
- inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1"
+ style="fill:#0e3a5a;fill-opacity:1"
+ transform="matrix(0.07129873,0,0,0.09929455,2.9318982,0.25153639)"
+ id="g4279"><path
+ id="path4281"
d="m 106.856,323.536 c 0.344,-9.88 1.704,-23.2 3.072,-37.48 l -1.032,0 c -16.352,30.664 -38.16,41.224 -59.28,41.224 -29.64,0 -49.064,-23.2 -49.064,-56.552 0,-56.56 39.52,-116.856 116.856,-116.856 16.968,0.08 33.84,2.6 50.088,7.496 l -17,86.496 c -4.744,24.928 -7.032,50.256 -6.816,75.632 l -36.824,0.04 z m 16.352,-137.264 c -5.36,-1.24 -10.848,-1.808 -16.352,-1.704 -36.8,0 -65.072,41.224 -65.072,79.048 0,17.376 6.472,31.68 23.84,31.68 18.4,0 40.888,-23.2 48.728,-65.416 l 8.856,-43.608 z"
- id="path4281" /><path
- inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1"
+ style="fill:#0e3a5a;fill-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ id="path4283"
d="m 266.64,81.64 -20.8,100.504 0.68,0 c 12.552,-17.656 32.84,-28.184 54.504,-28.272 35.44,0 50.088,28.952 50.088,58.592 0,52.472 -36.12,114.824 -106.976,114.824 -34.752,0 -55.536,-14.648 -55.2,-44.632 0.16,-9.608 1.184,-19.192 3.064,-28.616 l 34.76,-172.4 39.88,0 z m -35.096,174.392 c -1.336,6.504 -1.904,13.136 -1.704,19.768 -0.992,10.728 6.896,20.232 17.632,21.224 1.504,0.136 3.024,0.104 4.52,-0.104 34.752,0 57.6,-44.624 57.6,-76.992 0,-18.4 -7.832,-33.736 -26.232,-33.736 -20.44 [...]
- id="path4283" /><path
- inkscape:connector-curvature="0"
- style="fill:#3d6480;fill-opacity:1"
+ style="fill:#0e3a5a;fill-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ id="path4285"
d="m 487.416,317.744 c -15.04,6.488 -31.32,9.632 -47.696,9.192 -41.6,0 -67.12,-26.568 -67.12,-66.096 -1.144,-57.928 44.896,-105.816 102.824,-106.96 0.928,-0.016 1.848,-0.024 2.776,-0.016 11.552,-0.032 23.008,2.168 33.728,6.472 l -10.232,31.008 c -7.824,-3.488 -16.312,-5.24 -24.872,-5.12 -38.496,0 -62.688,35.44 -62.688,69.84 0,24.872 14.312,38.84 36.456,38.84 12.24,-0.04 24.328,-2.712 35.44,-7.832 l 1.384,30.672 z"
- id="path4285" /></g><g
- id="g4291"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4293"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4295"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4297"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4299"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4301"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4303"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4305"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4307"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4309"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4311"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4313"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4315"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4317"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /><g
- id="g4319"
- transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)" /></svg>
\ No newline at end of file
+ style="fill:#0e3a5a;fill-opacity:1"
+ inkscape:connector-curvature="0" /></g><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4291" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4293" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4295" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4297" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4299" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4301" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4303" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4305" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4307" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4309" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4311" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4313" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4315" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4317" /><g
+ transform="matrix(0.38266263,0,0,0.36430952,-237.61523,-110.48342)"
+ id="g4319" /></svg>
diff --git a/core/src/main/resources/images/timestamp.svg b/core/src/main/resources/images/timestamp.svg
index be9cfb8..9269241 100644
--- a/core/src/main/resources/images/timestamp.svg
+++ b/core/src/main/resources/images/timestamp.svg
@@ -3,21 +3,45 @@
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- id="svg2"
- xml:space="preserve"
- enable-background="new 0 0 1000 1000"
- viewBox="0 0 1000 1000"
- y="0px"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="timestamp.svg"
+ version="1.1"
x="0px"
- version="1.1"><defs
+ y="0px"
+ viewBox="0 0 1000 1000"
+ enable-background="new 0 0 1000 1000"
+ xml:space="preserve"
+ id="svg2"><sodipodi:namedview
+ inkscape:current-layer="svg2"
+ inkscape:window-maximized="0"
+ inkscape:window-y="0"
+ inkscape:window-x="0"
+ inkscape:cy="323.14486"
+ inkscape:cx="54.399152"
+ inkscape:zoom="0.504"
+ showgrid="false"
+ id="namedview7"
+ inkscape:window-height="1048"
+ inkscape:window-width="2273"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff" /><defs
id="defs12" /><metadata
id="metadata4"> Svg Vector Icons : http://www.onlinewebfonts.com/icon <rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><path
- id="path4150"
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><path
+ style="opacity:1;fill:#0e3a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 473.51112,880.0201 C 377.96166,870.69728 298.64206,831.96127 230.72825,761.45635 198.57756,728.07899 180.55375,702.00792 160.53872,659.92853 56.185517,440.53724 174.46264,183.96263 410.23191,118.27757 c 60.8846,-16.96239 133.64421,-16.49944 199.62604,1.27017 130.16911,35.05594 235.58455,142.48139 271.8546,277.03815 8.29015,30.75526 8.98008,38.2997 8.90691,97.39631 -0.0723,58.51968 -0.84575,66.92647 -8.94303,97.2249 -15.47401,57.90084 -49.59785,120.34287 -91.06708,166.64062 -51. [...]
- style="opacity:1;fill:#3d6480;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
- id="path4152"
+ id="path4150" /><path
+ style="opacity:1;fill:#0e3a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 479.36511,529.13833 -8.8276,-6.98772 0,-135.92789 c 0,-127.07581 0.40237,-136.42793 6.17854,-143.60633 7.49305,-9.31206 25.00466,-10.3323 33.34717,-1.94283 5.09186,5.12053 5.88315,18.64894 7.37866,126.15062 l 1.67516,120.415 119.56361,0.88523 119.56362,0.88524 6.91068,8.84109 c 9.0861,11.62419 8.72397,19.89951 -1.31281,29.9998 l -8.22349,8.27551 -133.71298,0 c -130.20077,0 -133.94483,-0.18354 -142.54056,-6.98772 z"
- style="opacity:1;fill:#3d6480;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.01181126;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
\ No newline at end of file
+ id="path4152" /></svg>
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
index 9f4e141..b2f32da 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
@@ -1526,20 +1526,13 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
// String strItemToAdd="";
for ( int i = 0; i < rowPrevTransformFields.size(); i++ ) {
- IValueMeta v = rowPrevTransformFields.getValueMeta( i );
- strItemToAddOut = v.getName() + ".setValue(var)";
- strItemInToAdd = v.getName();
+ IValueMeta valueMeta = rowPrevTransformFields.getValueMeta( i );
+ strItemToAddOut = valueMeta.getName() + ".setValue(var)";
+ strItemInToAdd = valueMeta.getName();
TreeItem itemFields = new TreeItem( iteminput, SWT.NULL );
- itemFields.setImage( GuiResource.getInstance().getImageLabel() ); // TODO: Replace me with value meta image
+ itemFields.setImage( GuiResource.getInstance().getImage(valueMeta) );
itemFields.setText( strItemInToAdd );
itemFields.setData( strItemInToAdd );
-
- /*
- * switch(v.getType()){ case IValueMeta.TYPE_STRING : case IValueMeta.TYPE_NUMBER : case
- * IValueMeta.TYPE_INTEGER: case IValueMeta.TYPE_DATE : case
- * IValueMeta.TYPE_BOOLEAN: strItemToAdd=v.getName()+".setValue(var)"; break; default:
- * strItemToAdd=v.getName(); break; }
- */
}
TreeItem itemFields = new TreeItem( itemoutput, SWT.NULL );
itemFields.setData( "" );
diff --git a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
index d047442..6ec7148 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
@@ -27,6 +27,8 @@ import org.apache.hop.core.plugins.IPlugin;
import org.apache.hop.core.plugins.IPluginTypeListener;
import org.apache.hop.core.plugins.PluginRegistry;
import org.apache.hop.core.plugins.TransformPluginType;
+import org.apache.hop.core.row.IValueMeta;
+import org.apache.hop.core.row.value.ValueMetaPluginType;
import org.apache.hop.ui.core.ConstUi;
import org.apache.hop.ui.core.PropsUi;
import org.apache.hop.ui.util.SwtSvgImageUtil;
@@ -48,7 +50,6 @@ import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Hashtable;
@@ -151,6 +152,9 @@ public class GuiResource {
private Map<String, SwtUniversalImage> imagesActions;
+ private Map<String, Image> imagesValueMeta;
+
+
private SwtUniversalImage imageLogo;
private SwtUniversalImage imageDisabledHop;
private SwtUniversalImage imageConnection;
@@ -366,6 +370,7 @@ public class GuiResource {
loadCommonImages();
loadTransformImages();
loadWorkflowActionImages();
+ loadValueMetaImages();
}
private void dispose( boolean reload ) {
@@ -521,6 +526,8 @@ public class GuiResource {
// Dispose of the images in the map
disposeImages( imageMap.values() );
+
+ disposeImages (imagesValueMeta.values() );
}
}
@@ -796,6 +803,40 @@ public class GuiResource {
}
}
+ /**
+ * Load all IValueMeta images from files.
+ */
+ private void loadValueMetaImages() {
+
+ imagesValueMeta = new HashMap<>();
+ PluginRegistry registry = PluginRegistry.getInstance();
+ List<IPlugin> plugins = registry.getPlugins(ValueMetaPluginType.class);
+ for (IPlugin plugin : plugins) {
+ Image image = null;
+ try {
+ ClassLoader classLoader = registry.getClassLoader( plugin );
+ image = SwtSvgImageUtil.getImage(
+ Display.getCurrent(),
+ classLoader,
+ plugin.getImageFile(),
+ ConstUi.SMALL_ICON_SIZE,
+ ConstUi.SMALL_ICON_SIZE);
+ } catch (Throwable t) {
+ log.logError(
+ "Error occurred loading image [" + plugin.getImageFile() + "] for plugin " + plugin.getIds()[0],
+ t);
+ } finally {
+ if (image == null) {
+ log.logError(
+ "Unable to load image [" + plugin.getImageFile() + "] for plugin " + plugin.getIds()[0]);
+ image = this.imageLabel;
+ }
+ }
+
+ imagesValueMeta.put(plugin.getIds()[ 0 ], image);
+ }
+ }
+
/**
* @return Returns the colorBackground.
*/
@@ -1077,6 +1118,16 @@ public class GuiResource {
public Map<String, SwtUniversalImage> getImagesActions() {
return imagesActions;
}
+
+ /**
+ * Return the image of the IValueMeta from plugin
+ *
+ * @return image
+ */
+ public Image getImage(IValueMeta valueMeta) {
+ if ( valueMeta==null ) return this.imageLabel;
+ return imagesValueMeta.get(String.valueOf(valueMeta.getType()));
+ }
/**
* @return the fontLarge