X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FCmsUiUtils.java;h=6b411cc302eb994676423a873003e22141dc3dce;hb=fb3182380d9688998a81d853a4eebcf87b6a48c7;hp=915b033365d8adab08ab6ab538e088fd946ca183;hpb=32315b6eea1e2284e4269536b5fb7fee8cc03b8d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
index 915b03336..6b411cc30 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
@@ -16,6 +16,7 @@ import org.argeo.api.NodeUtils;
 import org.argeo.cms.ui.CmsConstants;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.eclipse.ui.Selected;
+import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.service.ResourceManager;
@@ -163,7 +164,7 @@ public class CmsUiUtils implements CmsConstants {
 	 * FORM LAYOUT
 	 */
 
-	public static FormData coversAll() {
+	public static FormData coverAll() {
 		FormData fdLabel = new FormData();
 		fdLabel.top = new FormAttachment(0, 0);
 		fdLabel.left = new FormAttachment(0, 0);
@@ -180,19 +181,21 @@ public class CmsUiUtils implements CmsConstants {
 	public static <T extends Widget> T style(T widget, String style) {
 		if (style == null)
 			return widget;// does nothing
-		widget.setData(CmsConstants.STYLE, style);
+		EclipseUiSpecificUtils.setStyleData(widget, style);
+		if (widget instanceof Control) {
+			CmsView.getCmsView((Control) widget).applyStyles(widget);
+		}
 		return widget;
 	}
 
 	/** Style widget */
 	public static <T extends Widget> T style(T widget, CmsStyle style) {
-		widget.setData(CmsConstants.STYLE, style.toStyleClass());
-		return widget;
+		return style(widget, style.toStyleClass());
 	}
 
 	/** Enable markups on widget */
 	public static <T extends Widget> T markup(T widget) {
-		widget.setData(CmsConstants.MARKUP, true);
+		EclipseUiSpecificUtils.setMarkupData(widget);
 		return widget;
 	}
 
@@ -232,6 +235,7 @@ public class CmsUiUtils implements CmsConstants {
 		return text(new Text(parent, SWT.NONE), txt);
 	}
 
+	@Deprecated
 	public static void setItemHeight(Table table, int height) {
 		table.setData(CmsConstants.ITEM_HEIGHT, height);
 	}
@@ -273,6 +277,11 @@ public class CmsUiUtils implements CmsConstants {
 	}
 
 	// IMAGES
+	public static String img(Node fileNode, String width, String height) {
+		String src = NodeUtils.getDataPath(fileNode);
+		return imgBuilder(src, width, height).append("/>").toString();
+	}
+
 	public static String img(String src, String width, String height) {
 		return imgBuilder(src, width, height).append("/>").toString();
 	}