Improve forms

[gpl/argeo-suite.git] / swt / org.argeo.app.swt / src / org / argeo / app / swt / terms / AbstractTermsPart.java

diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java
index e288143bdd8ade19e8d8005601ce351e87fcbce8..2ca2a57a00e34debe48be2b8b22f4fd460b36775 100644 (file)
--- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java
+++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/terms/AbstractTermsPart.java
@@ -17,7 +17,6 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.ToolItem;
 
@@ -40,6 +39,10 @@ public abstract class AbstractTermsPart extends StyledControl implements SwtEdit
 
        protected final CmsSwtTheme theme;
 
+       private int iconsSize = 12;
+
+       private String message;
+
        @SuppressWarnings("rawtypes")
        private Class<? extends Enum> localized;
 
@@ -90,7 +93,7 @@ public abstract class AbstractTermsPart extends StyledControl implements SwtEdit
                return true;
        }
 
-       protected void processTermListLabel(Term term, Label label) {
+       protected void processTermListLabel(Term term, Text label) {
 
        }
 
@@ -129,17 +132,22 @@ public abstract class AbstractTermsPart extends StyledControl implements SwtEdit
        }
 
        protected void styleCancel(ToolItem cancelItem) {
-               if (cancelIcon != null)
-                       cancelItem.setImage(theme.getSmallIcon(cancelIcon));
-               else
+               if (cancelIcon != null) {
+                       // cancelItem.setImage(theme.getSmallIcon(cancelIcon));
+                       cancelItem.setImage(theme.getIcon(cancelIcon.name(), iconsSize));
+
+               } else {
                        cancelItem.setText("X");
+               }
        }
 
        protected void styleAdd(ToolItem addItem) {
-               if (addIcon != null)
-                       addItem.setImage(theme.getSmallIcon(addIcon));
-               else
+               if (addIcon != null) {
+//                     addItem.setImage(theme.getSmallIcon(addIcon));
+                       addItem.setImage(theme.getIcon(addIcon.name(), iconsSize));
+               } else {
                        addItem.setText("+");
+               }
        }
 
        @Override
@@ -160,4 +168,12 @@ public abstract class AbstractTermsPart extends StyledControl implements SwtEdit
                this.localized = localized;
        }
 
+       public String getMessage() {
+               return message;
+       }
+
+       public void setMessage(String message) {
+               this.message = message;
+       }
+
 }