projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cancel form submission if a listener has failed
[gpl/argeo-suite.git]
/
swt
/
org.argeo.app.ui
/
src
/
org
/
argeo
/
app
/
ui
/
SuiteUiUtils.java
diff --git
a/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java
b/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java
index 9d9395bb051950dbba4b6fde3f908b20a2ce420a..504e8eda75c87f6ea07a5b91508cad0c93bc35c0 100644
(file)
--- a/
swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java
+++ b/
swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java
@@
-17,13
+17,10
@@
import org.argeo.api.cms.CmsEvent;
import org.argeo.api.cms.ux.CmsEditable;
import org.argeo.api.cms.ux.CmsIcon;
import org.argeo.api.cms.ux.CmsStyle;
import org.argeo.api.cms.ux.CmsEditable;
import org.argeo.api.cms.ux.CmsIcon;
import org.argeo.api.cms.ux.CmsStyle;
-import org.argeo.api.cms.ux.CmsView;
import org.argeo.app.api.EntityNames;
import org.argeo.app.api.EntityType;
import org.argeo.app.api.EntityNames;
import org.argeo.app.api.EntityType;
-import org.argeo.app.api.SuiteRole;
import org.argeo.cms.LocaleUtils;
import org.argeo.cms.Localized;
import org.argeo.cms.LocaleUtils;
import org.argeo.cms.Localized;
-import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.jcr.acr.JcrContent;
import org.argeo.cms.swt.CmsSwtTheme;
import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.jcr.acr.JcrContent;
import org.argeo.cms.swt.CmsSwtTheme;
import org.argeo.cms.swt.CmsSwtUtils;
@@
-74,6
+71,10
@@
public class SuiteUiUtils {
}
}
}
}
+ public static Label addFormLabel(Composite parent, Localized msg) {
+ return addFormLabel(parent, msg.lead());
+ }
+
public static Label addFormLabel(Composite parent, String label) {
Label lbl = new Label(parent, SWT.WRAP);
lbl.setText(label);
public static Label addFormLabel(Composite parent, String label) {
Label lbl = new Label(parent, SWT.WRAP);
lbl.setText(label);
@@
-241,7
+242,8
@@
public class SuiteUiUtils {
boolean test = false;
if (test) {
try (InputStream in = JcrUtils.getFileAsStream(fileNode);
boolean test = false;
if (test) {
try (InputStream in = JcrUtils.getFileAsStream(fileNode);
- OutputStream out = Files.newOutputStream(Paths.get("/home/mbaudier/tmp/" + fileNode.getName()));) {
+ OutputStream out = Files.newOutputStream(
+ Paths.get(System.getProperty("user.home") + "/tmp/" + fileNode.getName()));) {
// BufferedImage img = ImageIO.read(in);
// System.out.println(fileNode.getName() + ": width=" + img.getWidth() + ", height=" + img.getHeight());
IOUtils.copy(in, out);
// BufferedImage img = ImageIO.read(in);
// System.out.println(fileNode.getName() + ": width=" + img.getWidth() + ", height=" + img.getHeight());
IOUtils.copy(in, out);
@@
-381,7
+383,9
@@
public class SuiteUiUtils {
Label lbl = new Label(parent, SWT.NONE);
CmsSwtUtils.markup(lbl);
StringBuilder txt = new StringBuilder();
Label lbl = new Label(parent, SWT.NONE);
CmsSwtUtils.markup(lbl);
StringBuilder txt = new StringBuilder();
- txt.append("<a class='" + plainCssAnchorClass + "'");
+ txt.append("<a");
+ if (plainCssAnchorClass != null)
+ txt.append(" class='" + plainCssAnchorClass + "'");
txt.append(" href='").append(url).append("'");
if (newWindow) {
txt.append(" target='blank_'");
txt.append(" href='").append(url).append("'");
if (newWindow) {
txt.append(" target='blank_'");
@@
-420,7
+424,7
@@
public class SuiteUiUtils {
lbl.setText(txt);
lbl.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
}
lbl.setText(txt);
lbl.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
}
- CmsSwtUtils.sendEventOnSelect(button, Suite
Event.switchLayer.topic(), Suite
Event.LAYER, layer);
+ CmsSwtUtils.sendEventOnSelect(button, Suite
UxEvent.switchLayer.topic(), SuiteUx
Event.LAYER, layer);
return button;
}
return button;
}