[PDI-14219] Variable Icon for Mail/MsgBox entries

Update Multiline Textbox to show the variable indicator next to supported options
pentaho · Nov 10, 2015 · b52224f · b52224f
1 parent 911e61a
commit b52224f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/ui/src/org/pentaho/di/ui/core/widget/TextVar.java b/ui/src/org/pentaho/di/ui/core/widget/TextVar.java
@@ -141,6 +141,7 @@ protected void initialize( VariableSpace space, Composite composite, int flags,
     fdText.top = new FormAttachment( 0, 0 );
     fdText.left = new FormAttachment( 0, 0 );
     fdText.right = new FormAttachment( 100, -image.getBounds().width );
+    fdText.bottom = new FormAttachment( 100, 0 );
     wText.setLayoutData( fdText );
   }
 

diff --git a/ui/src/org/pentaho/di/ui/job/entries/mail/JobEntryMailDialog.java b/ui/src/org/pentaho/di/ui/job/entries/mail/JobEntryMailDialog.java
@@ -180,7 +180,7 @@ public class JobEntryMailDialog extends JobEntryDialog implements JobEntryDialog
 
   private Label wlComment;
 
-  private Text wComment;
+  private TextVar wComment;
 
   private FormData fdlComment, fdComment;
 
@@ -905,7 +905,9 @@ public void widgetSelected( SelectionEvent e ) {
     fdlComment.right = new FormAttachment( middle, margin );
     wlComment.setLayoutData( fdlComment );
 
-    wComment = new Text( wMessageGroup, SWT.MULTI | SWT.LEFT | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL );
+
+    //wComment = new Text( wMessageGroup, SWT.MULTI | SWT.LEFT | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL );
+    wComment = new TextVar( jobMeta, wMessageGroup, SWT.MULTI | SWT.LEFT | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL );
     props.setLook( wComment );
     wComment.addModifyListener( lsMod );
     fdComment = new FormData();

diff --git a/ui/src/org/pentaho/di/ui/job/entries/msgboxinfo/JobEntryMsgBoxInfoDialog.java b/ui/src/org/pentaho/di/ui/job/entries/msgboxinfo/JobEntryMsgBoxInfoDialog.java
@@ -72,7 +72,7 @@ public class JobEntryMsgBoxInfoDialog extends JobEntryDialog implements JobEntry
 
   private Label wlBodyMessage;
 
-  private Text wBodyMessage;
+  private TextVar wBodyMessage;
 
   private FormData fdlBodyMessage, fdBodyMessage;
 
@@ -183,7 +183,7 @@ public void modifyText( ModifyEvent e ) {
     fdlBodyMessage.right = new FormAttachment( middle, -margin );
     wlBodyMessage.setLayoutData( fdlBodyMessage );
 
-    wBodyMessage = new Text( shell, SWT.MULTI | SWT.LEFT | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL );
+    wBodyMessage = new TextVar( jobMeta, shell, SWT.MULTI | SWT.LEFT | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL );
     wBodyMessage.setText( BaseMessages.getString( PKG, "MsgBoxInfo.Name.Default" ) );
     props.setLook( wBodyMessage, Props.WIDGET_STYLE_FIXED );
     wBodyMessage.addModifyListener( lsMod );