X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2Fui%2FAbstractDbkViewer.java;h=cde5c7fd74fbec68528937df76d4bb6a20da2c98;hb=cc5f3a7a328e0487d0b06dd4e99b232a2e551461;hp=8e18b3232b29782cfa570a967ec9b860a05bc928;hpb=d3a20494b99046cd9f67491064333ba56fbe5772;p=gpl%2Fargeo-suite.git diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java index 8e18b32..cde5c7f 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java @@ -99,6 +99,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke protected void refresh(Control control) throws RepositoryException { if (!(control instanceof Section)) return; + long begin = System.currentTimeMillis(); Section section = (Section) control; if (section instanceof TextSection) { CmsUiUtils.clear(section); @@ -173,6 +174,8 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke refresh(s); } // section.layout(true, true); + long duration = System.currentTimeMillis() - begin; +// System.out.println(duration + " ms - " + DbkUtils.getTitle(section.getNode())); } /** To be overridden in order to provide additional SectionPart types */ @@ -218,24 +221,18 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke protected DbkVideo newVideo(TextSection parent, Node node) { try { -// node.getSession(); -// Composite wrapper = new Composite(parent, SWT.NONE); -// new Label(wrapper,SWT.NONE).setText("TEST"); - DbkVideo video = new DbkVideo(parent, SWT.BORDER, node); + DbkVideo video = new DbkVideo(parent,getCmsEditable().canEdit()?SWT.NONE : SWT.READ_ONLY, node); GridData gd; if (maxMediaWidth != null) { gd = new GridData(SWT.CENTER, SWT.FILL, false, false); // TODO, manage size gd.widthHint = maxMediaWidth; gd.heightHint = (int) (gd.heightHint * 0.5625); -// img.setPreferredSize(new Point(maxMediaWidth, 0)); } else { gd = new GridData(SWT.CENTER, SWT.FILL, false, false); - gd.widthHint = video.getWidth(); - gd.heightHint = video.getHeight(); -// gd = new GridData(video.getWidth(),video.getHeight()); +// gd.widthHint = video.getWidth(); +// gd.heightHint = video.getHeight(); } -// wrapper.setLayoutData(gd); video.setLayoutData(gd); updateContent(video); return null; @@ -302,7 +299,8 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke paragraph.setText(textInterpreter.readSimpleHtml(partNode)); } else if (part instanceof DbkImg) { DbkImg editableImage = (DbkImg) part; - imageManager.load(partNode, part.getControl(), editableImage.getPreferredImageSize()); + // imageManager.load(partNode, part.getControl(), + // editableImage.getPreferredImageSize()); } else if (part instanceof DbkVideo) { DbkVideo video = (DbkVideo) part; video.load(part.getControl());