X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.swt%2Fsrc%2Forg%2Fargeo%2Fapp%2Fswt%2Fux%2FSuiteSwtUtils.java;h=66e84633a97037b7443aae84ad93808663806e51;hb=2f4a385fa5ee0ecd897d3243f7e571335860a12d;hp=cfd758fae82e12b3f456a9dc045c3b8b3d2c1ddd;hpb=718c0b4298449ae173cfb0e622215d936821fc77;p=gpl%2Fargeo-suite.git diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SuiteSwtUtils.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SuiteSwtUtils.java index cfd758f..66e8463 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SuiteSwtUtils.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SuiteSwtUtils.java @@ -1,15 +1,34 @@ package org.argeo.app.swt.ux; +import java.util.function.Predicate; + import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.QNamed; +import org.argeo.api.cms.ux.Cms2DSize; import org.argeo.api.cms.ux.CmsEditable; +import org.argeo.api.cms.ux.CmsStyle; import org.argeo.app.ux.SuiteStyle; import org.argeo.cms.Localized; +import org.argeo.cms.acr.ContentUtils; import org.argeo.cms.swt.CmsSwtUtils; +import org.argeo.cms.swt.acr.Img; +import org.argeo.cms.swt.dialogs.CmsFeedback; +import org.argeo.cms.swt.dialogs.LightweightDialog; +import org.argeo.cms.swt.widgets.CmsLink; +import org.argeo.cms.swt.widgets.EditableText; import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.ScrolledComposite; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -48,7 +67,7 @@ public class SuiteSwtUtils { 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.FILL, SWT.CENTER, false, false)); CmsSwtUtils.style(lbl, SuiteStyle.simpleLabel); return lbl; } @@ -63,8 +82,8 @@ public class SuiteSwtUtils { txt.setText(text); if (message != null) txt.setMessage(message); - txt.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, true)); - CmsSwtUtils.style(txt, SuiteStyle.simpleText); + txt.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true)); + CmsSwtUtils.style(txt, SuiteStyle.simpleInput); return txt; } @@ -72,22 +91,23 @@ public class SuiteSwtUtils { return addFormTextField(parent, text, message, SWT.NONE); } - public static Text addFormInputField(Composite parent, String placeholder) { - Text txt = new Text(parent, SWT.BORDER); - - GridData gridData = CmsSwtUtils.fillWidth(); - txt.setLayoutData(gridData); - - if (placeholder != null) - txt.setText(placeholder); - - CmsSwtUtils.style(txt, SuiteStyle.simpleInput); - return txt; - } +// public static Text addFormInputField(Composite parent, String placeholder) { +// Text txt = new Text(parent, SWT.BORDER); +// +// GridData gridData = CmsSwtUtils.fillWidth(); +// txt.setLayoutData(gridData); +// +// if (placeholder != null) +// txt.setText(placeholder); +// +// CmsSwtUtils.style(txt, SuiteStyle.simpleInput); +// return txt; +// } public static Composite addLineComposite(Composite parent, int columns) { Composite lineComposite = new Composite(parent, SWT.NONE); - lineComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); + GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); + lineComposite.setLayoutData(gd); lineComposite.setLayout(new GridLayout(columns, false)); CmsSwtUtils.style(lineComposite, SuiteStyle.formLine); return lineComposite; @@ -109,13 +129,13 @@ public class SuiteSwtUtils { return txt; } - public static Text addFormInput(Composite parent, String label, String placeholder) { - Composite lineComposite = addLineComposite(parent, 2); - addFormLabel(lineComposite, label); - Text txt = addFormInputField(lineComposite, placeholder); - txt.setLayoutData(CmsSwtUtils.fillWidth()); - return txt; - } +// public static Text addFormInput(Composite parent, String label, String placeholder) { +// Composite lineComposite = addLineComposite(parent, 2); +// addFormLabel(lineComposite, label); +// Text txt = addFormInputField(lineComposite, placeholder); +// txt.setLayoutData(CmsSwtUtils.fillWidth()); +// return txt; +// } /** * creates a single horizontal-block composite for key:value display, with @@ -159,30 +179,11 @@ public class SuiteSwtUtils { return label; } - public static Control addExternalLink(Composite parent, String label, String url, String plainCssAnchorClass, - boolean newWindow) { - 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; - } - /* * CONTENT */ public static String toLink(Content content) { - return content != null ? "#" + CmsSwtUtils.cleanPathForUrl(SwtArgeoApp.nodeToState(content)) : null; + return content != null ? "#" + ContentUtils.cleanPathForUrl(content.getPath()) : null; } public static Text addFormLine(Composite parent, Localized label, Content content, QNamed property, @@ -190,6 +191,84 @@ public class SuiteSwtUtils { return addFormLine(parent, label.lead(), content, property.qName(), cmsEditable); } + public static EditableText addTextLine(Composite parent, int style, Localized msg, Content content, QNamed attr, + CmsEditable cmsEditable, boolean line, Predicate validator) { + Composite parentToUse = line ? SuiteSwtUtils.addLineComposite(parent, 2) : parent; + SuiteSwtUtils.addFormLabel(parentToUse, msg.lead()); + EditableText text = createFormText(parentToUse, style, msg, content, attr, cmsEditable, validator); + return text; + } + + public static EditableText createFormText(Composite parent, int style, Localized msg, Content content, QNamed attr, + CmsEditable cmsEditable, Predicate validator) { + EditableText text = new EditableText(parent, style | SWT.FLAT | (cmsEditable.isEditing() ? 0 : SWT.READ_ONLY)); + text.setMessage("-"); + text.setLayoutData(CmsSwtUtils.fillWidth()); + text.setStyle(SuiteStyle.simpleInput); + String txt = content.attr(attr); + if (txt == null) + txt = ""; + text.setText(txt); + if (cmsEditable.isEditing()) + text.setMouseListener(new MouseAdapter() { + + private static final long serialVersionUID = 1L; + + @Override + public void mouseDoubleClick(MouseEvent e) { + String currentTxt = text.getText(); + text.startEditing(); + text.setText(currentTxt); + + Runnable save = () -> { + String editedTxt = text.getText(); + if (validator != null) { + if (!validator.test(editedTxt)) { + text.stopEditing(); + text.setText(currentTxt); + CmsFeedback.show(editedTxt + " is not properly formatted"); + return; + // throw new IllegalArgumentException(editedTxt + " is not properly formatted"); + } + } + content.put(attr, editedTxt); + text.stopEditing(); + text.setText(editedTxt); + text.getParent().layout(new Control[] { text.getControl() }); + }; + ((Text) text.getControl()).addSelectionListener(new SelectionListener() { + + private static final long serialVersionUID = 1L; + + @Override + public void widgetSelected(SelectionEvent e) { + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + save.run(); + } + }); + ((Text) text.getControl()).addFocusListener(new FocusListener() { + + private static final long serialVersionUID = 333838002411959302L; + + @Override + public void focusLost(FocusEvent event) { + save.run(); + } + + @Override + public void focusGained(FocusEvent event) { + } + }); + + } + + }); + return text; + } + public static Text addFormLine(Composite parent, String label, Content content, QName property, CmsEditable cmsEditable) { Composite lineComposite = SuiteSwtUtils.addLineComposite(parent, 2); @@ -216,10 +295,10 @@ public class SuiteSwtUtils { CmsEditable cmsEditable) { SuiteSwtUtils.addFormLabel(parent, label); String text = content.attr(property); - Text txt = SuiteSwtUtils.addFormTextField(parent, text, null, SWT.WRAP); + Text txt = SuiteSwtUtils.addFormTextField(parent, text, null, 0); if (cmsEditable != null && cmsEditable.isEditing()) { txt.addModifyListener((e) -> { - content.put(property, txt.getText()); + content.put(property, txt.getText().trim()); }); } else { txt.setEditable(false); @@ -228,6 +307,145 @@ public class SuiteSwtUtils { return txt; } + /* + * LINKS + */ + + /** Add a link to an internal content. */ + public static Control addLink(Composite parent, String label, Content node, CmsStyle style) { + String target = toLink(node); + CmsLink link = new CmsLink(label, target, style); + return link.createUi(parent); + } + + public static Control addExternalLink(Composite parent, String label, String url, String plainCssAnchorClass, + boolean newWindow) { + 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; + } + + /* + * IMAGES + */ + + public static Img addPicture(Composite parent, Content file) { + return addPicture(parent, file, null); + } + + public static Img addPicture(Composite parent, Content file, Integer maxWidth) { + return addPicture(parent, file, maxWidth, null); + } + + public static Img addPicture(Composite parent, Content file, Integer maxWidth, Content link) { + // TODO optimise +// Integer width; +// Integer height; +// if (file.hasContentClass(EntityType.box)) { +// width = file.get(SvgAttrs.width, Integer.class).get(); +// height = file.get(SvgAttrs.height, Integer.class).get(); +// } else { +// try (InputStream in = file.open(InputStream.class)) { +// ImageData imageData = new ImageData(in); +// width = imageData.width; +// height = imageData.height; +// } catch (IOException e) { +// throw new RuntimeException(e); +// } +// } +// +// if (maxWidth != null && width > maxWidth) { +// Double ratio = maxWidth.doubleValue() / width.doubleValue(); +// width = maxWidth; +// height = (int) Math.rint(ratio * height); +// } +// Label img = new Label(parent, SWT.NONE); +// 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); +// } + + Img img = new Img(parent, 0, file, new Cms2DSize(maxWidth != null ? maxWidth : 0, 0)); + if (link != null) + img.setLink(link); + +// String target = toLink(link); + if (link == 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()); + Img bigImg = new Img(c, 0, file); +// 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(); + } + }); + img.initControl(); + return img; + } + /** singleton */ private SuiteSwtUtils() { }