Add variable icon to TabItem in Run Pipeline/Workflow dialog apache#2471

- fix variable icon size
- small cleanup

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<>();
 

ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java

@@ -44,7 +44,6 @@
 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 ConfigurationDialog(
       params.put(name, "");
     }
 
-    props = PropsUi.getInstance();
-    margin = props.getMargin();
+    margin = PropsUi.getMargin();
   }
 
   protected void getInfoVariables() {
@@ -152,7 +148,7 @@ protected void ok() {
   }
 
   private void dispose() {
-    props.setScreen(new WindowProperty(shell));
+    PropsUi.getInstance().setScreen(new WindowProperty(shell));
     shell.dispose();
   }
 
@@ -202,7 +198,6 @@ public void setConfiguration(IExecutionConfiguration configuration) {
   }
 
   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 @@ protected void parametersSectionLayout(Class<?> PKG, String prefix) {
             nrParams,
             false,
             null,
-            props,
+            PropsUi.getInstance(),
             false, null, false, false);
     FormData fdParams = new FormData();
     fdParams.top = new FormAttachment(0, 0);
@@ -304,6 +299,7 @@ protected void parametersSectionLayout(Class<?> PKG, String prefix) {
     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 @@ protected void parametersSectionLayout(Class<?> PKG, String prefix) {
             nrVariables,
             false,
             null,
-            props,
+            PropsUi.getInstance(),
             false, null, true, false);
 
     FormData fdVariables = new FormData();

ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java

@@ -1337,9 +1337,13 @@ private Image getZoomedImaged(
    * @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);

ui/src/main/java/org/apache/hop/ui/core/widget/ComboVar.java

@@ -100,7 +100,7 @@ public ComboVar(
     // 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);

ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java

@@ -82,7 +82,7 @@ public StyledTextComp(
     // 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);

ui/src/main/java/org/apache/hop/ui/core/widget/TextVar.java

@@ -160,7 +160,7 @@ protected void initialize(
     //
     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);

ui/src/main/java/org/apache/hop/ui/core/widget/TextVarButton.java

@@ -88,7 +88,7 @@ protected void initialize(
     // 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);

ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java

@@ -122,11 +122,11 @@ protected void optionsSectionControls() {
     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;