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 a1728b5cd3 Add search filter to the Open File dialog
(HopVfsFileDialog) (#7493)
a1728b5cd3 is described below
commit a1728b5cd377ce034b1e77e39feabcdd542299c2
Author: Lance <[email protected]>
AuthorDate: Sun Jul 12 21:28:58 2026 +0800
Add search filter to the Open File dialog (HopVfsFileDialog) (#7493)
Signed-off-by: lance <[email protected]>
---
.../apache/hop/ui/core/vfs/HopVfsFileDialog.java | 62 +++++++++++++++++++---
.../ui/core/vfs/messages/messages_en_US.properties | 1 +
.../ui/core/vfs/messages/messages_zh_CN.properties | 1 +
3 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java
b/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java
index 248696bd19..31646d696f 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java
@@ -43,6 +43,7 @@ import
org.apache.hop.core.gui.plugin.toolbar.GuiToolbarElement;
import org.apache.hop.core.logging.LogChannel;
import org.apache.hop.core.plugins.IPlugin;
import org.apache.hop.core.plugins.PluginRegistry;
+import org.apache.hop.core.search.SearchMatcher;
import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.core.vfs.HopVfs;
@@ -161,6 +162,11 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
private Tree wBrowser;
private TreeEditor wBrowserEditor;
+ /** search file/folder */
+ private String filterText = "";
+
+ private SearchMatcher filterMatcher = new SearchMatcher("", false, false,
true);
+
@Setter @Getter private boolean showingHiddenFiles;
private Shell shell;
@@ -275,6 +281,7 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
@Override
public String open() {
+
shell =
new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MIN | SWT.MAX |
SWT.APPLICATION_MODAL);
PropsUi.setLook(shell);
@@ -482,15 +489,45 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
fdTreeComposite.bottom = new FormAttachment(100, 0);
browserComposite.setLayoutData(fdTreeComposite);
- // A toolbar above the browser, below the filename
+ // Toolbar row: action buttons on the left, file search on the right
+ Composite browserToolBarRow = new Composite(browserComposite, SWT.NONE);
+ PropsUi.setLook(browserToolBarRow);
+ FormLayout toolBarRowLayout = new FormLayout();
+ toolBarRowLayout.marginWidth = 0;
+ toolBarRowLayout.marginHeight = 0;
+ browserToolBarRow.setLayout(toolBarRowLayout);
+
+ FormData fdBrowserToolBarRow = new FormData();
+ fdBrowserToolBarRow.left = new FormAttachment(0, 0);
+ fdBrowserToolBarRow.top = new FormAttachment(0, 0);
+ fdBrowserToolBarRow.right = new FormAttachment(100, 0);
+ browserToolBarRow.setLayoutData(fdBrowserToolBarRow);
+
+ Text wSearchText = new Text(browserToolBarRow, SWT.SEARCH |
SWT.ICON_CANCEL | SWT.ICON_SEARCH);
+ wSearchText.setMessage(BaseMessages.getString(PKG,
"HopVfsFileDialog.Search.Placeholder"));
+ PropsUi.setLook(wSearchText, Props.WIDGET_STYLE_TOOLBAR);
+ FormData fdSearchText = new FormData();
+ fdSearchText.right = new FormAttachment(100, 0);
+ fdSearchText.top = new FormAttachment(0, 0);
+ fdSearchText.width = (int) (260 * props.getZoomFactor());
+ wSearchText.setLayoutData(fdSearchText);
+ wSearchText.addListener(
+ SWT.Modify,
+ e -> {
+ String searchContent = wSearchText.getText();
+ filterText = searchContent != null ? searchContent.trim() : "";
+ filterMatcher = new SearchMatcher(filterText, false, false, true);
+ refreshBrowser();
+ });
+
IToolbarContainer browserToolBarContainer =
ToolbarFacade.createToolbarContainer(
- browserComposite, SWT.WRAP | SWT.LEFT | SWT.HORIZONTAL);
+ browserToolBarRow, SWT.WRAP | SWT.LEFT | SWT.HORIZONTAL);
Control browserToolBar = browserToolBarContainer.getControl();
FormData fdBrowserToolBar = new FormData();
fdBrowserToolBar.left = new FormAttachment(0, 0);
fdBrowserToolBar.top = new FormAttachment(0, 0);
- fdBrowserToolBar.right = new FormAttachment(100, 0);
+ fdBrowserToolBar.right = new FormAttachment(wSearchText,
-PropsUi.getMargin());
browserToolBar.setLayoutData(fdBrowserToolBar);
PropsUi.setLook(browserToolBar, Props.WIDGET_STYLE_TOOLBAR);
@@ -504,7 +541,7 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
wBrowser = new HopTree(browseSash, SWT.SINGLE | SWT.H_SCROLL |
SWT.V_SCROLL);
PropsUi.setLook(wBrowser);
wBrowser.setHeaderVisible(true);
- wBrowser.setLinesVisible(false); // TODO needed?
+ wBrowser.setLinesVisible(false);
TreeColumn folderColumn = new TreeColumn(wBrowser, SWT.LEFT);
folderColumn.setText(BaseMessages.getString(PKG,
"HopVfsFileDialog.Folder.Name.Label"));
@@ -560,13 +597,13 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
FormData fdBrowseSash = new FormData();
fdBrowseSash.left = new FormAttachment(0, 0);
fdBrowseSash.right = new FormAttachment(100, 0);
- fdBrowseSash.top = new FormAttachment(browserToolBar, 0);
+ fdBrowseSash.top = new FormAttachment(browserToolBarRow, 0);
fdBrowseSash.bottom = new FormAttachment(100, 0);
browseSash.setLayoutData(fdBrowseSash);
- browseSash.setWeights(new int[] {90, 10});
+ browseSash.setWeights(90, 10);
- sashForm.setWeights(new int[] {15, 85});
+ sashForm.setWeights(15, 85);
getData();
@@ -992,6 +1029,9 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
if (!showingHiddenFiles && baseFilename.startsWith(".")) {
continue;
}
+ if (shouldFilterOut(baseFilename)) {
+ continue;
+ }
TreeItem childFolderItem = new TreeItem(folderItem, SWT.NONE);
childFolderItem.setImage(folderImage);
childFolderItem.setText(child.getName().getBaseName());
@@ -1005,6 +1045,9 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
if (!showingHiddenFiles && baseFilename.startsWith(".")) {
continue;
}
+ if (shouldFilterOut(baseFilename)) {
+ continue;
+ }
boolean selectFile = false;
@@ -1045,6 +1088,11 @@ public class HopVfsFileDialog implements IFileDialog,
IDirectoryDialog {
}
}
+ /** Case-insensitive filename filter for the current folder listing. */
+ private boolean shouldFilterOut(String name) {
+ return !Utils.isEmpty(filterText) && !filterMatcher.matches(name);
+ }
+
private Image getFileImage(FileObject file) {
try {
IHopFileType fileType =
diff --git
a/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_en_US.properties
b/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_en_US.properties
index f32a2c3647..00d73370a0 100644
---
a/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_en_US.properties
+++
b/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_en_US.properties
@@ -55,6 +55,7 @@ HopVfsFileDialog.NavigateToPrevPath.Tooltip.Message=Navigate
to previous path fr
HopVfsFileDialog.No.Label=No
HopVfsFileDialog.ParsingFilename.Error.Message=Error parsing filename: ''{0}''
HopVfsFileDialog.Refresh.Tooltip.Message=Refresh
+HopVfsFileDialog.Search.Placeholder=Search in this folder...
HopVfsFileDialog.RemoveBookmark.Tooltip.Message=Remove the selected bookmark
HopVfsFileDialog.RenameFile.Error.Message=Error renaming file: ''{0}''
HopVfsFileDialog.RenameFile.Tooltip.Message=Rename the selected file (F2)
diff --git
a/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_zh_CN.properties
b/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_zh_CN.properties
index 3044078fe4..4ce8bb28bd 100644
---
a/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_zh_CN.properties
+++
b/ui/src/main/resources/org/apache/hop/ui/core/vfs/messages/messages_zh_CN.properties
@@ -56,6 +56,7 @@
HopVfsFileDialog.NavigateToPrevPath.Tooltip.Message=\u8FD4\u56DE\u4F60\u6D4F\u89
HopVfsFileDialog.No.Label=\u5426
HopVfsFileDialog.ParsingFilename.Error.Message=\u89E3\u6790\u6587\u4EF6\u540D
"{0}" \u65F6\u51FA\u9519
HopVfsFileDialog.Refresh.Tooltip.Message=\u5237\u65B0
+HopVfsFileDialog.Search.Placeholder=\u5728\u6B64\u6587\u4EF6\u5939\u4E2D\u641C\u7D22...
HopVfsFileDialog.RemoveBookmark.Tooltip.Message=\u5220\u9664\u9009\u62E9\u4E66\u7B7E
HopVfsFileDialog.RenameFile.Error.Message=\u91CD\u547D\u540D\u6587\u4EF6 "{0}"
\u65F6\u51FA\u9519
HopVfsFileDialog.RenameFile.Tooltip.Message=\u9009\u62E9\u6587\u4EF6\u6539\u540D(F2)
