projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major refactoring of Argeo CMS UI
[lgpl/argeo-commons.git]
/
org.argeo.cms.ui
/
src
/
org
/
argeo
/
cms
/
ui
/
widgets
/
EditableImage.java
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
index 0a327cd512a64e339550a84c832aac0b7d8a224c..e5f269a40d572ea82e589863562f04089cfd7c84 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
@@
-5,6
+5,8
@@
import javax.jcr.RepositoryException;
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.api.cms.Cms2DSize;
+import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.argeo.cms.ui.util.CmsUiUtils;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
@@
-17,21
+19,19
@@
public abstract class EditableImage extends StyledControl {
private static final long serialVersionUID = -5689145523114022890L;
private final static Log log = LogFactory.getLog(EditableImage.class);
private static final long serialVersionUID = -5689145523114022890L;
private final static Log log = LogFactory.getLog(EditableImage.class);
- private
Point
preferredImageSize;
+ private
Cms2DSize
preferredImageSize;
private Boolean loaded = false;
public EditableImage(Composite parent, int swtStyle) {
super(parent, swtStyle);
}
private Boolean loaded = false;
public EditableImage(Composite parent, int swtStyle) {
super(parent, swtStyle);
}
- public EditableImage(Composite parent, int swtStyle,
- Point preferredImageSize) {
+ public EditableImage(Composite parent, int swtStyle, Cms2DSize preferredImageSize) {
super(parent, swtStyle);
this.preferredImageSize = preferredImageSize;
}
super(parent, swtStyle);
this.preferredImageSize = preferredImageSize;
}
- public EditableImage(Composite parent, int style, Node node,
- boolean cacheImmediately, Point preferredImageSize)
+ public EditableImage(Composite parent, int style, Node node, boolean cacheImmediately, Cms2DSize preferredImageSize)
throws RepositoryException {
super(parent, style, node, cacheImmediately);
this.preferredImageSize = preferredImageSize;
throws RepositoryException {
super(parent, style, node, cacheImmediately);
this.preferredImageSize = preferredImageSize;
@@
-49,15
+49,15
@@
public abstract class EditableImage extends StyledControl {
/** To be overriden. */
protected String createImgTag() throws RepositoryException {
/** To be overriden. */
protected String createImgTag() throws RepositoryException {
- return CmsUiUtils
.noImg(preferredImageSize != null ? preferredImageSize
-
: getSize(
));
+ return CmsUiUtils
+
.noImg(preferredImageSize != null ? preferredImageSize : new Cms2DSize(getSize().x, getSize().y
));
}
protected Label createLabel(Composite box, String style) {
Label lbl = new Label(box, getStyle());
// lbl.setLayoutData(CmsUiUtils.fillWidth());
}
protected Label createLabel(Composite box, String style) {
Label lbl = new Label(box, getStyle());
// lbl.setLayoutData(CmsUiUtils.fillWidth());
- Cms
Ui
Utils.markup(lbl);
- Cms
Ui
Utils.style(lbl, style);
+ Cms
Swt
Utils.markup(lbl);
+ Cms
Swt
Utils.style(lbl, style);
if (mouseListener != null)
lbl.addMouseListener(mouseListener);
load(lbl);
if (mouseListener != null)
lbl.addMouseListener(mouseListener);
load(lbl);
@@
-83,7
+83,8
@@
public abstract class EditableImage extends StyledControl {
loaded = true;
if (control != null) {
((Label) control).setText(imgTag);
loaded = true;
if (control != null) {
((Label) control).setText(imgTag);
- control.setSize(preferredImageSize != null ? preferredImageSize
+ control.setSize(preferredImageSize != null
+ ? new Point(preferredImageSize.getWidth(), preferredImageSize.getHeight())
: getSize());
} else {
loaded = false;
: getSize());
} else {
loaded = false;
@@
-92,7
+93,7
@@
public abstract class EditableImage extends StyledControl {
return loaded;
}
return loaded;
}
- public void setPreferredSize(
Point
size) {
+ public void setPreferredSize(
Cms2DSize
size) {
this.preferredImageSize = size;
if (!loaded) {
load((Label) getControl());
this.preferredImageSize = size;
if (!loaded) {
load((Label) getControl());
@@
-101,11
+102,11
@@
public abstract class EditableImage extends StyledControl {
protected Text createText(Composite box, String style) {
Text text = new Text(box, getStyle());
protected Text createText(Composite box, String style) {
Text text = new Text(box, getStyle());
- Cms
Ui
Utils.style(text, style);
+ Cms
Swt
Utils.style(text, style);
return text;
}
return text;
}
- public
Point
getPreferredImageSize() {
+ public
Cms2DSize
getPreferredImageSize() {
return preferredImageSize;
}
return preferredImageSize;
}