X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FDefaultEditionLayer.java;h=7b8bb3eb360c7eb4f8d56fb25e8626e96a7998ce;hp=6e77937f82a7347af2ede52208df397381c84f78;hb=f709e4a3ae06e51f767eee8152b393eb1df97df4;hpb=f21589b7f2a19a79edcc213b867c47130faa76cd

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
index 6e77937..7b8bb3e 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
@@ -1,5 +1,9 @@
 package org.argeo.suite.ui;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
@@ -7,6 +11,7 @@ import org.argeo.cms.ui.CmsTheme;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.cms.ui.widgets.TabbedArea;
+import org.argeo.util.LangUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.GridLayout;
@@ -16,45 +21,84 @@ import org.eclipse.swt.widgets.Control;
 /** An app layer based on an entry area and an editor area. */
 public class DefaultEditionLayer implements SuiteLayer {
 	private CmsUiProvider entryArea;
+	private CmsUiProvider workArea;
+	private List<String> weights = new ArrayList<>();
+	private boolean startMaximized = false;
 
 	@Override
 	public Control createUi(Composite parent, Node context) throws RepositoryException {
-		DefaultEditionArea workArea = new DefaultEditionArea(parent, parent.getStyle());
 		if (entryArea != null) {
-			entryArea.createUi(workArea.getEntryArea(), context);
+			SashFormEditionArea sashFormEditionArea = new SashFormEditionArea(parent, parent.getStyle());
+			entryArea.createUi(sashFormEditionArea.getEntryArea(), context);
+			if (this.workArea != null) {
+				this.workArea.createUi(sashFormEditionArea.getEditorArea(), context);
+			}
+			return sashFormEditionArea;
+		} else {
+			if (this.workArea != null) {
+				Composite area = new Composite(parent, SWT.NONE);
+				this.workArea.createUi(area, context);
+				return area;
+			}
+			CmsTheme theme = CmsTheme.getCmsTheme(parent);
+			TabbedArea tabbedArea = createTabbedArea(parent, theme);
+			return tabbedArea;
 		}
-		return workArea;
 	}
 
 	@Override
 	public void view(CmsUiProvider uiProvider, Composite workArea, Node context) {
-		TabbedArea tabbedArea = ((DefaultEditionArea) workArea).getTabbedArea();
+		TabbedArea tabbedArea;
+		if (workArea instanceof SashFormEditionArea) {
+			tabbedArea = ((SashFormEditionArea) workArea).getTabbedArea();
+		} else if (workArea instanceof TabbedArea) {
+			tabbedArea = (TabbedArea) workArea;
+		} else
+			throw new IllegalArgumentException("Unsupported work area " + workArea.getClass().getName());
 		tabbedArea.view(uiProvider, context);
 	}
 
 	@Override
 	public void open(CmsUiProvider uiProvider, Composite workArea, Node context) {
-		TabbedArea tabbedArea = ((DefaultEditionArea) workArea).getTabbedArea();
+		TabbedArea tabbedArea = ((SashFormEditionArea) workArea).getTabbedArea();
 		tabbedArea.open(uiProvider, context);
 	}
 
+	public void init(Map<String, Object> properties) {
+		weights = LangUtils.toStringList(properties.get(Property.weights.name()));
+		startMaximized = properties.containsKey(Property.startMaximized.name())
+				&& "true".equals(properties.get(Property.startMaximized.name()));
+	}
+
 	public void setEntryArea(CmsUiProvider entryArea) {
 		this.entryArea = entryArea;
 	}
 
-	class DefaultEditionArea extends SashForm {
+	public void setWorkArea(CmsUiProvider workArea) {
+		this.workArea = workArea;
+	}
+
+	TabbedArea createTabbedArea(Composite parent, CmsTheme theme) {
+		TabbedArea tabbedArea = new TabbedArea(parent, SWT.NONE);
+		tabbedArea.setBodyStyle(SuiteStyle.mainTabBody.style());
+		tabbedArea.setTabStyle(SuiteStyle.mainTab.style());
+		tabbedArea.setTabSelectedStyle(SuiteStyle.mainTabSelected.style());
+		tabbedArea.setCloseIcon(SuiteIcon.close.getSmallIcon(theme));
+		tabbedArea.setLayoutData(CmsUiUtils.fillAll());
+		return tabbedArea;
+	}
+
+	/** A work area based on an entry area and and a tabbed area. */
+	class SashFormEditionArea extends SashForm {
 		private static final long serialVersionUID = 2219125778722702618L;
 		private CmsTheme theme;
-//		private SashForm area;
 		private Composite entryArea;
 		private Composite editorArea;
 		private TabbedArea tabbedArea;
 
-		DefaultEditionArea(Composite parent, int style) {
+		SashFormEditionArea(Composite parent, int style) {
 			super(parent, SWT.HORIZONTAL);
 			theme = CmsTheme.getCmsTheme(parent);
-//			area = new SashForm(parent, SWT.HORIZONTAL);
-//			area.setLayoutData(CmsUiUtils.coversAll());
 
 			if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
 				editorArea = new Composite(this, SWT.BORDER);
@@ -63,29 +107,38 @@ public class DefaultEditionLayer implements SuiteLayer {
 				entryArea = new Composite(this, SWT.NONE);
 				editorArea = new Composite(this, SWT.NONE);
 			}
-			int[] weights = new int[] { 2000, 8000 };
-			setWeights(weights);
-//			editorArea.setLayout(CmsUiUtils.noSpaceGridLayout());
+
+			if (weights.size() != 0) {
+				int[] actualWeight = new int[weights.size()];
+				for (int i = 0; i < weights.size(); i++) {
+					actualWeight[i] = Integer.parseInt(weights.get(i));
+				}
+				setWeights(actualWeight);
+			} else {
+				int[] actualWeights = new int[] { 3000, 7000 };
+				setWeights(actualWeights);
+			}
+			if (startMaximized)
+				setMaximizedControl(editorArea);
 			editorArea.setLayout(new GridLayout());
 
-			tabbedArea = new TabbedArea(editorArea, SWT.NONE);
-			tabbedArea.setBodyStyle(SuiteStyle.mainTabBody.toStyleClass());
-			tabbedArea.setTabStyle(SuiteStyle.mainTab.toStyleClass());
-			tabbedArea.setTabSelectedStyle(SuiteStyle.mainTabSelected.toStyleClass());
-			tabbedArea.setCloseIcon(SuiteIcon.close.getSmallIcon(theme));
-			tabbedArea.setLayoutData(CmsUiUtils.fillAll());
+			if (DefaultEditionLayer.this.workArea == null) {
+				tabbedArea = createTabbedArea(editorArea, theme);
+			}
+
 		}
 
-//		Composite getArea() {
-//			return area;
-//		}
-//
-		public Composite getEntryArea() {
+		Composite getEntryArea() {
 			return entryArea;
 		}
 
-		public TabbedArea getTabbedArea() {
+		TabbedArea getTabbedArea() {
 			return tabbedArea;
 		}
+
+		Composite getEditorArea() {
+			return editorArea;
+		}
+
 	}
 }
\ No newline at end of file