projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
07ca7be
)
Improve forms framework.
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 16 Jan 2021 08:52:46 +0000
(09:52 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 16 Jan 2021 08:52:46 +0000
(09:52 +0100)
org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
patch
|
blob
|
history
org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java
patch
|
blob
|
history
org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsStyle.java
patch
|
blob
|
history
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
index 8f0685280232ddb54cdfc3692f06ba588c42e6fa..72b09e28a6da0879a6e11dea79cb44c3a6407916 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
@@
-16,9
+16,9
@@
import javax.jcr.ValueFormatException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.CmsException;
import org.argeo.cms.ui.CmsEditable;
import org.argeo.cms.ui.CmsImageManager;
import org.argeo.cms.ui.CmsEditable;
import org.argeo.cms.ui.CmsImageManager;
+import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.AbstractPageViewer;
import org.argeo.cms.ui.viewers.EditablePart;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.cms.ui.viewers.AbstractPageViewer;
import org.argeo.cms.ui.viewers.EditablePart;
@@
-28,6
+28,7
@@
import org.argeo.cms.ui.widgets.EditableImage;
import org.argeo.cms.ui.widgets.Img;
import org.argeo.cms.ui.widgets.StyledControl;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.cms.ui.widgets.Img;
import org.argeo.cms.ui.widgets.StyledControl;
import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.rap.fileupload.FileDetails;
import org.argeo.jcr.JcrUtils;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.rap.fileupload.FileDetails;
@@
-67,7
+68,7
@@
public class FormPageViewer extends AbstractPageViewer {
private final Section mainSection;
// TODO manage within the CSS
private final Section mainSection;
// TODO manage within the CSS
- private
int labelColWidth = 150
;
+ private
Integer labelColWidth = null
;
private int rowLayoutHSpacing = 8;
// Context cached in the viewer
private int rowLayoutHSpacing = 8;
// Context cached in the viewer
@@
-204,7
+205,7
@@
public class FormPageViewer extends AbstractPageViewer {
}
public void uploadFailed(FileUploadEvent event) {
}
public void uploadFailed(FileUploadEvent event) {
- throw new
Cms
Exception("Upload failed " + event, event.getException());
+ throw new
IllegalState
Exception("Upload failed " + event, event.getException());
}
public void uploadFinished(FileUploadEvent event) {
}
public void uploadFinished(FileUploadEvent event) {
@@
-305,7
+306,7
@@
public class FormPageViewer extends AbstractPageViewer {
protected CmsImageManager imageManager() {
if (imageManager == null)
protected CmsImageManager imageManager() {
if (imageManager == null)
- imageManager = Cms
UiUtils.getCmsView(
).getImageManager();
+ imageManager = Cms
View.getCmsView(mainSection
).getImageManager();
return imageManager;
}
return imageManager;
}
@@
-357,16
+358,17
@@
public class FormPageViewer extends AbstractPageViewer {
}
protected Label createPropertyLbl(Composite parent, String value) {
}
protected Label createPropertyLbl(Composite parent, String value) {
- return createPropertyLbl(parent, value, SWT.
TOP
);
+ return createPropertyLbl(parent, value, SWT.
NONE
);
}
protected Label createPropertyLbl(Composite parent, String value, int vAlign) {
}
protected Label createPropertyLbl(Composite parent, String value, int vAlign) {
-
boolean isSmall = CmsUiUtils.getCmsView(
).getUxContext().isSmall();
- Label label = new Label(parent,
isSmall ? SWT.LEFT : SWT.RIGHT
| SWT.WRAP);
+
// boolean isSmall = CmsView.getCmsView(parent
).getUxContext().isSmall();
+ Label label = new Label(parent,
SWT.LEAD
| SWT.WRAP);
label.setText(value + " ");
CmsUiUtils.style(label, FormStyle.propertyLabel.style());
label.setText(value + " ");
CmsUiUtils.style(label, FormStyle.propertyLabel.style());
- GridData gd = new GridData(isSmall ? SWT.LEFT : SWT.RIGHT, vAlign, false, false);
- gd.widthHint = labelColWidth;
+ GridData gd = new GridData(SWT.LEAD, vAlign, false, false);
+ if (labelColWidth != null)
+ gd.widthHint = labelColWidth;
label.setLayoutData(gd);
return label;
}
label.setLayoutData(gd);
return label;
}
@@
-457,12
+459,12
@@
public class FormPageViewer extends AbstractPageViewer {
section.layout();
section.getParent().layout();
} catch (RepositoryException re) {
section.layout();
section.getParent().layout();
} catch (RepositoryException re) {
- throw new
CmsException("unable to refresh " + "image section for " + context
);
+ throw new
JcrException("Unable to refresh " + "image section for " + context, re
);
}
}
});
} catch (RepositoryException re) {
}
}
});
} catch (RepositoryException re) {
- throw new
CmsException("unable to upload image " + name + " at " + context
);
+ throw new
JcrException("unable to upload image " + name + " at " + context, re
);
}
}
}
}
}
}
@@
-529,7
+531,7
@@
public class FormPageViewer extends AbstractPageViewer {
refresh(parSection);
layout(parSection);
} catch (RepositoryException re) {
refresh(parSection);
layout(parSection);
} catch (RepositoryException re) {
- throw new
Cms
Exception("Unable to delete " + sessionNode, re);
+ throw new
Jcr
Exception("Unable to delete " + sessionNode, re);
}
}
}
}
@@
-577,7
+579,7
@@
public class FormPageViewer extends AbstractPageViewer {
edit(emsp, 0);
cancelEdit();
} catch (RepositoryException e1) {
edit(emsp, 0);
cancelEdit();
} catch (RepositoryException e1) {
- throw new
Cms
Exception("Unable to remove value " + obj, e1);
+ throw new
Jcr
Exception("Unable to remove value " + obj, e1);
}
layout(emsp);
}
}
layout(emsp);
}
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java
b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java
index 5f3f1c288d778c917c28d6b605789732135f4fe8..7a05e2b2bdb841dd68531c0d566f7757ae6476c4 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/ui/forms/FormStyle.java
@@
-19,8
+19,9
@@
public enum FormStyle implements CmsStyle {
// Social Media
facebook, twitter, linkedIn, instagram;
// Social Media
facebook, twitter, linkedIn, instagram;
- public String style() {
- return form.name() + '_' + name();
+ @Override
+ public String getClassPrefix() {
+ return "argeo-form";
}
// TODO clean button style management
}
// TODO clean button style management
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsStyle.java
b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsStyle.java
index aeff404519d7d2db96e37ee68aae75461029d02c..ddbe485ea427ab4aed52bb14c376d16f7aad8614 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsStyle.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsStyle.java
@@
-4,10
+4,15
@@
package org.argeo.cms.ui.util;
public interface CmsStyle {
String name();
public interface CmsStyle {
String name();
+ @Deprecated
default String toStyleClass() {
return getClassPrefix() + "-" + name();
}
default String toStyleClass() {
return getClassPrefix() + "-" + name();
}
+ default String style() {
+ return getClassPrefix() + "-" + name();
+ }
+
default String getClassPrefix() {
return "cms";
}
default String getClassPrefix() {
return "cms";
}