From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 6 Dec 2020 05:29:13 +0000 (+0100)
Subject: Extend SUIte UI utils.
X-Git-Tag: argeo-suite-2.1.16~9
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=0065916d6aac82d95b21e56f7c531bd418b06faf

Extend SUIte UI utils.
---

diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
index 0cf53b6..4f2edeb 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
@@ -29,12 +29,16 @@ public interface EntityNames {
 	final String ENTITY_RELATED_TO = "entity:relatedTo";
 
 	// LDAP-LIKE ENTITIES
+	@Deprecated
 	final String DISPLAY_NAME = LdapAttrs.displayName.property();
 	// Persons
+	@Deprecated
 	final String GIVEN_NAME = LdapAttrs.givenName.property();
+	@Deprecated
 	final String SURNAME = LdapAttrs.sn.property();
+	@Deprecated
 	final String EMAIL = LdapAttrs.mail.property();
-
+	@Deprecated
 	final String OU = LdapAttrs.ou.property();
 
 	// WGS84
diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
index ace189c..08d2410 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
@@ -9,11 +9,13 @@ import javax.jcr.Session;
 
 import org.argeo.api.NodeConstants;
 import org.argeo.cms.Localized;
+import org.argeo.cms.ui.CmsEditable;
 import org.argeo.cms.ui.dialogs.CmsWizardDialog;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.entity.EntityNames;
 import org.argeo.entity.EntityType;
+import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.jface.window.Window;
@@ -58,13 +60,17 @@ public class SuiteUiUtils {
 	public static Label addFormLabel(Composite parent, String label) {
 		Label lbl = new Label(parent, SWT.WRAP);
 		lbl.setText(label);
-		//lbl.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, true));
+		// lbl.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, true));
 		CmsUiUtils.style(lbl, SuiteStyle.simpleLabel);
 		return lbl;
 	}
 
 	public static Text addFormTextField(Composite parent, String text, String message) {
-		Text txt = new Text(parent, SWT.WRAP);
+		return addFormTextField(parent, text, message, SWT.NONE);
+	}
+
+	public static Text addFormTextField(Composite parent, String text, String message, int style) {
+		Text txt = new Text(parent, style);
 		if (text != null)
 			txt.setText(text);
 		if (message != null)
@@ -95,6 +101,29 @@ public class SuiteUiUtils {
 		CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
 		addFormLabel(lineComposite, label);
 		Text txt = addFormTextField(lineComposite, text, null);
+		txt.setEditable(false);
+		txt.setLayoutData(CmsUiUtils.fillWidth());
+		return txt;
+	}
+
+	public static Text addFormLine(Composite parent, String label, Node node, String property,
+			CmsEditable cmsEditable) {
+		Composite lineComposite = new Composite(parent, SWT.NONE);
+		lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+		lineComposite.setLayout(new GridLayout(2, false));
+		CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+		addFormLabel(lineComposite, label);
+		String text = Jcr.get(node, property);
+//		int style = cmsEditable.isEditing() ? SWT.WRAP : SWT.WRAP;
+		Text txt = addFormTextField(lineComposite, text, null, SWT.WRAP);
+		if (cmsEditable != null && cmsEditable.isEditing()) {
+			txt.addModifyListener((e) -> {
+				Jcr.set(node, property, txt.getText());
+				Jcr.save(node);
+			});
+		} else {
+			txt.setEditable(false);
+		}
 		txt.setLayoutData(CmsUiUtils.fillWidth());
 		return txt;
 	}
@@ -131,11 +160,33 @@ public class SuiteUiUtils {
 
 	/** creates a single vertical-block composite for key:value display */
 	public static Text addFormColumn(Composite parent, String label, String text) {
-		Composite columnComposite = new Composite(parent, SWT.NONE);
-		columnComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		columnComposite.setLayout(new GridLayout(1, false));
-		addFormLabel(columnComposite, label);
-		Text txt = addFormTextField(columnComposite, text, null);
+//		Composite columnComposite = new Composite(parent, SWT.NONE);
+//		columnComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+//		columnComposite.setLayout(new GridLayout(1, false));
+		addFormLabel(parent, label);
+		Text txt = addFormTextField(parent, text, null);
+		txt.setEditable(false);
+		txt.setLayoutData(CmsUiUtils.fillWidth());
+		return txt;
+	}
+
+	public static Text addFormColumn(Composite parent, String label, Node node, String property,
+			CmsEditable cmsEditable) {
+//		Composite columnComposite = new Composite(parent, SWT.NONE);
+//		columnComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+//		columnComposite.setLayout(new GridLayout(1, false));
+		addFormLabel(parent, label);
+		String text = Jcr.get(node, property);
+//		int style = cmsEditable.isEditing() ? SWT.WRAP : SWT.WRAP;
+		Text txt = addFormTextField(parent, text, null, SWT.WRAP);
+		if (cmsEditable != null && cmsEditable.isEditing()) {
+			txt.addModifyListener((e) -> {
+				Jcr.set(node, property, txt.getText());
+				Jcr.save(node);
+			});
+		} else {
+			txt.setEditable(false);
+		}
 		txt.setLayoutData(CmsUiUtils.fillWidth());
 		return txt;
 	}