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/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 0cc29ccba6 Align the Ok/Cancel/Help buttons of the dialog box #2442
Shared System.ActionName.Label and System.TransformName.Label Add minimum shell
size
new adeefe6e33 Merge pull request #2450 from nadment/2442
0cc29ccba6 is described below
commit 0cc29ccba6dba80fe1469fa10538e58fdc87ef02
Author: Nicolas Adment <[email protected]>
AuthorDate: Mon Feb 20 23:12:31 2023 +0100
Align the Ok/Cancel/Help buttons of the dialog box #2442
Shared System.ActionName.Label and System.TransformName.Label
Add minimum shell size
---
.../org/apache/hop/i18n/messages/messages_en_US.properties | 4 ++++
.../org/apache/hop/i18n/messages/messages_fr_FR.properties | 1 +
.../hop/workflow/actions/abort/ActionAbortDialog.java | 8 +++++---
.../actions/abort/messages/messages_en_US.properties | 3 +--
.../actions/createfile/ActionCreateFileDialog.java | 6 ++++--
.../actions/createfile/messages/messages_en_US.properties | 1 -
.../actions/createfolder/ActionCreateFolderDialog.java | 6 ++++--
.../createfolder/messages/messages_en_US.properties | 1 -
.../hop/workflow/actions/delay/ActionDelayDialog.java | 14 ++++++++------
.../actions/delay/messages/messages_en_US.properties | 1 -
.../actions/deletefile/ActionDeleteFileDialog.java | 6 ++++--
.../actions/deletefile/messages/messages_en_US.properties | 1 -
.../ActionDeleteResultFilenamesDialog.java | 6 ++++--
.../messages/messages_en_US.properties | 1 -
.../actions/filecompare/ActionFileCompareDialog.java | 6 ++++--
.../actions/filecompare/messages/messages_en_US.properties | 1 -
.../actions/fileexists/ActionFileExistsDialog.java | 6 ++++--
.../actions/fileexists/messages/messages_en_US.properties | 1 -
.../actions/folderisempty/ActionFolderIsEmptyDialog.java | 6 ++++--
.../folderisempty/messages/messages_en_US.properties | 3 +--
.../apache/hop/workflow/actions/ping/ActionPingDialog.java | 6 ++++--
.../actions/ping/messages/messages_en_US.properties | 7 +++----
.../hop/workflow/actions/repeat/EndRepeatDialog.java | 6 ++++--
.../actions/repeat/messages/messages_en_US.properties | 2 +-
.../hop/workflow/actions/success/ActionSuccessDialog.java | 6 ++++--
.../actions/success/messages/messages_en_US.properties | 1 -
.../actions/waitforfile/ActionWaitForFileDialog.java | 6 ++++--
.../actions/waitforfile/messages/messages_en_US.properties | 1 -
.../ActionWebServiceAvailableDialog.java | 8 ++++----
.../webserviceavailable/messages/messages_en_US.properties | 1 -
.../hop/ui/pipeline/transforms/dummy/DummyDialog.java | 8 +++++---
.../hop/ui/workflow/actions/dummy/ActionDummyDialog.java | 6 ++++--
32 files changed, 81 insertions(+), 59 deletions(-)
diff --git
a/core/src/main/resources/org/apache/hop/i18n/messages/messages_en_US.properties
b/core/src/main/resources/org/apache/hop/i18n/messages/messages_en_US.properties
index fef4d4c49c..0a936b11f2 100644
---
a/core/src/main/resources/org/apache/hop/i18n/messages/messages_en_US.properties
+++
b/core/src/main/resources/org/apache/hop/i18n/messages/messages_en_US.properties
@@ -95,6 +95,8 @@ System.Dialog.SelectEnvironmentVar.Title=Select an
Environment Variable
System.ActionNameMissing.Title=The name of the action is missing
System.Column.Decimal=Decimal
System.Button.Open=&Open
+System.ActionName.Label=Action name
+System.ActionName.Tooltip=The name of the workflow action. This name must be
unique in the same workflow.
System.ActionNameMissing.Msg=You must give a name to this action\!
System.Button.Help=Help
System.Button.PreviewRows=Preview rows
@@ -106,6 +108,8 @@ System.Warning=Warning
System.FileType.CSVFiles=Comma Separated Values
System.Button.Variable=&Variable...
System.Label.TransformName=Transform name
+System.TransformName.Label=Transform name
+System.TransformName.Tooltip=The name of the pipeline transform. This name
must be unique in a single pipeline.
System.FileType.AllFiles=All files
System.Tooltip.GetFields=Get the fields as defined in previous transforms.
System.Column.SetEmptyString=Set empty string?
diff --git
a/core/src/main/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties
b/core/src/main/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties
index ad3b5f5093..92fbc82f0d 100644
---
a/core/src/main/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties
+++
b/core/src/main/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties
@@ -93,6 +93,7 @@ System.Tooltip.BrowseForDir=S\u00E9lectionner un
R\u00E9pertoire
System.Tooltip.BrowseForFileOrDirAndAdd=S\u00E9lection un r\u00E9pertoire ou
un fichier & ajouter \u00E0 la liste
System.Tooltip.GetFields=R\u00E9cup\u00E9rer les champs d\u00E9finis dans les
transformations pr\u00E9c\u00E9dentes.
System.Tooltip.VariableToDir=Ins\u00E9rer une variable d''environnement dans
le r\u00E9pertoire
+System.TransformName.Label=Nom de la transformation
System.TransformActionNameMissing.Title=Erreur
System.Warning=Attention
Dialog.Error.Header=Erreur
diff --git
a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
index b01a987753..eecf6bd38e 100644
---
a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
+++
b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
@@ -72,6 +72,7 @@ public class ActionAbortDialog extends ActionDialog
implements IActionDialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 200);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -91,7 +92,8 @@ public class ActionAbortDialog extends ActionDialog
implements IActionDialog {
// Filename line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG, "ActionAbortDialog.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -113,7 +115,7 @@ public class ActionAbortDialog extends ActionDialog
implements IActionDialog {
PropsUi.setLook(wlMessageAbort);
FormData fdlMessageAbort = new FormData();
fdlMessageAbort.left = new FormAttachment(0, 0);
- fdlMessageAbort.right = new FormAttachment(middle, 0);
+ fdlMessageAbort.right = new FormAttachment(middle, -margin);
fdlMessageAbort.top = new FormAttachment(wName, margin);
wlMessageAbort.setLayoutData(fdlMessageAbort);
@@ -150,7 +152,7 @@ public class ActionAbortDialog extends ActionDialog
implements IActionDialog {
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, (Event e) -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, 0, wAlwaysLogRows);
+ shell, new Button[] {wOk, wCancel}, margin, 0, null);
getData();
diff --git
a/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties
b/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties
index 4687cba4a3..b4c1b3085b 100644
---
a/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties
+++
b/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties
@@ -23,9 +23,8 @@ ActionAbort.Meta.CheckResult.CouldNotExecute=Couldn't execute
abort action\:
ActionAbort.Meta.CheckResult.Label=Aborting workflow.
ActionAbort.Name=Abort workflow
ActionAbort.keyword=abort
-ActionAbortDialog.ActionName.Label=Action name
ActionAbortDialog.Label=Abort workflow
-ActionAbortDialog.MessageAbort.Label=Message\:
+ActionAbortDialog.MessageAbort.Label=Message
ActionAbortDialog.MessageAbort.Tooltip=Message to display in the log
ActionAbortDialog.AlwaysLogRows.Label=Do not mark as error
ActionAbortDialog.AlwaysLogRows.Tooltip=Always log rows even if below current
log level
diff --git
a/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java
b/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java
index fd7c86292c..4f3fd1e9bf 100644
---
a/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java
+++
b/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java
@@ -75,6 +75,7 @@ public class ActionCreateFileDialog extends ActionDialog
implements IActionDialo
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 210);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -93,7 +94,8 @@ public class ActionCreateFileDialog extends ActionDialog
implements IActionDialo
// Filename line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG, "ActionCreateFile.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -199,7 +201,7 @@ public class ActionCreateFileDialog extends ActionDialog
implements IActionDialo
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wAddFilenameToResult);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
diff --git
a/plugins/actions/createfile/src/main/resources/org/apache/hop/workflow/actions/createfile/messages/messages_en_US.properties
b/plugins/actions/createfile/src/main/resources/org/apache/hop/workflow/actions/createfile/messages/messages_en_US.properties
index 76aa06513d..3b5da47ba6 100644
---
a/plugins/actions/createfile/src/main/resources/org/apache/hop/workflow/actions/createfile/messages/messages_en_US.properties
+++
b/plugins/actions/createfile/src/main/resources/org/apache/hop/workflow/actions/createfile/messages/messages_en_US.properties
@@ -19,7 +19,6 @@ ActionCreateFile.Description=Create (an empty) file
ActionCreateFile.Name=Create file
ActionCreateFile.Filename.Label=File name
ActionCreateFile.Title=Create file
-ActionCreateFile.Name.Label=Action name
ActionCreateFile.Name.Default=Create file
ActionCreateFile.FailIfExists.Label=Fail if file exists
ActionCreateFile.Filetype.All=All files
diff --git
a/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java
b/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java
index ea5997c532..ce5eabb197 100644
---
a/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java
+++
b/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java
@@ -70,6 +70,7 @@ public class ActionCreateFolderDialog extends ActionDialog
implements IActionDia
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 180);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -88,7 +89,8 @@ public class ActionCreateFolderDialog extends ActionDialog
implements IActionDia
// Foldername line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionCreateFolder.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -170,7 +172,7 @@ public class ActionCreateFolderDialog extends ActionDialog
implements IActionDia
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wAbortExists);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
diff --git
a/plugins/actions/createfolder/src/main/resources/org/apache/hop/workflow/actions/createfolder/messages/messages_en_US.properties
b/plugins/actions/createfolder/src/main/resources/org/apache/hop/workflow/actions/createfolder/messages/messages_en_US.properties
index c03a3098df..3762428124 100644
---
a/plugins/actions/createfolder/src/main/resources/org/apache/hop/workflow/actions/createfolder/messages/messages_en_US.properties
+++
b/plugins/actions/createfolder/src/main/resources/org/apache/hop/workflow/actions/createfolder/messages/messages_en_US.properties
@@ -19,7 +19,6 @@ ActionCreateFolder.Description=Create a folder
ActionCreateFolder.Name=Create a folder
ActionCreateFolder.Title=Create a folder
ActionCreateFolder.Name.Default=Create folder
-ActionCreateFolder.Name.Label=Action name
ActionCreateFolder.Foldername.Label=Folder name
ActionCreateFolder.FailIfExists.Label=Fail if folder exists
ActionCreateFolder.FailIfExists.Tooltip=Fail if folder already exists
diff --git
a/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java
b/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java
index 8455b33997..19638cdb7d 100644
---
a/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java
+++
b/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java
@@ -69,6 +69,7 @@ public class ActionDelayDialog extends ActionDialog
implements IActionDialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 190);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -87,11 +88,12 @@ public class ActionDelayDialog extends ActionDialog
implements IActionDialog {
// Name line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG, "ActionDelay.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
- fdlName.left = new FormAttachment(0, -margin);
- fdlName.right = new FormAttachment(middle, 0);
+ fdlName.left = new FormAttachment(0, 0);
+ fdlName.right = new FormAttachment(middle, -margin);
fdlName.top = new FormAttachment(0, margin);
wlName.setLayoutData(fdlName);
wName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
@@ -113,7 +115,7 @@ public class ActionDelayDialog extends ActionDialog
implements IActionDialog {
PropsUi.setLook(wMaximumTimeout);
wMaximumTimeout.addModifyListener(lsMod);
FormData fdMaximumTimeout = new FormData();
- fdMaximumTimeout.left = new FormAttachment(0, -margin);
+ fdMaximumTimeout.left = new FormAttachment(0, 0);
fdMaximumTimeout.top = new FormAttachment(wName, margin);
fdMaximumTimeout.right = new FormAttachment(100, 0);
wMaximumTimeout.setLayoutData(fdMaximumTimeout);
@@ -132,7 +134,7 @@ public class ActionDelayDialog extends ActionDialog
implements IActionDialog {
PropsUi.setLook(wScaleTime);
FormData fdScaleTime = new FormData();
- fdScaleTime.left = new FormAttachment(middle, 0);
+ fdScaleTime.left = new FormAttachment(middle, margin);
fdScaleTime.top = new FormAttachment(wMaximumTimeout, margin);
fdScaleTime.right = new FormAttachment(100, 0);
wScaleTime.setLayoutData(fdScaleTime);
@@ -145,7 +147,7 @@ public class ActionDelayDialog extends ActionDialog
implements IActionDialog {
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wScaleTime);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
diff --git
a/plugins/actions/delay/src/main/resources/org/apache/hop/workflow/actions/delay/messages/messages_en_US.properties
b/plugins/actions/delay/src/main/resources/org/apache/hop/workflow/actions/delay/messages/messages_en_US.properties
index 0e6750cd2f..d28e9b3f0b 100644
---
a/plugins/actions/delay/src/main/resources/org/apache/hop/workflow/actions/delay/messages/messages_en_US.properties
+++
b/plugins/actions/delay/src/main/resources/org/apache/hop/workflow/actions/delay/messages/messages_en_US.properties
@@ -19,7 +19,6 @@
ActionDelay.Description=Wait for a delay
ActionDelay.Name=Wait for
-ActionDelay.Name.Label=Action name
ActionDelay.MaximumTimeout.Label=Maximum timeout
ActionDelay.WaitTimeIsElapsed.Label=Wait time is reached.
ActionDelay.Title=Wait for
diff --git
a/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java
b/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java
index 3a558c1cf9..595a8c4e72 100644
---
a/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java
+++
b/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java
@@ -74,6 +74,7 @@ public class ActionDeleteFileDialog extends ActionDialog
implements IActionDialo
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 180);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -92,7 +93,8 @@ public class ActionDeleteFileDialog extends ActionDialog
implements IActionDialo
// Filename line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG, "ActionDeleteFile.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -176,7 +178,7 @@ public class ActionDeleteFileDialog extends ActionDialog
implements IActionDialo
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, 2 * margin, wlAbortExists);
+ shell, new Button[] {wOk, wCancel}, margin, null);
// Add listeners
wCancel.addListener(SWT.Selection, e -> cancel());
diff --git
a/plugins/actions/deletefile/src/main/resources/org/apache/hop/workflow/actions/deletefile/messages/messages_en_US.properties
b/plugins/actions/deletefile/src/main/resources/org/apache/hop/workflow/actions/deletefile/messages/messages_en_US.properties
index 811db893e9..b2d7db1f36 100644
---
a/plugins/actions/deletefile/src/main/resources/org/apache/hop/workflow/actions/deletefile/messages/messages_en_US.properties
+++
b/plugins/actions/deletefile/src/main/resources/org/apache/hop/workflow/actions/deletefile/messages/messages_en_US.properties
@@ -26,7 +26,6 @@ ActionDeleteFile.FailIfExists.Label=Fail if file doesn''t
exist\:
ActionDeleteFile.Name.Default=Delete file
ActionDeleteFile.FailIfExists.Tooltip=Fail if file doesn''t exist
ActionDeleteFile.ERROR_0004_File_Does_Not_Exist=File [{0}] does not exist,
failing.
-ActionDeleteFile.Name.Label=Action name\:
ActionDeleteFile.ERROR_0006_Exception_Deleting_File=Could not delete file
[{0}], exception\: {1}
ActionDeleteFile.File_Already_Deleted=File [{0}] already deleted.
ActionDeleteFile.Title=Delete file
diff --git
a/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java
b/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java
index 4e0198816e..4776016675 100644
---
a/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java
+++
b/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java
@@ -75,6 +75,7 @@ public class ActionDeleteResultFilenamesDialog extends
ActionDialog implements I
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 220);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -93,7 +94,8 @@ public class ActionDeleteResultFilenamesDialog extends
ActionDialog implements I
// Folder name line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionDeleteResultFilenames.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -194,7 +196,7 @@ public class ActionDeleteResultFilenamesDialog extends
ActionDialog implements I
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wWildcardExclude);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
CheckLimit();
diff --git
a/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties
b/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties
index 113c485f0f..19d9073458 100644
---
a/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties
+++
b/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties
@@ -21,7 +21,6 @@ ActionDeleteResultFilenames.Description=Delete filenames from
result
ActionDeleteResultFilenames.Name=Delete filenames from result
ActionDeleteResultFilenames.Title=Delete filenames from result
ActionDeleteResultFilenames.Name.Default=Delete Result Filenames
-ActionDeleteResultFilenames.Name.Label=Action name:
ActionDeleteResultFilenames.SpecifyWildcard.Label=Limit action to
ActionDeleteResultFilenames.SpecifyWildcard.Tooltip=Only delete filenames that
match wildcard\n and don''t match ''exclude wildcard''
ActionDeleteResultFilenames.Wildcard.Label=Wildcard (RegExp)
diff --git
a/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java
b/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java
index d9e1ceda5d..7767920259 100644
---
a/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java
+++
b/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java
@@ -74,6 +74,7 @@ public class ActionFileCompareDialog extends ActionDialog
implements IActionDial
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 230);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -92,7 +93,8 @@ public class ActionFileCompareDialog extends ActionDialog
implements IActionDial
// Name line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionFileCompare.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -214,7 +216,7 @@ public class ActionFileCompareDialog extends ActionDialog
implements IActionDial
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wAddFilenameResult);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
diff --git
a/plugins/actions/filecompare/src/main/resources/org/apache/hop/workflow/actions/filecompare/messages/messages_en_US.properties
b/plugins/actions/filecompare/src/main/resources/org/apache/hop/workflow/actions/filecompare/messages/messages_en_US.properties
index dfdc077859..5fcf92be1b 100644
---
a/plugins/actions/filecompare/src/main/resources/org/apache/hop/workflow/actions/filecompare/messages/messages_en_US.properties
+++
b/plugins/actions/filecompare/src/main/resources/org/apache/hop/workflow/actions/filecompare/messages/messages_en_US.properties
@@ -29,5 +29,4 @@ ActionFileCompare.Name.Default=File compare
ActionFileCompare.ERROR_0004_File1_Does_Not_Exist=File 1 [{0}] does not exist.
ActionFileCompare.AddFilenameResult.Label=Add filename to result
ActionFileCompare.ERROR_0006_Need_Two_Filenames=Need 2 filenames to compare
file contents.
-ActionFileCompare.Name.Label=Action name\:
ActionFileCompare.keyword=file,compare
diff --git
a/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java
b/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java
index 13323c221c..54c7bd2385 100644
---
a/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java
+++
b/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java
@@ -78,6 +78,7 @@ public class ActionFileExistsDialog extends ActionDialog
implements IActionDialo
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 160);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -96,7 +97,8 @@ public class ActionFileExistsDialog extends ActionDialog
implements IActionDialo
// Name line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG, "ActionFileExists.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -157,7 +159,7 @@ public class ActionFileExistsDialog extends ActionDialog
implements IActionDialo
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wFilename);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
diff --git
a/plugins/actions/fileexists/src/main/resources/org/apache/hop/workflow/actions/fileexists/messages/messages_en_US.properties
b/plugins/actions/fileexists/src/main/resources/org/apache/hop/workflow/actions/fileexists/messages/messages_en_US.properties
index 94f49e58e7..9d8f0df189 100644
---
a/plugins/actions/fileexists/src/main/resources/org/apache/hop/workflow/actions/fileexists/messages/messages_en_US.properties
+++
b/plugins/actions/fileexists/src/main/resources/org/apache/hop/workflow/actions/fileexists/messages/messages_en_US.properties
@@ -20,7 +20,6 @@ ActionFileExists.Name=File exists
ActionFileExists.ERROR_0004_IO_Exception=Unexpected error checking filename
existance\: {0}
ActionFileExists.Title=File exists
ActionFileExists.File_Does_Not_Exist=File [{0}] does not exist\!
-ActionFileExists.Name.Label=Action name\:
ActionFileExists.Filetype.Text=Text files
ActionFileExists.ERROR_0005_No_Filename_Defined=No filename is defined.
ActionFileExists.Filetype.All=All files
diff --git
a/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java
b/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java
index 66d319c80d..927cdf0c01 100644
---
a/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java
+++
b/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java
@@ -75,6 +75,7 @@ public class ActionFolderIsEmptyDialog extends ActionDialog
implements IActionDi
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 244);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -93,7 +94,8 @@ public class ActionFolderIsEmptyDialog extends ActionDialog
implements IActionDi
// Foldername line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionFolderIsEmpty.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -228,7 +230,7 @@ public class ActionFolderIsEmptyDialog extends ActionDialog
implements IActionDi
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wWildcard);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
checkLimitSearch();
diff --git
a/plugins/actions/folderisempty/src/main/resources/org/apache/hop/workflow/actions/folderisempty/messages/messages_en_US.properties
b/plugins/actions/folderisempty/src/main/resources/org/apache/hop/workflow/actions/folderisempty/messages/messages_en_US.properties
index 13926b370b..fc8d19ad68 100644
---
a/plugins/actions/folderisempty/src/main/resources/org/apache/hop/workflow/actions/folderisempty/messages/messages_en_US.properties
+++
b/plugins/actions/folderisempty/src/main/resources/org/apache/hop/workflow/actions/folderisempty/messages/messages_en_US.properties
@@ -19,8 +19,7 @@ ActionFolderIsEmpty.Description=Check if a folder is empty
ActionFolderIsEmpty.Name=Check if a folder is empty
ActionFolderIsEmpty.Title=Check if a folder is empty
ActionFolderIsEmpty.Name.Default=Check if a folder is empty
-ActionFolderIsEmpty.Name.Label=Action name
-ActionFolderIsEmpty.Foldername.Label=Folder name
+ActionFolderIsEmpty.Foldername.Label=Folder name:
ActionFolderIsEmpty.IncludeSubFolders.Label=Include subfolders
ActionFolderIsEmpty.IncludeSubFolders.Tooltip=Check this option if you want to
include sub folders in the search
ActionFolderIsEmpty.SpecifyWildcard.Label=Limit search to (RegExp)
diff --git
a/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java
b/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java
index 1c38bc20d9..946f915016 100644
---
a/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java
+++
b/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java
@@ -78,6 +78,7 @@ public class ActionPingDialog extends ActionDialog implements
IActionDialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 250);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -96,7 +97,8 @@ public class ActionPingDialog extends ActionDialog implements
IActionDialog {
// Filename line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG, "ActionPing.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -211,7 +213,7 @@ public class ActionPingDialog extends ActionDialog
implements IActionDialog {
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wNbrPackets);
+ shell, new Button[] {wOk, wCancel}, margin, null);
getData();
setPingType();
diff --git
a/plugins/actions/ping/src/main/resources/org/apache/hop/workflow/actions/ping/messages/messages_en_US.properties
b/plugins/actions/ping/src/main/resources/org/apache/hop/workflow/actions/ping/messages/messages_en_US.properties
index 420ad1c52f..f11933681a 100644
---
a/plugins/actions/ping/src/main/resources/org/apache/hop/workflow/actions/ping/messages/messages_en_US.properties
+++
b/plugins/actions/ping/src/main/resources/org/apache/hop/workflow/actions/ping/messages/messages_en_US.properties
@@ -19,9 +19,8 @@ ActionPing.Description=Ping a host
ActionPing.Name=Ping a host
ActionPing.Title=Ping a host
ActionPing.Name.Default=Ping a host
-ActionPing.Name.Label=Action name:
-ActionPing.Hostname.Label=Host name/IP:
-ActionPing.TimeOut.Label=TimeOut (ms):
+ActionPing.Hostname.Label=Host name/IP
+ActionPing.TimeOut.Label=TimeOut (ms)
ActionPing.TimeOut.Tooltip=TimeOut
ActionPing.Error.Label=Error:
ActionPing.OK.Label=Host [{0}] is reachable.
@@ -35,7 +34,7 @@ ActionPing.NbrPackets.Label=Ping... sending {0} packets ...
ActionPing.Gettingresponse.Label=Waiting response from {0}
ActionPing.ClassicPing=Classic ping
ActionPing.SystemPing=System ping
-ActionPing.NrPackets.Label=Nr packets to send:
+ActionPing.NrPackets.Label=Nr packets to send
ActionPing.ExecClassicPing.Label=Running command : {0}
ActionPing.PingType.Label=Ping type
ActionPing.ClassicPing.Label=Classic ping
diff --git
a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java
b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java
index d436d3f454..76ae22123f 100644
---
a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java
+++
b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java
@@ -63,6 +63,7 @@ public class EndRepeatDialog extends ActionDialog implements
IActionDialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 130);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -77,7 +78,8 @@ public class EndRepeatDialog extends ActionDialog implements
IActionDialog {
int margin = PropsUi.getMargin();
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText("Action name");
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -100,7 +102,7 @@ public class EndRepeatDialog extends ActionDialog
implements IActionDialog {
Button wCancel = new Button(shell, SWT.PUSH);
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
- BaseTransformDialog.positionBottomButtons(shell, new Button[] {wOk,
wCancel}, margin, wName);
+ BaseTransformDialog.positionBottomButtons(shell, new Button[] {wOk,
wCancel}, margin, null);
getData();
diff --git
a/plugins/actions/repeat/src/main/resources/org/apache/hop/workflow/actions/repeat/messages/messages_en_US.properties
b/plugins/actions/repeat/src/main/resources/org/apache/hop/workflow/actions/repeat/messages/messages_en_US.properties
index 6b8f3d87bb..ff20240f26 100644
---
a/plugins/actions/repeat/src/main/resources/org/apache/hop/workflow/actions/repeat/messages/messages_en_US.properties
+++
b/plugins/actions/repeat/src/main/resources/org/apache/hop/workflow/actions/repeat/messages/messages_en_US.properties
@@ -20,7 +20,7 @@
EndRepeat.Name=End Repeat
EndRepeat.Description=End repeated execution of a workflow or a pipeline
EndRepeat.Dialog.ActionMissing.Header=Warning
-EndRepeat.Dialog.ActionMissing.Message=The name of the workflow entry is
missing!
+EndRepeat.Dialog.ActionMissing.Message=The name of the workflow action is
missing!
Repeat.Name=Repeat
Repeat.Description=Repeat execution of a workflow or a pipeline
Repeat.FileToRepeat.Label=File to repeat (.hpl or .hwf)
diff --git
a/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java
b/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java
index 3a2f7c43d3..1e3726db87 100644
---
a/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java
+++
b/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java
@@ -64,6 +64,7 @@ public class ActionSuccessDialog extends ActionDialog
implements IActionDialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 130);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -82,7 +83,8 @@ public class ActionSuccessDialog extends ActionDialog
implements IActionDialog {
// Filename line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionSuccessDialog.ActionName.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -106,7 +108,7 @@ public class ActionSuccessDialog extends ActionDialog
implements IActionDialog {
Button wCancel = new Button(shell, SWT.PUSH);
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
- BaseTransformDialog.positionBottomButtons(shell, new Button[] {wOk,
wCancel}, margin, wName);
+ BaseTransformDialog.positionBottomButtons(shell, new Button[] {wOk,
wCancel}, margin, null);
getData();
diff --git
a/plugins/actions/success/src/main/resources/org/apache/hop/workflow/actions/success/messages/messages_en_US.properties
b/plugins/actions/success/src/main/resources/org/apache/hop/workflow/actions/success/messages/messages_en_US.properties
index b27310bb82..a9eb71e06e 100644
---
a/plugins/actions/success/src/main/resources/org/apache/hop/workflow/actions/success/messages/messages_en_US.properties
+++
b/plugins/actions/success/src/main/resources/org/apache/hop/workflow/actions/success/messages/messages_en_US.properties
@@ -20,6 +20,5 @@
ActionSuccess.Description=Success
ActionSuccess.Name=Success
ActionSuccessDialog.Title=Success
-ActionSuccessDialog.ActionName.Label=Action name
ActionSuccessDialog.Name.Default=Success
ActionSuccess.keyword=success
\ No newline at end of file
diff --git
a/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java
b/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java
index cbea018388..5b2fe50fc5 100644
---
a/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java
+++
b/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java
@@ -82,6 +82,7 @@ public class ActionWaitForFileDialog extends ActionDialog
implements IActionDial
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 300);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -100,7 +101,8 @@ public class ActionWaitForFileDialog extends ActionDialog
implements IActionDial
// Filename line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionWaitForFile.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -282,7 +284,7 @@ public class ActionWaitForFileDialog extends ActionDialog
implements IActionDial
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, 2 * margin, wlAddFilenameResult);
+ shell, new Button[] {wOk, wCancel}, 2 * margin, null);
getData();
diff --git
a/plugins/actions/waitforfile/src/main/resources/org/apache/hop/workflow/actions/waitforfile/messages/messages_en_US.properties
b/plugins/actions/waitforfile/src/main/resources/org/apache/hop/workflow/actions/waitforfile/messages/messages_en_US.properties
index 99b5f77ed2..d4b709ea3c 100644
---
a/plugins/actions/waitforfile/src/main/resources/org/apache/hop/workflow/actions/waitforfile/messages/messages_en_US.properties
+++
b/plugins/actions/waitforfile/src/main/resources/org/apache/hop/workflow/actions/waitforfile/messages/messages_en_US.properties
@@ -19,7 +19,6 @@
ActionWaitForFile.Description=Wait for a file
ActionWaitForFile.Name=Wait for file
-ActionWaitForFile.Name.Label=Action name\:
ActionWaitForFile.SuccessOnTimeout.Tooltip=Success when timeout is reached
(instead of failure)
ActionWaitForFile.MaximumTimeout.Label=Maximum timeout\:
ActionWaitForFile.Filetype.All=All files
diff --git
a/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java
b/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java
index d48e539eae..e58bf6abf6 100644
---
a/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java
+++
b/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java
@@ -71,6 +71,7 @@ public class ActionWebServiceAvailableDialog extends
ActionDialog implements IAc
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 220);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -89,7 +90,8 @@ public class ActionWebServiceAvailableDialog extends
ActionDialog implements IAc
// Filename line
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionWebServiceAvailable.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
@@ -188,9 +190,7 @@ public class ActionWebServiceAvailableDialog extends
ActionDialog implements IAc
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
wCancel.addListener(SWT.Selection, e -> cancel());
BaseTransformDialog.positionBottomButtons(
- shell, new Button[] {wOk, wCancel}, margin, wReadTimeOut);
-
- getData();
+ shell, new Button[] {wOk, wCancel}, margin, null); getData();
BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel());
diff --git
a/plugins/actions/webserviceavailable/src/main/resources/org/apache/hop/workflow/actions/webserviceavailable/messages/messages_en_US.properties
b/plugins/actions/webserviceavailable/src/main/resources/org/apache/hop/workflow/actions/webserviceavailable/messages/messages_en_US.properties
index fc095aae63..689fa0d930 100644
---
a/plugins/actions/webserviceavailable/src/main/resources/org/apache/hop/workflow/actions/webserviceavailable/messages/messages_en_US.properties
+++
b/plugins/actions/webserviceavailable/src/main/resources/org/apache/hop/workflow/actions/webserviceavailable/messages/messages_en_US.properties
@@ -21,7 +21,6 @@ ActionWebServiceAvailable.Description=Check if a webservice
is available
ActionWebServiceAvailable.Name=Check webservice availability
ActionWebServiceAvailable.Title=Check webservice availability
ActionWebServiceAvailable.Name.Default=Webservice available
-ActionWebServiceAvailable.Name.Label=Action name:
ActionWebServiceAvailable.URL.Label=URL:
ActionWebServiceAvailable.ERROR_0001_Cannot_Load_Workflow_Action_From_Xml_Node=Unable
to load action of type 'webservice available' from XML node
ActionWebServiceAvailable.ERROR_0004_Exception=Webservice [{0}] is not
available! {1}
diff --git
a/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/dummy/DummyDialog.java
b/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/dummy/DummyDialog.java
index b6b1a1efbf..90a6941cca 100644
---
a/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/dummy/DummyDialog.java
+++
b/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/dummy/DummyDialog.java
@@ -52,6 +52,7 @@ public class DummyDialog extends BaseTransformDialog
implements ITransformDialog
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MIN |
SWT.MAX);
+ shell.setMinimumSize(400, 120);
PropsUi.setLook(shell);
setShellImage(shell, input);
@@ -66,11 +67,12 @@ public class DummyDialog extends BaseTransformDialog
implements ITransformDialog
shell.setText(BaseMessages.getString(PKG, "DummyDialog.Shell.Title"));
int middle = props.getMiddlePct();
- int margin = props.getMargin();
+ int margin = PropsUi.getMargin();
// TransformName line
wlTransformName = new Label(shell, SWT.RIGHT);
- wlTransformName.setText(BaseMessages.getString(PKG,
"DummyDialog.TransformName.Label"));
+ wlTransformName.setText(BaseMessages.getString(PKG,
"System.TransformName.Label"));
+ wlTransformName.setToolTipText(BaseMessages.getString(PKG,
"System.TransformName.Tooltip"));
PropsUi.setLook(wlTransformName);
fdlTransformName = new FormData();
fdlTransformName.left = new FormAttachment(0, 0);
@@ -93,7 +95,7 @@ public class DummyDialog extends BaseTransformDialog
implements ITransformDialog
wCancel = new Button(shell, SWT.PUSH);
wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel"));
- setButtonPositions(new Button[] {wOk, wCancel}, margin, wTransformName);
+ setButtonPositions(new Button[] {wOk, wCancel}, margin, null);
// Add listeners
wCancel.addListener(SWT.Selection, e -> cancel());
diff --git
a/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java
b/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java
index 5af6314163..7eabcb1c43 100644
---
a/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java
+++
b/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java
@@ -57,6 +57,7 @@ public class ActionDummyDialog extends ActionDialog
implements IActionDialog {
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(400, 120);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -69,11 +70,12 @@ public class ActionDummyDialog extends ActionDialog
implements IActionDialog {
shell.setLayout(formLayout);
shell.setText(BaseMessages.getString(PKG, "ActionDummyDialog.Title"));
- int margin = props.getMargin();
+ int margin = PropsUi.getMargin();
int middle = props.getMiddlePct();
Label wlName = new Label(shell, SWT.RIGHT);
- wlName.setText(BaseMessages.getString(PKG,
"ActionDummyDialog.Name.Label"));
+ wlName.setText(BaseMessages.getString(PKG, "System.ActionName.Label"));
+ wlName.setToolTipText(BaseMessages.getString(PKG,
"System.ActionName.Tooltip"));
PropsUi.setLook(wlName);
FormData fdlName = new FormData();
fdlName.left = new FormAttachment(0, 0);
