This is an automated email from the ASF dual-hosted git repository.
mattcasters 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 998e5a02eb New icons for “Find” and “Find and Replace” #7974 (#7975)
998e5a02eb is described below
commit 998e5a02ebaf5eb82f8c78d920c23c6268adf1e9
Author: Nicolas Adment <[email protected]>
AuthorDate: Sat Aug 15 23:13:56 2026 +0200
New icons for “Find” and “Find and Replace” #7974 (#7975)
---
.../main/java/org/apache/hop/ui/hopgui/ContentEditorWidget.java | 2 +-
.../java/org/apache/hop/ui/core/dialog/FindReplaceDialog.java | 5 ++++-
ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java | 4 ++++
.../main/java/org/apache/hop/ui/core/widget/TextComposite.java | 9 ++++-----
.../main/java/org/apache/hop/ui/hopgui/ContentEditorActions.java | 2 +-
.../org/apache/hop/ui/hopgui/search/SearchEverywhereDialog.java | 2 +-
ui/src/main/resources/ui/images/find-replace.svg | 3 +++
ui/src/main/resources/ui/images/search.svg | 9 +++------
.../java/org/apache/hop/ui/hopgui/ContentEditorActionsTest.java | 2 +-
9 files changed, 22 insertions(+), 16 deletions(-)
diff --git
a/rcp/src/main/java/org/apache/hop/ui/hopgui/ContentEditorWidget.java
b/rcp/src/main/java/org/apache/hop/ui/hopgui/ContentEditorWidget.java
index 723a8c7392..c7bc421354 100644
--- a/rcp/src/main/java/org/apache/hop/ui/hopgui/ContentEditorWidget.java
+++ b/rcp/src/main/java/org/apache/hop/ui/hopgui/ContentEditorWidget.java
@@ -595,7 +595,7 @@ public class ContentEditorWidget implements
IContentEditorWidget {
parentId = GUI_PLUGIN_CONTEXT_MENU_PARENT_ID,
id = ID_CONTEXT_MENU_FIND_REPLACE,
label = "i18n::ContentEditorWidget.Menu.FindReplace",
- image = "ui/images/edit.svg")
+ image = "ui/images/find-replace.svg")
public void findAndReplace() {
FindReplaceDialog.open(control.getShell(), this, true);
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/core/dialog/FindReplaceDialog.java
b/ui/src/main/java/org/apache/hop/ui/core/dialog/FindReplaceDialog.java
index 2b7f542931..00a9529517 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/FindReplaceDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/FindReplaceDialog.java
@@ -81,7 +81,10 @@ public class FindReplaceDialog extends Dialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE |
SWT.APPLICATION_MODAL | SWT.SHEET);
PropsUi.setLook(shell);
- shell.setImage(GuiResource.getInstance().getImageSearch());
+ shell.setImage(
+ replaceMode
+ ? GuiResource.getInstance().getImageFindReplace()
+ : GuiResource.getInstance().getImageSearch());
shell.setText(
BaseMessages.getString(
PKG,
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 88e25806d6..0666bc01b1 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
@@ -220,6 +220,7 @@ public class GuiResource {
@Getter private Image imageDuplicate;
@Getter private Image imageEmpty;
@Getter private Image imageExpandAll;
+ @Getter private Image imageFindReplace;
@Getter private Image imageFunction;
@Getter private Image imageKeyboard;
@Getter private Image imageHelp;
@@ -457,6 +458,7 @@ public class GuiResource {
imagePreview.dispose();
imageServer.dispose();
imageFile.dispose();
+ imageFindReplace.dispose();
imageFolder.dispose();
imageMissing.dispose();
imageVariable.dispose();
@@ -771,6 +773,8 @@ public class GuiResource {
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);
+ imageFindReplace =
+ loadAsResource(display, "ui/images/find-replace.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 =
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/TextComposite.java
b/ui/src/main/java/org/apache/hop/ui/core/widget/TextComposite.java
index ed1efb98c6..9aa9aacb09 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/TextComposite.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/TextComposite.java
@@ -365,7 +365,7 @@ public abstract class TextComposite extends Composite
implements IFindReplaceTar
@GuiToolbarElement(
root = ID_TOOLBAR,
id = ID_TOOLBAR_FIND_REPLACE,
- image = "ui/images/edit.svg",
+ image = "ui/images/find-replace.svg",
toolTip = "i18n::TextComposite.ToolBarWidget.FindReplace.ToolTip")
public static void toolbarFindReplace(TextComposite text) {
text.findAndReplace();
@@ -687,9 +687,7 @@ public abstract class TextComposite extends Composite
implements IFindReplaceTar
final MenuItem findItem = new MenuItem(popupMenu, SWT.PUSH);
findItem.setText(
OsHelper.customizeMenuitemText(BaseMessages.getString(PKG,
"WidgetDialog.Styled.Find")));
- findItem.setImage(
- GuiResource.getInstance()
- .getImage("ui/images/search.svg", ConstUi.SMALL_ICON_SIZE,
ConstUi.SMALL_ICON_SIZE));
+ findItem.setImage(GuiResource.getInstance().getImageSearch());
findItem.addListener(SWT.Selection, event -> find());
final MenuItem findReplaceItem = new MenuItem(popupMenu, SWT.PUSH);
@@ -698,7 +696,8 @@ public abstract class TextComposite extends Composite
implements IFindReplaceTar
BaseMessages.getString(PKG, "WidgetDialog.Styled.FindReplace")));
findReplaceItem.setImage(
GuiResource.getInstance()
- .getImage("ui/images/edit.svg", ConstUi.SMALL_ICON_SIZE,
ConstUi.SMALL_ICON_SIZE));
+ .getImage(
+ "ui/images/find-replace.svg", ConstUi.SMALL_ICON_SIZE,
ConstUi.SMALL_ICON_SIZE));
findReplaceItem.addListener(SWT.Selection, event -> findAndReplace());
addListener(
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/ContentEditorActions.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/ContentEditorActions.java
index 9ebf6e3fa2..3a870b6f4e 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/ContentEditorActions.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/ContentEditorActions.java
@@ -141,7 +141,7 @@ public class ContentEditorActions {
root = IContentEditorWidget.GUI_PLUGIN_TOOLBAR_PARENT_ID,
id = ID_TOOLBAR_FIND_REPLACE,
type = GuiToolbarElementType.BUTTON,
- image = "ui/images/edit.svg",
+ image = "ui/images/find-replace.svg",
toolTip = "i18n::ContentEditorWidget.ToolBar.Replace.Tooltip")
public static void findAndReplace(IContentEditorWidget editor) {
Shell shell = shellOf(editor);
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/search/SearchEverywhereDialog.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/search/SearchEverywhereDialog.java
index a6c6ccae40..512088a39a 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/search/SearchEverywhereDialog.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/search/SearchEverywhereDialog.java
@@ -743,7 +743,7 @@ public class SearchEverywhereDialog {
Control content =
dock.openToolTab(
searchTabTitle(searchString),
- GuiResource.getInstance().getImage("ui/images/search.svg", 16, 16),
+ GuiResource.getInstance().getImageSearch(),
true,
container -> new HopGuiSearchResultsPanel(container, hopGui));
if (content instanceof HopGuiSearchResultsPanel panel) {
diff --git a/ui/src/main/resources/ui/images/find-replace.svg
b/ui/src/main/resources/ui/images/find-replace.svg
new file mode 100644
index 0000000000..ea718fc881
--- /dev/null
+++ b/ui/src/main/resources/ui/images/find-replace.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path fill="#0e3a5a" d="m18.033 16.618l4.28 4.282l-1.413
1.414l-4.282-4.281A8.96 8.96 0 0 1 11 20a9 9 0 0 1-8.065-5H9l-1.304 2.173A7 7 0
0 0 11 18a6.98 6.98 0 0 0 4.875-1.975l.15-.15A6.98 6.98 0 0 0 18
11c0-.695-.101-1.366-.29-2h2.067c.146.643.223 1.313.223 2a8.96 8.96 0 0 1-1.967
5.618M19.065 7H13l1.304-2.173A7 7 0 0 0 11 4a7 7 0 0 0-6.71 9H2.223A9 9 0 0 1 2
11c0-4.972 4.028-9 9-9a9 9 0 0 1 8.065 5"/>
+</svg>
\ No newline at end of file
diff --git a/ui/src/main/resources/ui/images/search.svg
b/ui/src/main/resources/ui/images/search.svg
index 12b3e7253e..60e12499b2 100644
--- a/ui/src/main/resources/ui/images/search.svg
+++ b/ui/src/main/resources/ui/images/search.svg
@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16">
- <path fill="#0E3A5A"
d="M12,10.2c0.7-1.1,1.1-2.3,1.1-3.6c0-3.6-2.9-6.5-6.5-6.5C3,0.1,0.1,3,0.1,6.6s2.9,6.5,6.5,6.5
- c1.3,0,2.6-0.4,3.6-1.1l3.9,3.9l1.8-1.8L12,10.2z
M11.1,6.6c0,2.5-2,4.5-4.5,4.5c-2.5,0-4.5-2-4.5-4.5s2-4.5,4.5-4.5
- C9.1,2.1,11.1,4.1,11.1,6.6z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path fill="#0e3a5a" d="m18.031 16.617l4.283 4.282l-1.415
1.415l-4.282-4.283A8.96 8.96 0 0 1 11 20c-4.968 0-9-4.032-9-9s4.032-9 9-9s9
4.032 9 9a8.96 8.96 0 0 1-1.969 5.617m-2.006-.742A6.98 6.98 0 0 0 18
11c0-3.867-3.133-7-7-7s-7 3.133-7 7s3.133 7 7 7a6.98 6.98 0 0 0 4.875-1.975z"/>
+</svg>
\ No newline at end of file
diff --git
a/ui/src/test/java/org/apache/hop/ui/hopgui/ContentEditorActionsTest.java
b/ui/src/test/java/org/apache/hop/ui/hopgui/ContentEditorActionsTest.java
index 526aa8ed7f..976fed91c3 100644
--- a/ui/src/test/java/org/apache/hop/ui/hopgui/ContentEditorActionsTest.java
+++ b/ui/src/test/java/org/apache/hop/ui/hopgui/ContentEditorActionsTest.java
@@ -40,7 +40,7 @@ class ContentEditorActionsTest {
assertEquals(IContentEditorWidget.GUI_PLUGIN_TOOLBAR_PARENT_ID,
replace.root());
assertEquals(ContentEditorActions.ID_TOOLBAR_FIND_REPLACE, replace.id());
- assertEquals("ui/images/edit.svg", replace.image());
+ assertEquals("ui/images/find-replace.svg", replace.image());
}
private static GuiToolbarElement toolbarElement(String methodName) throws
Exception {
