This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new a6c2d4c27b Marketplace icons #7793 (#7794)
a6c2d4c27b is described below
commit a6c2d4c27b2c8ffc459355eddf77a3e21a3c84c7
Author: Nicolas Adment <[email protected]>
AuthorDate: Wed Aug 5 22:10:21 2026 +0200
Marketplace icons #7793 (#7794)
---
.../apache/hop/marketplace/gui/HopEnvironmentDialog.java | 10 +++++++---
.../org/apache/hop/marketplace/gui/MarketplaceDialog.java | 6 +++---
.../apache/hop/marketplace/gui/MarketplaceGuiPlugin.java | 4 ++--
.../main/java/org/apache/hop/ui/core/gui/GuiResource.java | 15 ++++++++++++++-
ui/src/main/resources/ui/images/client-environment.svg | 3 +++
ui/src/main/resources/ui/images/dependence.svg | 3 +++
ui/src/main/resources/ui/images/marketplace.svg | 3 +++
ui/src/main/resources/ui/images/plugin.svg | 12 +++---------
ui/src/main/resources/ui/images/repository.svg | 3 +++
9 files changed, 41 insertions(+), 18 deletions(-)
diff --git
a/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/HopEnvironmentDialog.java
b/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/HopEnvironmentDialog.java
index 3036c7085c..dec6c41b1a 100644
---
a/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/HopEnvironmentDialog.java
+++
b/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/HopEnvironmentDialog.java
@@ -156,7 +156,7 @@ public class HopEnvironmentDialog extends Dialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL |
SWT.RESIZE | SWT.MAX);
PropsUi.setLook(shell);
- shell.setImage(GuiResource.getInstance().getImageHopUi());
+ shell.setImage(GuiResource.getInstance().getImageClientEnvironment());
updateTitle();
FormLayout formLayout = new FormLayout();
@@ -194,6 +194,7 @@ public class HopEnvironmentDialog extends Dialog {
fdNew.left = new FormAttachment(0, 0);
fdNew.top = new FormAttachment(0, 0);
wNew.setLayoutData(fdNew);
+ PropsUi.setLook(wNew);
Button wOpen = new Button(parent, SWT.PUSH);
wOpen.setText(BaseMessages.getString(PKG,
"HopEnvironmentDialog.Button.Open"));
@@ -202,6 +203,7 @@ public class HopEnvironmentDialog extends Dialog {
fdOpen.left = new FormAttachment(wNew, PropsUi.getMargin());
fdOpen.top = new FormAttachment(0, 0);
wOpen.setLayoutData(fdOpen);
+ PropsUi.setLook(wOpen);
Button wSave = new Button(parent, SWT.PUSH);
wSave.setText(BaseMessages.getString(PKG,
"HopEnvironmentDialog.Button.Save"));
@@ -210,6 +212,7 @@ public class HopEnvironmentDialog extends Dialog {
fdSave.left = new FormAttachment(wOpen, PropsUi.getMargin());
fdSave.top = new FormAttachment(0, 0);
wSave.setLayoutData(fdSave);
+ PropsUi.setLook(wSave);
Button wSaveAs = new Button(parent, SWT.PUSH);
wSaveAs.setText(BaseMessages.getString(PKG,
"HopEnvironmentDialog.Button.SaveAs"));
@@ -218,6 +221,7 @@ public class HopEnvironmentDialog extends Dialog {
fdSaveAs.left = new FormAttachment(wSave, PropsUi.getMargin());
fdSaveAs.top = new FormAttachment(0, 0);
wSaveAs.setLayoutData(fdSaveAs);
+ PropsUi.setLook(wSaveAs);
wFileCombo = new Combo(parent, SWT.DROP_DOWN | SWT.BORDER);
PropsUi.setLook(wFileCombo);
@@ -374,7 +378,7 @@ public class HopEnvironmentDialog extends Dialog {
private void createRepositoriesTab(CTabFolder folder) {
CTabItem tab = new CTabItem(folder, SWT.NONE);
tab.setText(BaseMessages.getString(PKG,
"HopEnvironmentDialog.Tab.Repositories"));
- tab.setImage(GuiResource.getInstance().getImageServer());
+ tab.setImage(GuiResource.getInstance().getImageRepository());
Composite comp = new Composite(folder, SWT.NONE);
PropsUi.setLook(comp);
FormLayout layout = new FormLayout();
@@ -499,7 +503,7 @@ public class HopEnvironmentDialog extends Dialog {
private void createDependenciesTab(CTabFolder folder) {
CTabItem tab = new CTabItem(folder, SWT.NONE);
tab.setText(BaseMessages.getString(PKG,
"HopEnvironmentDialog.Tab.Dependencies"));
- tab.setImage(GuiResource.getInstance().getImageLabel());
+ tab.setImage(GuiResource.getInstance().getImageDependence());
Composite comp = new Composite(folder, SWT.NONE);
PropsUi.setLook(comp);
FormLayout layout = new FormLayout();
diff --git
a/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceDialog.java
b/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceDialog.java
index fdfa581a7b..0decbf76f3 100644
---
a/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceDialog.java
+++
b/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceDialog.java
@@ -112,7 +112,7 @@ public class MarketplaceDialog extends Dialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL |
SWT.RESIZE | SWT.MAX);
PropsUi.setLook(shell);
- shell.setImage(GuiResource.getInstance().getImageHopUi());
+ shell.setImage(GuiResource.getInstance().getImageMarketplace());
shell.setText(BaseMessages.getString(PKG,
"MarketplaceDialog.Shell.Title"));
FormLayout formLayout = new FormLayout();
@@ -312,7 +312,7 @@ public class MarketplaceDialog extends Dialog {
private void createEnvironmentTab(CTabFolder folder) {
CTabItem tab = new CTabItem(folder, SWT.NONE);
tab.setText(BaseMessages.getString(PKG,
"MarketplaceDialog.Tab.Environment"));
- tab.setImage(GuiResource.getInstance().getImageFile());
+ tab.setImage(GuiResource.getInstance().getImageClientEnvironment());
Composite comp = new Composite(folder, SWT.NONE);
PropsUi.setLook(comp);
FormLayout layout = new FormLayout();
@@ -353,7 +353,7 @@ public class MarketplaceDialog extends Dialog {
private void createRepositoriesTab(CTabFolder folder) {
CTabItem tab = new CTabItem(folder, SWT.NONE);
tab.setText(BaseMessages.getString(PKG,
"MarketplaceDialog.Tab.Repositories"));
- tab.setImage(GuiResource.getInstance().getImageServer());
+ tab.setImage(GuiResource.getInstance().getImageRepository());
Composite comp = new Composite(folder, SWT.NONE);
PropsUi.setLook(comp);
FormLayout layout = new FormLayout();
diff --git
a/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceGuiPlugin.java
b/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceGuiPlugin.java
index 7ca82d0ce9..b4b4752e27 100644
---
a/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceGuiPlugin.java
+++
b/plugins/misc/marketplace/src/main/java/org/apache/hop/marketplace/gui/MarketplaceGuiPlugin.java
@@ -52,12 +52,12 @@ public class MarketplaceGuiPlugin {
id = ID_MAIN_MENU_TOOLS_MARKETPLACE,
label = "i18n::MarketplaceGuiPlugin.Menu.Marketplace.Text",
parentId = HopGui.ID_MAIN_MENU_TOOLS_PARENT_ID,
- image = "ui/images/plugin.svg",
+ image = "ui/images/marketplace.svg",
separator = true)
@GuiToolbarElement(
root = HopGui.ID_MAIN_TOOLBAR,
id = ID_MAIN_TOOLBAR_MARKETPLACE,
- image = "ui/images/plugin.svg",
+ image = "ui/images/marketplace.svg",
toolTip = "i18n::MarketplaceGuiPlugin.Toolbar.Marketplace.Tooltip",
separator = true)
public void menuToolsMarketplace() {
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 3e155ca999..ab6bda3f1c 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
@@ -199,6 +199,7 @@ public class GuiResource {
@Getter private Image imageAddAbove;
@Getter private Image imageAddBelow;
@Getter private Image imageAddSingle;
+ @Getter private Image imageClientEnvironment;
@Getter private Image imageCalendar;
@Getter private Image imageCancel;
@Getter private Image imageCatalog;
@@ -210,6 +211,7 @@ public class GuiResource {
@Getter private Image imageCopy;
@Getter private Image imageCut;
@Getter private Image imageDelete;
+ @Getter private Image imageDependence;
@Getter private Image imageDown;
@Getter private Image imageDuplicate;
@Getter private Image imageEmpty;
@@ -226,6 +228,7 @@ public class GuiResource {
@Getter private Image imageMinimizePanel;
@Getter private Image imageDetachPanel;
@Getter private Image imageDockPanel;
+ @Getter private Image imageMarketplace;
@Getter private Image imageNavigateBack;
@Getter private Image imageNavigateForward;
@Getter private Image imageNavigateUp;
@@ -242,6 +245,7 @@ public class GuiResource {
@Getter private Image imageRemoveAll;
@Getter private Image imageRemoveSingle;
@Getter private Image imageRename;
+ @Getter private Image imageRepository;
@Getter private Image imageResetOption;
@Getter private Image imageRotateLeft;
@Getter private Image imageRotateRight;
@@ -507,6 +511,7 @@ public class GuiResource {
disposeImage(imageAddAbove);
disposeImage(imageAddBelow);
disposeImage(imageAddSingle);
+ disposeImage(imageClientEnvironment);
disposeImage(imageCalendar);
disposeImage(imageCancel);
disposeImage(imageCatalog);
@@ -518,6 +523,7 @@ public class GuiResource {
disposeImage(imageCopy);
disposeImage(imageCut);
disposeImage(imageDelete);
+ disposeImage(imageDependence);
disposeImage(imageDown);
disposeImage(imageDuplicate);
disposeImage(imageFunction);
@@ -528,6 +534,7 @@ public class GuiResource {
disposeImage(imageHome);
disposeImage(imageLabel);
disposeImage(imageLocation);
+ disposeImage(imageMarketplace);
disposeImage(imageMaximizePanel);
disposeImage(imageMinimizePanel);
disposeImage(imageNavigateBack);
@@ -543,6 +550,7 @@ public class GuiResource {
disposeImage(imageRemoveAll);
disposeImage(imageRemoveSingle);
disposeImage(imageRename);
+ disposeImage(imageRepository);
disposeImage(imageResetOption);
disposeImage(imageRotateLeft);
disposeImage(imageRotateRight);
@@ -739,6 +747,8 @@ public class GuiResource {
imageAddBelow =
loadAsResource(display, "ui/images/add-item-below.svg",
ConstUi.SMALL_ICON_SIZE);
imageAddSingle = loadAsResource(display, "ui/images/add_single.svg",
ConstUi.SMALL_ICON_SIZE);
+ imageClientEnvironment =
+ loadAsResource(display, "ui/images/client-environment.svg",
ConstUi.SMALL_ICON_SIZE);
imageCalendar = loadAsResource(display, "ui/images/calendar.svg",
ConstUi.SMALL_ICON_SIZE);
imageCatalog = loadAsResource(display, "ui/images/catalog.svg",
ConstUi.SMALL_ICON_SIZE);
imageCheck = loadAsResource(display, "ui/images/check.svg",
ConstUi.SMALL_ICON_SIZE);
@@ -748,13 +758,15 @@ public class GuiResource {
imageCancel = loadAsResource(display, "ui/images/cancel.svg",
ConstUi.SMALL_ICON_SIZE);
imageCopy = loadAsResource(display, "ui/images/copy.svg",
ConstUi.SMALL_ICON_SIZE);
imageCut = loadAsResource(display, "ui/images/cut.svg",
ConstUi.SMALL_ICON_SIZE);
+ imageDependence = loadAsResource(display, "ui/images/dependence.svg",
ConstUi.SMALL_ICON_SIZE);
imageDuplicate = loadAsResource(display, "ui/images/duplicate.svg",
ConstUi.SMALL_ICON_SIZE);
imagePaste = loadAsResource(display, "ui/images/paste.svg",
ConstUi.SMALL_ICON_SIZE);
imageExpandAll = loadAsResource(display, "ui/images/expand-all.svg",
ConstUi.SMALL_ICON_SIZE);
imageLabel = loadAsResource(display, "ui/images/label.svg",
ConstUi.SMALL_ICON_SIZE);
imageFunction = loadAsResource(display, "ui/images/function.svg",
ConstUi.SMALL_ICON_SIZE);
imageKeyboard = loadAsResource(display, "ui/images/keyboard.svg",
ConstUi.SMALL_ICON_SIZE);
-
+ imageMarketplace =
+ loadAsResource(display, "ui/images/marketplace.svg",
ConstUi.SMALL_ICON_SIZE);
imageNavigateBack =
loadAsResource(display, "ui/images/navigate-back.svg",
ConstUi.SMALL_ICON_SIZE);
imageNavigateForward =
@@ -782,6 +794,7 @@ public class GuiResource {
imageRemoveSingle =
loadAsResource(display, "ui/images/remove_single.svg",
ConstUi.SMALL_ICON_SIZE);
imageRename = loadAsResource(display, "ui/images/rename.svg",
ConstUi.SMALL_ICON_SIZE);
+ imageRepository = loadAsResource(display, "ui/images/repository.svg",
ConstUi.SMALL_ICON_SIZE);
imageResetOption =
loadAsResource(display, "ui/images/reset_option.svg",
ConstUi.SMALL_ICON_SIZE);
imageRotateLeft = loadAsResource(display, "ui/images/rotate-left.svg",
ConstUi.SMALL_ICON_SIZE);
diff --git a/ui/src/main/resources/ui/images/client-environment.svg
b/ui/src/main/resources/ui/images/client-environment.svg
new file mode 100644
index 0000000000..ea30b3e2eb
--- /dev/null
+++ b/ui/src/main/resources/ui/images/client-environment.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path fill="#0F3B5A" d="M20.45 17.39L12.36 21.97V18.4L17.4 15.63L20.45
17.39M21 16.89V7.31L18.04 9V15.18L21 16.89M3.55 17.39L11.64 21.96V18.4L6.6
15.63L3.55 17.39M3 16.89V7.31L5.96 9V15.18L3 16.89M3.35 6.69L11.64 2V5.45L6.33
8.37L6.28 8.39L3.35 6.69M20.65 6.69L12.36 2V5.45L17.67 8.38L17.71 8.4L20.65
6.69M11.64 17.59L6.67 14.85V9.44L11.64 12.31V17.59M12.36 17.59L17.33
14.86V9.44L12.36 12.31V17.59M7 8.81L12 6.06L17 8.81L12 11.69L7 8.81Z" />
+</svg>
\ No newline at end of file
diff --git a/ui/src/main/resources/ui/images/dependence.svg
b/ui/src/main/resources/ui/images/dependence.svg
new file mode 100644
index 0000000000..2dfea795b3
--- /dev/null
+++ b/ui/src/main/resources/ui/images/dependence.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path fill="#0F3B5A"
d="M3,2H6V5H3V2M6,7H9V10H6V7M8,2H11V5H8V2M17,11L12,6H15V2H19V6H22L17,11M7.5,22C6.72,22
6.04,21.55 5.71,20.9V20.9L3.1,13.44L3,13A1,1 0 0,1 4,12H20A1,1 0 0,1
21,13L20.96,13.29L18.29,20.9C17.96,21.55 17.28,22
16.5,22H7.5M7.61,20H16.39L18.57,14H5.42L7.61,20Z" />
+</svg>
\ No newline at end of file
diff --git a/ui/src/main/resources/ui/images/marketplace.svg
b/ui/src/main/resources/ui/images/marketplace.svg
new file mode 100644
index 0000000000..d0d89559aa
--- /dev/null
+++ b/ui/src/main/resources/ui/images/marketplace.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path fill="#0F3B5A" d="M17,18A2,2 0 0,1 19,20A2,2 0 0,1 17,22C15.89,22
15,21.1 15,20C15,18.89 15.89,18 17,18M1,2H4.27L5.21,4H20A1,1 0 0,1 21,5C21,5.17
20.95,5.34 20.88,5.5L17.3,11.97C16.96,12.58 16.3,13
15.55,13H8.1L7.2,14.63L7.17,14.75A0.25,0.25 0 0,0 7.42,15H19V17H7C5.89,17
5,16.1 5,15C5,14.65 5.09,14.32 5.24,14.04L6.6,11.59L3,4H1V2M7,18A2,2 0 0,1
9,20A2,2 0 0,1 7,22C5.89,22 5,21.1 5,20C5,18.89 5.89,18
7,18M16,11L18.78,6H6.14L8.5,11H16Z" />
+</svg>
\ No newline at end of file
diff --git a/ui/src/main/resources/ui/images/plugin.svg
b/ui/src/main/resources/ui/images/plugin.svg
index 08a5c271a3..b94c184fb2 100644
--- a/ui/src/main/resources/ui/images/plugin.svg
+++ b/ui/src/main/resources/ui/images/plugin.svg
@@ -1,9 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24">
- <path
- style="fill:#0e3a5a;fill-opacity:1;stroke-width:1.18924"
- d="m 24.023809,13.696428 c 0,2.074287 -1.559999,3.795
-3.6,4.077858 v 3.582857 a 2.4,2.3571429 0 0 1 -2.4,2.357143 H 13.46381 v
-0.353571 a 3.24,3.1821429 0 0 0 -3.240001,-3.182144 c -1.7999994,0
-3.2399995,1.426072 -3.2399995,3.182144 v 0.353571 h -4.56 A 2.4,2.3571429 0 0
1 0.02380952,21.357143 v -4.478572 h 0.36000001 c 1.78799997,0
3.24000007,-1.414285 3.24000007,-3.182143 0,-1.767857 -1.4520001,-3.182142
-3.24000007,-3.182142 H 0.02380952 V 6.0357143 A 2.4,2.3571429 0 0 [...]
- <path
- d="m 2.4380952,20.111112 v -1.231999 l 0.407143,-0.196497 C
4.0445232,18.10381 4.9390137,17.217181 5.4981112,16.053062 6.336834,14.306721
6.1764493,12.212807 5.0811732,10.609694 4.5170068,9.7839463 3.7634164,9.1444673
2.8309523,8.7002104 L 2.4380952,8.5130399 V 7.2813924 6.049745 h 3.0000001 3 V
5.0580602 c 0,-0.8951381 0.00548,-1.0127491 0.056343,-1.2080493
0.2455349,-0.9428891 1.2122282,-1.5174117 2.1548137,-1.2806436
0.649911,0.1632508 1.13771,0.6423393 1.303929,1.2806436 [...]
-
style="fill:#c9e8fb;fill-opacity:0.811765;stroke:#0e3a5a;stroke-width:0.340118;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path fill="#0F3B5A" d="M22,13.5C22,15.26 20.7,16.72 19,16.96V20A2,2 0 0,1
17,22H13.2V21.7A2.7,2.7 0 0,0 10.5,19C9,19 7.8,20.21 7.8,21.7V22H4A2,2 0 0,1
2,20V16.2H2.3C3.79,16.2 5,15 5,13.5C5,12 3.79,10.8 2.3,10.8H2V7A2,2 0 0,1
4,5H7.04C7.28,3.3 8.74,2 10.5,2C12.26,2 13.72,3.3 13.96,5H17A2,2 0 0,1
19,7V10.04C20.7,10.28 22,11.74 22,13.5M17,15H18.5A1.5,1.5 0 0,0 20,13.5A1.5,1.5
0 0,0 18.5,12H17V7H12V5.5A1.5,1.5 0 0,0 10.5,4A1.5,1.5 0 0,0
9,5.5V7H4V9.12C5.76,9.8 7,11.5 7,13.5C7,15.5 5.75, [...]
+</svg>
\ No newline at end of file
diff --git a/ui/src/main/resources/ui/images/repository.svg
b/ui/src/main/resources/ui/images/repository.svg
new file mode 100644
index 0000000000..972b191cfa
--- /dev/null
+++ b/ui/src/main/resources/ui/images/repository.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path fill="#0F3B5A" d="M6.5 20Q4.22 20 2.61 18.43 1 16.85 1 14.58 1 12.63
2.17 11.1 3.35 9.57 5.25 9.15 5.68 7.35 7.38 5.73 9.07 4.1 11 4.1 11.83 4.1
12.41 4.69 13 5.28 13 6.1V12.15L14.6 10.6L16 12L12 16L8 12L9.4 10.6L11
12.15V6.1Q9.1 6.45 8.05 7.94 7 9.43 7 11H6.5Q5.05 11 4.03 12.03 3 13.05 3 14.5
3 15.95 4.03 17 5.05 18 6.5 18H18.5Q19.55 18 20.27 17.27 21 16.55 21 15.5 21
14.45 20.27 13.73 19.55 13 18.5 13H17V11Q17 9.8 16.45 8.76 15.9 7.73 15
7V4.68Q16.85 5.55 17.93 7.26 19 9 19 1 [...]
+</svg>
\ No newline at end of file
