Merge pull request #4652 from nadment/4651

Add a property to the ColumnInfo class to define an image #4651
apache · Dec 10, 2024 · 689528c · 689528c
2 parents b9f2bde + 991ad7d
commit 689528c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/PreviewRowsDialog.java b/ui/src/main/java/org/apache/hop/ui/core/dialog/PreviewRowsDialog.java
@@ -287,10 +287,12 @@ private boolean addFields() {
 
     ColumnInfo[] columns = new ColumnInfo[rowMeta.size()];
     for (int i = 0; i < rowMeta.size(); i++) {
-      IValueMeta v = rowMeta.getValueMeta(i);
-      columns[i] = new ColumnInfo(v.getName(), ColumnInfo.COLUMN_TYPE_TEXT, v.isNumeric());
-      columns[i].setToolTip(v.toStringMeta());
-      columns[i].setValueMeta(v);
+      IValueMeta valueMeta = rowMeta.getValueMeta(i);
+      columns[i] =
+          new ColumnInfo(valueMeta.getName(), ColumnInfo.COLUMN_TYPE_TEXT, valueMeta.isNumeric());
+      columns[i].setToolTip(valueMeta.toStringMeta());
+      columns[i].setValueMeta(valueMeta);
+      columns[i].setImage(GuiResource.getInstance().getImage(valueMeta));
     }
 
     wFields =

diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/ColumnInfo.java b/ui/src/main/java/org/apache/hop/ui/core/widget/ColumnInfo.java
@@ -23,6 +23,7 @@
 import org.apache.hop.core.row.value.ValueMetaString;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
 
 /** Used to define the behaviour and the content of a Table column in a TableView object. */
 public class ColumnInfo {
@@ -41,6 +42,7 @@ public class ColumnInfo {
   private Supplier<String[]> comboValueSupplier = () -> comboValues;
   private boolean numeric;
   private String tooltip;
+  private Image image;
   private int alignment;
   private boolean readonly;
   private String buttonText;
@@ -241,6 +243,19 @@ public String getToolTip() {
     return tooltip;
   }
 
+  public Image getImage() {
+    return image;
+  }
+
+  /**
+   * Sets the column's image to be displayed.
+   *
+   * @param image the image to display on the receiver (may be null)
+   */
+  public void setImage(Image image) {
+    this.image = image;
+  }
+
   public int getAlignment() {
     return alignment;
   }

diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java b/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
@@ -394,7 +394,10 @@ public TableView(
         tableColumn[i + 1].setText(columnName);
       }
       if (columns[i].getToolTip() != null) {
-        tableColumn[i + 1].setToolTipText((columns[i].getToolTip()));
+        tableColumn[i + 1].setToolTipText(columns[i].getToolTip());
+      }
+      if (columns[i].getImage() != null) {
+        tableColumn[i + 1].setImage(columns[i].getImage());
       }
       IValueMeta valueMeta = columns[i].getValueMeta();
       if (valueMeta != null && valueMeta.isNumeric()) {

diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/execution/PipelineExecutionViewer.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/execution/PipelineExecutionViewer.java
@@ -544,6 +544,7 @@ private void showDataRows() {
                       valueMeta.getName(), ColumnInfo.COLUMN_TYPE_TEXT, valueMeta.isNumeric());
               columnInfo.setValueMeta(valueMeta);
               columnInfo.setToolTip(valueMeta.toStringMeta());
+              columnInfo.setImage(GuiResource.getInstance().getImage(valueMeta));
               columns.add(columnInfo);
             }