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 8b48f7ba2e Add variable icon to TabItem in Run Pipeline/Workflow
dialog #2471 - fix variable icon size - small cleanup
new 83fd25371d Merge pull request #2472 from nadment/2471
8b48f7ba2e is described below
commit 8b48f7ba2e4720db260203febc5879796dcd352b
Author: Nicolas Adment <[email protected]>
AuthorDate: Fri Feb 24 19:06:41 2023 +0100
Add variable icon to TabItem in Run Pipeline/Workflow dialog #2471
- fix variable icon size
- small cleanup
---
.../java/org/apache/hop/ui/core/dialog/BaseDialog.java | 6 ++++--
.../org/apache/hop/ui/core/dialog/ConfigurationDialog.java | 14 +++++---------
.../main/java/org/apache/hop/ui/core/gui/GuiResource.java | 6 +++++-
.../main/java/org/apache/hop/ui/core/widget/ComboVar.java | 2 +-
.../java/org/apache/hop/ui/core/widget/StyledTextComp.java | 2 +-
.../main/java/org/apache/hop/ui/core/widget/TextVar.java | 2 +-
.../java/org/apache/hop/ui/core/widget/TextVarButton.java | 2 +-
.../dialog/WorkflowExecutionConfigurationDialog.java | 10 +++++-----
8 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/BaseDialog.java
b/ui/src/main/java/org/apache/hop/ui/core/dialog/BaseDialog.java
index 4c382b6037..e7987ac327 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/BaseDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/BaseDialog.java
@@ -88,10 +88,12 @@ public abstract class BaseDialog extends Dialog {
public static final int MEDIUM_SMALL_FIELD = 150;
public static final int SMALL_FIELD = 50;
public static final int SHELL_WIDTH_OFFSET = 16;
+ @Deprecated
public static final int VAR_ICON_WIDTH =
- GuiResource.getInstance().getImageVariable().getBounds().width;
+ GuiResource.getInstance().getImageVariableMini().getBounds().width;
+ @Deprecated
public static final int VAR_ICON_HEIGHT =
- GuiResource.getInstance().getImageVariable().getBounds().height;
+ GuiResource.getInstance().getImageVariableMini().getBounds().height;
protected Map<String, Listener> buttons = new HashMap<>();
diff --git
a/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java
b/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java
index 91bb472e88..31936d63cc 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java
@@ -44,7 +44,6 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Dialog;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
@@ -62,7 +61,6 @@ public abstract class ConfigurationDialog extends Dialog {
protected TableView wVariables;
protected boolean retval;
protected Shell shell;
- protected PropsUi props;
protected Label wlLogLevel;
protected Group gDetails;
protected CCombo wLogLevel;
@@ -72,7 +70,6 @@ public abstract class ConfigurationDialog extends Dialog {
protected Control wRunConfigurationControl;
private TableView wParams;
- private Display display;
private Shell parent;
private Button wOk;
protected FormData fdDetails;
@@ -99,8 +96,7 @@ public abstract class ConfigurationDialog extends Dialog {
params.put(name, "");
}
- props = PropsUi.getInstance();
- margin = props.getMargin();
+ margin = PropsUi.getMargin();
}
protected void getInfoVariables() {
@@ -152,7 +148,7 @@ public abstract class ConfigurationDialog extends Dialog {
}
private void dispose() {
- props.setScreen(new WindowProperty(shell));
+ PropsUi.getInstance().setScreen(new WindowProperty(shell));
shell.dispose();
}
@@ -202,7 +198,6 @@ public abstract class ConfigurationDialog extends Dialog {
}
protected void mainLayout(String shellTitle, Image img) {
- display = parent.getDisplay();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX);
PropsUi.setLook(shell);
shell.setImage(img);
@@ -289,7 +284,7 @@ public abstract class ConfigurationDialog extends Dialog {
nrParams,
false,
null,
- props,
+ PropsUi.getInstance(),
false, null, false, false);
FormData fdParams = new FormData();
fdParams.top = new FormAttachment(0, 0);
@@ -304,6 +299,7 @@ public abstract class ConfigurationDialog extends Dialog {
CTabItem tbtmVariables = new CTabItem(tabFolder, SWT.NONE);
tbtmVariables.setFont(GuiResource.getInstance().getFontDefault());
tbtmVariables.setText(BaseMessages.getString(PKG, prefix +
".Variables.Label"));
+ tbtmVariables.setImage(GuiResource.getInstance().getImageVariable());
Composite variablesComposite = new Composite(tabFolder, SWT.NONE);
PropsUi.setLook(variablesComposite);
@@ -334,7 +330,7 @@ public abstract class ConfigurationDialog extends Dialog {
nrVariables,
false,
null,
- props,
+ PropsUi.getInstance(),
false, null, true, false);
FormData fdVariables = new FormData();
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 5a32b5e668..60e8319f25 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
@@ -1337,9 +1337,13 @@ public class GuiResource {
* @return the imageVariable
*/
public Image getImageVariable() {
- return getZoomedImaged(imageVariable, display, 10, 10);
+ return getZoomedImaged(imageVariable, display, ConstUi.SMALL_ICON_SIZE,
ConstUi.SMALL_ICON_SIZE);
}
+ public Image getImageVariableMini() {
+ return getZoomedImaged(imageVariable, display, 10, 10);
+ }
+
public Image getImagePipeline() {
return getZoomedImaged(
imagePipeline, display, ConstUi.SMALL_ICON_SIZE,
ConstUi.SMALL_ICON_SIZE);
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/ComboVar.java
b/ui/src/main/java/org/apache/hop/ui/core/widget/ComboVar.java
index 3ee41210a3..99a3fb83a4 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/ComboVar.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/ComboVar.java
@@ -100,7 +100,7 @@ public class ComboVar extends Composite {
// Add the variable $ image on the top right of the control
//
Label wlImage = new Label(this, SWT.NONE);
- wlImage.setImage(GuiResource.getInstance().getImageVariable());
+ wlImage.setImage(GuiResource.getInstance().getImageVariableMini());
wlImage.setToolTipText(BaseMessages.getString(PKG,
"TextVar.tooltip.InsertVariable"));
FormData fdlImage = new FormData();
fdlImage.top = new FormAttachment(0, 0);
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
b/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
index 9a35f71351..ba4470667e 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
@@ -82,7 +82,7 @@ public class StyledTextComp extends Composite {
// Special layout for variables decorator
if (varsSensitive) {
textWidget.addKeyListener(new ControlSpaceKeyAdapter(variables,
textWidget));
- image = GuiResource.getInstance().getImageVariable();
+ image = GuiResource.getInstance().getImageVariableMini();
if (variableIconOnTop) {
final Label wIcon = new Label(this, SWT.RIGHT);
PropsUi.setLook(wIcon);
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/TextVar.java
b/ui/src/main/java/org/apache/hop/ui/core/widget/TextVar.java
index c1699de7a1..cf38914dfb 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/TextVar.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/TextVar.java
@@ -160,7 +160,7 @@ public class TextVar extends Composite {
//
Label wImage = new Label(this, SWT.NONE);
PropsUi.setLook(wImage);
- wImage.setImage(GuiResource.getInstance().getImageVariable());
+ wImage.setImage(GuiResource.getInstance().getImageVariableMini());
wImage.setToolTipText(BaseMessages.getString(PKG,
"TextVar.tooltip.InsertVariable"));
FormData fdlImage = new FormData();
fdlImage.top = new FormAttachment(0, 0);
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/TextVarButton.java
b/ui/src/main/java/org/apache/hop/ui/core/widget/TextVarButton.java
index 2eb9f8badb..5a856832da 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/TextVarButton.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/TextVarButton.java
@@ -88,7 +88,7 @@ public class TextVarButton extends TextVar {
// Add the variable $ image on the top right of the control
//
Label wlImage = new Label(this, SWT.NONE);
- wlImage.setImage(GuiResource.getInstance().getImageVariable());
+ wlImage.setImage(GuiResource.getInstance().getImageVariableMini());
wlImage.setToolTipText(BaseMessages.getString(PKG,
"TextVar.tooltip.InsertVariable"));
FormData fdlImage = new FormData();
fdlImage.top = new FormAttachment(0, 0);
diff --git
a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
index 5866914ed2..edcf833ad1 100644
---
a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
+++
b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
@@ -122,11 +122,11 @@ public class WorkflowExecutionConfigurationDialog extends
ConfigurationDialog {
wStartAction.setToolTipText(
BaseMessages.getString(PKG,
"WorkflowExecutionConfigurationDialog.StartCopy.Tooltip"));
PropsUi.setLook(wStartAction);
- FormData fdStartJobCombo = new FormData();
- fdStartJobCombo.top = new FormAttachment(wlStartAction, 0, SWT.CENTER);
- fdStartJobCombo.left = new FormAttachment(wlStartAction,
props.getMargin());
- fdStartJobCombo.right = new FormAttachment(100, 0);
- wStartAction.setLayoutData(fdStartJobCombo);
+ FormData fdStartActionAction = new FormData();
+ fdStartActionAction.top = new FormAttachment(wlStartAction, 0, SWT.CENTER);
+ fdStartActionAction.left = new FormAttachment(wlStartAction,
PropsUi.getMargin());
+ fdStartActionAction.right = new FormAttachment(100, 0);
+ wStartAction.setLayoutData(fdStartActionAction);
WorkflowMeta workflowMeta = (WorkflowMeta) super.abstractMeta;
