X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteUiUtils.java;h=21d8d937dda6dcd2719646e6887a9b00d565f6e7;hb=3cf66bc01bb8ad4c55139ae01be5a5bdb3759e2c;hp=08d2410e5495fd1cc9bcf3780e802e5a18e175d9;hpb=0065916d6aac82d95b21e56f7c531bd418b06faf;p=gpl%2Fargeo-suite.git
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 08d2410..21d8d93 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
@@ -7,10 +7,18 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.api.cms.CmsEvent;
+import org.argeo.api.cms.CmsStyle;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.api.cms.CmsView;
+import org.argeo.cms.LocaleUtils;
import org.argeo.cms.Localized;
-import org.argeo.cms.ui.CmsEditable;
-import org.argeo.cms.ui.dialogs.CmsWizardDialog;
+import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.swt.CmsIcon;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.dialogs.LightweightDialog;
+import org.argeo.cms.ui.util.CmsLink;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.entity.EntityNames;
@@ -18,17 +26,21 @@ 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;
-import org.eclipse.jface.wizard.Wizard;
+import org.argeo.suite.SuiteRole;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.osgi.service.event.Event;
/** UI utilities related to the APAF project. */
public class SuiteUiUtils {
@@ -40,19 +52,19 @@ public class SuiteUiUtils {
/** creates a title bar composite with label and optional button */
public static void addTitleBar(Composite parent, String title, Boolean isEditable) {
Composite titleBar = new Composite(parent, SWT.NONE);
- titleBar.setLayoutData(CmsUiUtils.fillWidth());
- CmsUiUtils.style(titleBar, SuiteStyle.titleContainer);
+ titleBar.setLayoutData(CmsSwtUtils.fillWidth());
+ CmsSwtUtils.style(titleBar, SuiteStyle.titleContainer);
- titleBar.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(2, false)));
+ titleBar.setLayout(CmsSwtUtils.noSpaceGridLayout(new GridLayout(2, false)));
Label titleLbl = new Label(titleBar, SWT.NONE);
titleLbl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
- CmsUiUtils.style(titleLbl, SuiteStyle.titleLabel);
+ CmsSwtUtils.style(titleLbl, SuiteStyle.titleLabel);
titleLbl.setText(title);
if (isEditable) {
Button editBtn = new Button(titleBar, SWT.PUSH);
editBtn.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
- CmsUiUtils.style(editBtn, SuiteStyle.inlineButton);
+ CmsSwtUtils.style(editBtn, SuiteStyle.inlineButton);
editBtn.setText("Edit");
}
}
@@ -61,7 +73,7 @@ public class SuiteUiUtils {
Label lbl = new Label(parent, SWT.WRAP);
lbl.setText(label);
// lbl.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, true));
- CmsUiUtils.style(lbl, SuiteStyle.simpleLabel);
+ CmsSwtUtils.style(lbl, SuiteStyle.simpleLabel);
return lbl;
}
@@ -76,20 +88,20 @@ public class SuiteUiUtils {
if (message != null)
txt.setMessage(message);
txt.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, true));
- CmsUiUtils.style(txt, SuiteStyle.simpleText);
+ CmsSwtUtils.style(txt, SuiteStyle.simpleText);
return txt;
}
public static Text addFormInputField(Composite parent, String placeholder) {
Text txt = new Text(parent, SWT.BORDER);
- GridData gridData = CmsUiUtils.fillWidth();
+ GridData gridData = CmsSwtUtils.fillWidth();
txt.setLayoutData(gridData);
if (placeholder != null)
txt.setText(placeholder);
- CmsUiUtils.style(txt, SuiteStyle.simpleInput);
+ CmsSwtUtils.style(txt, SuiteStyle.simpleInput);
return txt;
}
@@ -98,11 +110,11 @@ public class SuiteUiUtils {
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);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
Text txt = addFormTextField(lineComposite, text, null);
txt.setEditable(false);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
@@ -111,7 +123,7 @@ public class SuiteUiUtils {
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);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
String text = Jcr.get(node, property);
// int style = cmsEditable.isEditing() ? SWT.WRAP : SWT.WRAP;
@@ -124,7 +136,7 @@ public class SuiteUiUtils {
} else {
txt.setEditable(false);
}
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
@@ -132,10 +144,10 @@ public class SuiteUiUtils {
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);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
Text txt = addFormInputField(lineComposite, placeholder);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
@@ -147,14 +159,14 @@ public class SuiteUiUtils {
Composite lineComposite = new Composite(parent, SWT.NONE);
lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
lineComposite.setLayout(new GridLayout(3, false));
- CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
Label offsetLbl = new Label(lineComposite, SWT.NONE);
GridData gridData = new GridData();
gridData.widthHint = offset;
offsetLbl.setLayoutData(gridData);
addFormLabel(lineComposite, label);
Text txt = addFormTextField(lineComposite, text, null);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
@@ -166,7 +178,7 @@ public class SuiteUiUtils {
addFormLabel(parent, label);
Text txt = addFormTextField(parent, text, null);
txt.setEditable(false);
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
@@ -187,7 +199,7 @@ public class SuiteUiUtils {
} else {
txt.setEditable(false);
}
- txt.setLayoutData(CmsUiUtils.fillWidth());
+ txt.setLayoutData(CmsSwtUtils.fillWidth());
return txt;
}
@@ -203,7 +215,7 @@ public class SuiteUiUtils {
Composite lineComposite = new Composite(parent, SWT.NONE);
lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
lineComposite.setLayout(new GridLayout(2, true));
- CmsUiUtils.style(lineComposite, SuiteStyle.formLine);
+ CmsSwtUtils.style(lineComposite, SuiteStyle.formLine);
addFormLabel(lineComposite, label);
return addPicture(lineComposite, fileNode);
@@ -214,68 +226,207 @@ public class SuiteUiUtils {
}
public static Label addPicture(Composite parent, Node fileNode, Integer maxWidth) throws RepositoryException {
+ return addPicture(parent, fileNode, maxWidth, null);
+ }
+
+ public static Label addPicture(Composite parent, Node fileNode, Integer maxWidth, Node link)
+ throws RepositoryException {
Node content = fileNode.getNode(Node.JCR_CONTENT);
// TODO move it deeper in the middleware.
if (!content.isNodeType(EntityType.box.get())) {
+ if (content.getSession().hasPermission(content.getPath(), Session.ACTION_SET_PROPERTY)) {
+ try (InputStream in = JcrUtils.getFileAsStream(fileNode)) {
+ ImageData imageData = new ImageData(in);
+ content.addMixin(EntityType.box.get());
+ content.setProperty(EntityNames.SVG_WIDTH, imageData.width);
+ content.setProperty(EntityNames.SVG_HEIGHT, imageData.height);
+ content.getSession().save();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ // TODO optimise
+ Long width;
+ Long height;
+ if (content.isNodeType(EntityType.box.get())) {
+ width = content.getProperty(EntityNames.SVG_WIDTH).getLong();
+ height = content.getProperty(EntityNames.SVG_HEIGHT).getLong();
+ } else {
try (InputStream in = JcrUtils.getFileAsStream(fileNode)) {
ImageData imageData = new ImageData(in);
- content.addMixin(EntityType.box.get());
- content.setProperty(EntityNames.SVG_WIDTH, imageData.width);
- content.setProperty(EntityNames.SVG_HEIGHT, imageData.height);
- content.getSession().save();
+ width = Long.valueOf(imageData.width);
+ height = Long.valueOf(imageData.height);
} catch (IOException e) {
- throw new IllegalStateException(e);
+ throw new RuntimeException(e);
}
}
- Long width = content.getProperty(EntityNames.SVG_WIDTH).getLong();
- Long height = content.getProperty(EntityNames.SVG_HEIGHT).getLong();
if (maxWidth != null && width > maxWidth) {
Double ratio = maxWidth.doubleValue() / width.doubleValue();
width = maxWidth.longValue();
height = Math.round(ratio * height);
}
Label img = new Label(parent, SWT.NONE);
- CmsUiUtils.markup(img);
- img.setText(CmsUiUtils.img(fileNode, width.toString(), height.toString()));
- if (parent.getLayout() instanceof GridLayout)
- img.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+ CmsSwtUtils.markup(img);
+ StringBuffer txt = new StringBuffer();
+ String target = toLink(link);
+ if (target != null)
+ txt.append("");
+ txt.append(CmsUiUtils.img(fileNode, width.toString(), height.toString()));
+ if (target != null)
+ txt.append("");
+ img.setText(txt.toString());
+ if (parent.getLayout() instanceof GridLayout) {
+ GridData gd = new GridData(SWT.CENTER, SWT.CENTER, false, false);
+ gd.widthHint = width.intValue();
+ gd.heightHint = height.intValue();
+ img.setLayoutData(gd);
+ }
+
+ if (target == null)
+ img.addMouseListener(new MouseListener() {
+ private static final long serialVersionUID = -1362242049325206168L;
+
+ @Override
+ public void mouseUp(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseDown(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseDoubleClick(MouseEvent e) {
+ LightweightDialog dialog = new LightweightDialog(img.getShell()) {
+
+ @Override
+ protected Control createDialogArea(Composite parent) {
+ parent.setLayout(new GridLayout());
+ ScrolledComposite scroll = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+ scroll.setLayoutData(CmsSwtUtils.fillAll());
+ scroll.setLayout(CmsSwtUtils.noSpaceGridLayout());
+ scroll.setExpandHorizontal(true);
+ scroll.setExpandVertical(true);
+ // scroll.setAlwaysShowScrollBars(true);
+
+ Composite c = new Composite(scroll, SWT.NONE);
+ scroll.setContent(c);
+ c.setLayout(new GridLayout());
+ c.setLayoutData(CmsSwtUtils.fillAll());
+ Label bigImg = new Label(c, SWT.NONE);
+ CmsSwtUtils.markup(bigImg);
+ bigImg.setText(CmsUiUtils.img(fileNode, Jcr.get(content, EntityNames.SVG_WIDTH),
+ Jcr.get(content, EntityNames.SVG_HEIGHT)));
+ bigImg.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
+ return bigImg;
+ }
+
+ @Override
+ protected Point getInitialSize() {
+ Point shellSize = img.getShell().getSize();
+ return new Point(shellSize.x - 100, shellSize.y - 100);
+ }
+
+ };
+ dialog.open();
+ }
+ });
return img;
}
- public static String createAndConfigureEntity(Shell shell, Session referenceSession, String mainMixin,
- String... additionnalProps) {
-
- Session tmpSession = null;
- Session mainSession = null;
- try {
- // FIXME would not work if home is another physical workspace
- tmpSession = referenceSession.getRepository().login(NodeConstants.HOME_WORKSPACE);
- Node draftNode = null;
- for (int i = 0; i < additionnalProps.length - 1; i += 2) {
- draftNode.setProperty(additionnalProps[i], additionnalProps[i + 1]);
- }
- Wizard wizard = null;
- CmsWizardDialog dialog = new CmsWizardDialog(shell, wizard);
- // WizardDialog dialog = new WizardDialog(shell, wizard);
- if (dialog.open() == Window.OK) {
- String parentPath = null;// "/" + appService.getBaseRelPath(mainMixin);
- // FIXME it should be possible to specify the workspace
- mainSession = referenceSession.getRepository().login();
- Node parent = mainSession.getNode(parentPath);
- Node task = null;// appService.publishEntity(parent, mainMixin, draftNode);
-// task = appService.saveEntity(task, false);
- referenceSession.refresh(true);
- return task.getPath();
- }
- return null;
- } catch (RepositoryException e1) {
- throw new JcrException(
- "Unable to create " + mainMixin + " entity with session " + referenceSession.toString(), e1);
- } finally {
- JcrUtils.logoutQuietly(tmpSession);
- JcrUtils.logoutQuietly(mainSession);
+ public static String toLink(Node node) {
+ return node != null ? "#" + CmsUiUtils.cleanPathForUrl(SuiteApp.nodeToState(node)) : null;
+ }
+
+ public static Control addLink(Composite parent, String label, Node node, CmsStyle style)
+ throws RepositoryException {
+ String target = toLink(node);
+ CmsLink link = new CmsLink(label, target, style);
+ return link.createUi(parent, node);
+ }
+
+ public static Control addExternalLink(Composite parent, String label, String url, String plainCssAnchorClass,
+ boolean newWindow) throws RepositoryException {
+ Label lbl = new Label(parent, SWT.NONE);
+ CmsSwtUtils.markup(lbl);
+ StringBuilder txt = new StringBuilder();
+ txt.append("");
+ txt.append(label);
+ txt.append("");
+ lbl.setText(txt.toString());
+ return lbl;
}
+ public static boolean isCoworker(CmsView cmsView) {
+ boolean coworker = cmsView.doAs(() -> CurrentUser.isInRole(SuiteRole.coworker.dn()));
+ return coworker;
+ }
+
+ public static boolean isTopic(Event event, CmsEvent cmsEvent) {
+ return event.getTopic().equals(cmsEvent.topic());
+ }
+
+ public static Button createLayerButton(Composite parent, String layer, Localized msg, CmsIcon icon,
+ ClassLoader l10nClassLoader) {
+ CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+ Button button = new Button(parent, SWT.PUSH);
+ CmsSwtUtils.style(button, SuiteStyle.leadPane);
+ if (icon != null)
+ button.setImage(icon.getBigIcon(theme));
+ button.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
+ // button.setToolTipText(msg.lead());
+ if (msg != null) {
+ Label lbl = new Label(parent, SWT.CENTER);
+ CmsSwtUtils.style(lbl, SuiteStyle.leadPane);
+ String txt = LocaleUtils.lead(msg, l10nClassLoader);
+// String txt = msg.lead();
+ lbl.setText(txt);
+ lbl.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
+ }
+ CmsSwtUtils.sendEventOnSelect(button, SuiteEvent.switchLayer.topic(), SuiteEvent.LAYER, layer);
+ return button;
+ }
+
+// public static String createAndConfigureEntity(Shell shell, Session referenceSession, String mainMixin,
+// String... additionnalProps) {
+//
+// Session tmpSession = null;
+// Session mainSession = null;
+// try {
+// // FIXME would not work if home is another physical workspace
+// tmpSession = referenceSession.getRepository().login(NodeConstants.HOME_WORKSPACE);
+// Node draftNode = null;
+// for (int i = 0; i < additionnalProps.length - 1; i += 2) {
+// draftNode.setProperty(additionnalProps[i], additionnalProps[i + 1]);
+// }
+// Wizard wizard = null;
+// CmsWizardDialog dialog = new CmsWizardDialog(shell, wizard);
+// // WizardDialog dialog = new WizardDialog(shell, wizard);
+// if (dialog.open() == Window.OK) {
+// String parentPath = null;// "/" + appService.getBaseRelPath(mainMixin);
+// // FIXME it should be possible to specify the workspace
+// mainSession = referenceSession.getRepository().login();
+// Node parent = mainSession.getNode(parentPath);
+// Node task = null;// appService.publishEntity(parent, mainMixin, draftNode);
+//// task = appService.saveEntity(task, false);
+// referenceSession.refresh(true);
+// return task.getPath();
+// }
+// return null;
+// } catch (RepositoryException e1) {
+// throw new JcrException(
+// "Unable to create " + mainMixin + " entity with session " + referenceSession.toString(), e1);
+// } finally {
+// JcrUtils.logoutQuietly(tmpSession);
+// JcrUtils.logoutQuietly(mainSession);
+// }
+// }
+
}