This is an automated email from the ASF dual-hosted git repository. nadment pushed a commit to branch 3569 in repository https://gitbox.apache.org/repos/asf/hop.git
commit c9f5a2b0b41d27d63b98a4b5d87b73f62bfcedd0 Author: Nicolas Adment <[email protected]> AuthorDate: Tue Jan 23 22:35:01 2024 +0100 Fix some icons #3569 --- .../org/apache/hop/ui/core/gui/GuiResource.java | 12 +++++++++++ .../tabs/ConfigGeneralOptionsTab.java | 2 +- .../configuration/tabs/ConfigGuiOptionsTab.java | 2 +- ui/src/main/resources/ui/images/close-panel.svg | 24 +++++----------------- ui/src/main/resources/ui/images/hide-results.svg | 18 ++++++++-------- ui/src/main/resources/ui/images/options.svg | 23 +++++++++++++++++++++ ui/src/main/resources/ui/images/palette.svg | 12 +++++++++++ ui/src/main/resources/ui/images/show-results.svg | 23 ++++++++------------- 8 files changed, 70 insertions(+), 46 deletions(-) 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 60e8319f25..6aa2787712 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 @@ -273,6 +273,8 @@ public class GuiResource { private Image imageDown; private Image imageUp; private Image imageLocation; + private Image imageOptions; + private Image imagePalette; private Map<String, Image> imageMap; @@ -779,6 +781,8 @@ public class GuiResource { imageDown = loadAsResource(display, "ui/images/down.svg", ConstUi.SMALL_ICON_SIZE); imageUp = loadAsResource(display, "ui/images/up.svg", ConstUi.SMALL_ICON_SIZE); imageLocation = loadAsResource(display, "ui/images/location.svg", ConstUi.SMALL_ICON_SIZE); + imageOptions = loadAsResource(display, "ui/images/options.svg", ConstUi.SMALL_ICON_SIZE); + imagePalette = loadAsResource(display, "ui/images/palette.svg", ConstUi.SMALL_ICON_SIZE); // Svg image // @@ -2012,6 +2016,14 @@ public class GuiResource { return imageLocation; } + public Image getImageOptions() { + return imageOptions; + } + + public Image getImagePalette() { + return imagePalette; + } + public Image getImageAddAll() { return imageAddAll; } diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java index 32a71c12ea..4ed70b4315 100644 --- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java +++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java @@ -83,7 +83,7 @@ public class ConfigGeneralOptionsTab { int middle = props.getMiddlePct(); CTabItem wGeneralTab = new CTabItem(wTabFolder, SWT.NONE); - wGeneralTab.setImage(GuiResource.getInstance().getImageHop()); + wGeneralTab.setImage(GuiResource.getInstance().getImageOptions()); PropsUi.setLook(wGeneralTab); wGeneralTab.setText(BaseMessages.getString(PKG, "EnterOptionsDialog.General.Label")); diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGuiOptionsTab.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGuiOptionsTab.java index 868bb05b2f..1d776090be 100644 --- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGuiOptionsTab.java +++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGuiOptionsTab.java @@ -106,7 +106,7 @@ public class ConfigGuiOptionsTab { CTabItem wLookTab = new CTabItem(wTabFolder, SWT.NONE); wLookTab.setFont(GuiResource.getInstance().getFontDefault()); wLookTab.setText(BaseMessages.getString(PKG, "EnterOptionsDialog.LookAndFeel.Label")); - wLookTab.setImage(GuiResource.getInstance().getImageHopUi()); + wLookTab.setImage(GuiResource.getInstance().getImagePalette()); ScrolledComposite sLookComp = new ScrolledComposite(wTabFolder, SWT.V_SCROLL | SWT.H_SCROLL); sLookComp.setLayout(new FillLayout()); diff --git a/ui/src/main/resources/ui/images/close-panel.svg b/ui/src/main/resources/ui/images/close-panel.svg index 983f0a34fb..39c61fd2c2 100644 --- a/ui/src/main/resources/ui/images/close-panel.svg +++ b/ui/src/main/resources/ui/images/close-panel.svg @@ -1,22 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -<svg - xmlns="http://www.w3.org/2000/svg"; - enable-background="new 0 0 16 16" - viewBox="0 0 16 16" - y="0px" - x="0px" - height="16px" - width="16px" - version="1.1"> - <g> - <g> - <rect fill="none" width="16" height="16"/> - </g> - </g> - <g> - <polygon fill="#3D6380" - points="9.7,8 15,2.7 13.3,1 8,6.3 2.7,1 1,2.7 6.3,8 1,13.3 2.7,15 8,9.7 13.3,15 15,13.3 "/> - </g> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve"> +<path fill="#0F3B5A" d="M71.787,64l29.547,29.547v7.787h-7.787L64,71.787l-29.547,29.547h-7.787v-7.787L56.213,64L26.667,34.453 + v-7.787h7.787L64,56.213l29.547-29.547h7.787v7.787L71.787,64z"/> </svg> diff --git a/ui/src/main/resources/ui/images/hide-results.svg b/ui/src/main/resources/ui/images/hide-results.svg index 41c06e4104..b28d462abf 100644 --- a/ui/src/main/resources/ui/images/hide-results.svg +++ b/ui/src/main/resources/ui/images/hide-results.svg @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -<svg version="1.1" xmlns="http://www.w3.org/2000/svg"; x="0px" y="0px" - viewBox="13 13 16 16" enable-background="new 13 13 16 16"> - <g> - <path fill="#FFFFFF" - d="M14.5,14.4v13.2h13.1V14.4H14.5z M20.7,20.4h-4.7V16h4.7V20.4z M25.9,26h-4.7v-4.4h4.7V26z"/> - <path fill="#3D6380" d="M29,13.1V13H13v0.1l0,0V29h16V13.1L29,13.1z M14.5,27.6V14.4h13.1v13.2H14.5z"/> - <rect x="16.1" y="16" fill="#3D6380" width="4.7" height="4.4"/> - <rect x="21.3" y="21.6" fill="#3D6380" width="4.7" height="4.4"/> - </g> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve"> +<path fill="#0F3B5A" d="M112,21.327c0-2.549-2.021-5.333-5.334-5.333H21.333c-3.307,0-5.333,2.768-5.333,5.333v85.333 + c0,3.313,2.773,5.334,5.333,5.334h85.333c2.55,0,5.334-2.021,5.334-5.334V21.327z M24,23.994h80V74.66H24V23.994z M84.378,43.503 + c0.662-0.73,0.955-1.595,0.955-2.442c0-1.909-1.515-3.733-3.76-3.733H46.426c-2.25,0-3.76,1.824-3.76,3.733 + c0,0.848,0.293,1.712,0.949,2.442c5.238,5.809,12.891,14.315,17.174,19.072c0.816,0.906,1.979,1.419,3.205,1.419 + c1.222,0,2.39-0.513,3.205-1.414C71.482,57.818,79.141,49.316,84.378,43.503z"/> </svg> diff --git a/ui/src/main/resources/ui/images/options.svg b/ui/src/main/resources/ui/images/options.svg new file mode 100644 index 0000000000..18e90d765a --- /dev/null +++ b/ui/src/main/resources/ui/images/options.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve"> +<g> + <g> + <rect fill="#0F3B5A" fill-opacity="0" width="128" height="128"/> + <path fill="#0F3B5A" d="M101.334,48c-6.765,0.019-12.786,4.29-15.041,10.667H16c-2.945,0-5.333,2.388-5.333,5.333 + s2.388,5.334,5.333,5.334h70.293c2.945,8.33,12.088,12.696,20.418,9.751c8.332-2.946,12.697-12.087,9.752-20.418 + C114.197,52.258,108.131,47.981,101.334,48z M101.334,69.334C98.388,69.334,96,66.945,96,64s2.388-5.333,5.334-5.333 + c2.945,0,5.332,2.388,5.332,5.333S104.279,69.334,101.334,69.334z"/> + <path fill="#0F3B5A" d="M16,37.333h6.293c3.015,8.306,12.192,12.596,20.499,9.581c4.456-1.617,7.964-5.126,9.582-9.581H112 + c2.945,0,5.334-2.388,5.334-5.333s-2.389-5.333-5.334-5.333H52.374c-3.015-8.306-12.192-12.596-20.499-9.581 + c-4.455,1.617-7.964,5.126-9.581,9.581H16c-2.945,0-5.333,2.388-5.333,5.333S13.055,37.333,16,37.333z M37.333,26.667 + c2.945,0,5.333,2.388,5.333,5.333s-2.388,5.333-5.333,5.333C34.388,37.333,32,34.945,32,32S34.388,26.667,37.333,26.667z"/> + <path fill="#0F3B5A" d="M112,90.666H73.707c-3.016-8.306-12.193-12.596-20.499-9.58c-4.456,1.617-7.964,5.125-9.582,9.58H16 + c-2.945,0-5.333,2.389-5.333,5.334s2.388,5.334,5.333,5.334h27.626c3.015,8.306,12.193,12.596,20.499,9.58 + c4.455-1.617,7.964-5.125,9.582-9.58H112c2.945,0,5.334-2.389,5.334-5.334S114.945,90.666,112,90.666z M58.667,101.334 + c-2.945,0-5.333-2.389-5.333-5.334s2.388-5.334,5.333-5.334C61.612,90.666,64,93.055,64,96S61.612,101.334,58.667,101.334z"/> + </g> +</g> +</svg> diff --git a/ui/src/main/resources/ui/images/palette.svg b/ui/src/main/resources/ui/images/palette.svg new file mode 100644 index 0000000000..bd6a415c7e --- /dev/null +++ b/ui/src/main/resources/ui/images/palette.svg @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve"> +<path fill="#0F3B5A" d="M93.334,64c-4.419,0-8-3.582-8-8s3.581-8,8-8c4.418,0,8,3.582,8,8S97.752,64,93.334,64 M77.334,42.667 + c-4.419,0-8-3.582-8-8c0-4.418,3.581-8,8-8c4.418,0,8,3.582,8,8C85.334,39.085,81.752,42.667,77.334,42.667 M50.667,42.667 + c-4.418,0-8-3.582-8-8c0-4.418,3.582-8,8-8c4.418,0,8,3.582,8,8C58.667,39.085,55.085,42.667,50.667,42.667 M34.667,64 + c-4.418,0-8-3.582-8-8s3.582-8,8-8c4.418,0,8,3.582,8,8S39.085,64,34.667,64 M64,16c-26.51,0-48,21.49-48,48s21.49,48,48,48 + c4.418,0,8-3.582,8-8c0-2.08-0.8-3.947-2.08-5.334c-1.227-1.439-2.026-3.307-2.026-5.332c0-4.419,3.581-8,8-8h9.44 + c14.727,0,26.666-11.939,26.666-26.667C112,35.093,90.507,16,64,16z"/> +</svg> diff --git a/ui/src/main/resources/ui/images/show-results.svg b/ui/src/main/resources/ui/images/show-results.svg index 8d353e03b9..3eb0228089 100644 --- a/ui/src/main/resources/ui/images/show-results.svg +++ b/ui/src/main/resources/ui/images/show-results.svg @@ -1,18 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -<svg version="1.1" xmlns="http://www.w3.org/2000/svg"; x="0px" y="0px" - viewBox="13 13 16 16" enable-background="new 13 13 16 16"> - <g> - <path fill="#FFFFFF" - d="M14.4,18.5h13.2v-4.1H14.4V18.5z M21.3,15.5H26v1.9h-4.7V15.5z M15.7,15.5h4.7v1.9h-4.7V15.5z"/> - <path fill="#FFFFFF" - d="M27.6,23.5H14.4v4.1h13.2V23.5z M20.4,26.5h-4.7v-1.9h4.7V26.5z M26,26.5h-4.7v-1.9H26V26.5z"/> - <path fill="#3D6380" d="M13,13v6.9h16V13H13z M27.6,18.5H14.4v-4.1h13.2V18.5z"/> - <rect x="15.7" y="15.5" fill="#3D6380" width="4.7" height="1.9"/> - <rect x="21.3" y="15.5" fill="#3D6380" width="4.7" height="1.9"/> - <path fill="#3D6380" d="M13,29h16v-6.9H13V29z M14.4,23.5h13.2v4.1H14.4V23.5z"/> - <rect x="15.7" y="24.6" fill="#3D6380" width="4.7" height="1.9"/> - <rect x="21.3" y="24.6" fill="#3D6380" width="4.7" height="1.9"/> - </g> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve"> +<path fill="#0F3B5A" d="M112,21.333c0-2.549-2.021-5.333-5.333-5.333H21.334C18.027,16,16,18.768,16,21.333v85.333 + c0,3.313,2.773,5.334,5.334,5.334h85.333c2.549,0,5.333-2.021,5.333-5.334V21.333z M24,24h80v50.666H24V24z M43.621,57.824 + c-0.661,0.73-0.955,1.594-0.955,2.442c0,1.909,1.516,3.733,3.761,3.733h35.146c2.251,0,3.761-1.824,3.761-3.733 + c0-0.849-0.294-1.712-0.95-2.442c-5.237-5.809-12.891-14.315-17.173-19.072c-0.816-0.907-1.979-1.419-3.206-1.419 + c-1.221,0-2.389,0.512-3.206,1.413C56.518,43.509,48.859,52.011,43.621,57.824z"/> </svg>
