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%2FArgeoSuiteUi.java;h=e30360c092dbb3d21c565f2227eae6f6a6648183;hp=73dc2f4e4be0d2eeaf6485d5ba720cd7bd475da6;hb=ff73a753e98016467d44c3a0beac79d590874520;hpb=95138f2cf31dfe8fe34c5697371e1f6365dfc35f

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteUi.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteUi.java
index 73dc2f4..e30360c 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteUi.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/ArgeoSuiteUi.java
@@ -2,6 +2,9 @@ package org.argeo.suite.ui;
 
 import static org.argeo.suite.ui.SuiteIcon.dashboard;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.jcr.Session;
 
 import org.argeo.cms.ui.CmsTheme;
@@ -11,6 +14,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -24,18 +28,15 @@ public class ArgeoSuiteUi extends Composite {
 	private Composite header;
 	private Composite belowHeader;
 	private Composite leadPane;
-
-	private SashForm dynamicArea;
-	private Composite entryArea;
-	private Composite editorArea;
-	private CTabFolder editorTabFolder;
-
-	private Composite defaultBody;
+	private Composite dynamicArea;
 
 	private CmsTheme theme;
-	
+
 	private Session session;
 
+	private Map<String, WorkLayer> layers = new HashMap<>();
+	private String currentLayer = "dashboard";
+
 	public ArgeoSuiteUi(Composite parent, int style) {
 		super(parent, style);
 		theme = CmsTheme.getCmsTheme(parent);
@@ -50,48 +51,42 @@ public class ArgeoSuiteUi extends Composite {
 		belowHeader.setLayout(CmsUiUtils.noSpaceGridLayout(2));
 
 		if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
-			dynamicArea = new SashForm(belowHeader, SWT.HORIZONTAL);
+			dynamicArea = new Composite(belowHeader, SWT.NONE);
 			leadPane = new Composite(belowHeader, SWT.NONE);
 		} else {
 			leadPane = new Composite(belowHeader, SWT.NONE);
-			dynamicArea = new SashForm(belowHeader, SWT.HORIZONTAL);
+			dynamicArea = new Composite(belowHeader, SWT.NONE);
 		}
 		leadPane.setLayoutData(CmsUiUtils.fillHeight());
 		CmsUiUtils.style(leadPane, SuiteStyle.leadPane);
 		dynamicArea.setLayoutData(CmsUiUtils.fillAll());
 
-		if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
-			editorArea = new Composite(dynamicArea, SWT.BORDER);
-			entryArea = new Composite(dynamicArea, SWT.BORDER);
-		} else {
-			entryArea = new Composite(dynamicArea, SWT.NONE);
-			editorArea = new Composite(dynamicArea, SWT.NONE);
-		}
-		int[] weights = new int[] { 2000, 8000 };
-		dynamicArea.setWeights(weights);
-		editorArea.setLayout(new GridLayout());
-
-		editorTabFolder = new CTabFolder(editorArea, SWT.NONE);
-		editorTabFolder.setLayoutData(CmsUiUtils.fillAll());
-
-		// TODO make it dynamic
-		Composite buttons = new Composite(editorTabFolder, SWT.NONE);
-		buttons.setLayout(CmsUiUtils.noSpaceGridLayout());
-		ToolBar toolBar = new ToolBar(buttons, SWT.NONE);
-		toolBar.setLayoutData(new GridData(SWT.END, SWT.TOP, false, false));
-		ToolItem deleteItem = new ToolItem(toolBar, SWT.PUSH);
-		deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme));
-		deleteItem.setEnabled(false);
-		editorTabFolder.setTopRight(buttons);
-
-		CTabItem defaultTab = new CTabItem(editorTabFolder, SWT.NONE);
-		// defaultTab.setText("Home");
-		defaultTab.setImage(dashboard.getSmallIcon(theme));
-		defaultBody = new Composite(editorTabFolder, SWT.NONE);
-		defaultTab.setControl(defaultBody);
-		editorTabFolder.setSelection(defaultTab);
-
-		// editorArea.setSingle(true);
+		dynamicArea.setLayout(new FormLayout());
+
+		layers.put("dashboard", new WorkLayer(dynamicArea, style));
+		layers.put("documents", new WorkLayer(dynamicArea, style));
+		layers.put("locations", new WorkLayer(dynamicArea, style));
+		layers.put("people", new WorkLayer(dynamicArea, style));
+	}
+
+	Composite getCurrentLayer() {
+		return layers.get(currentLayer).getArea();
+	}
+
+	Composite getLayer(String id) {
+		if (!layers.containsKey(id))
+			throw new IllegalArgumentException("No layer " + id + " is available.");
+		return layers.get(id).getArea();
+	}
+
+	Composite switchToLayer(String layer) {
+		Composite current = getCurrentLayer();
+		if (currentLayer.equals(layer))
+			return current;
+		Composite toShow = getLayer(layer);
+		getDisplay().syncExec(() -> toShow.moveAbove(current));
+		currentLayer = layer;
+		return toShow;
 	}
 
 	/*
@@ -106,24 +101,16 @@ public class ArgeoSuiteUi extends Composite {
 		return leadPane;
 	}
 
-	SashForm getDynamicArea() {
-		return dynamicArea;
+	Composite getBelowHeader() {
+		return belowHeader;
 	}
 
 	Composite getEntryArea() {
-		return entryArea;
-	}
-
-	CTabFolder getEditorTabFolder() {
-		return editorTabFolder;
+		return layers.get(currentLayer).getEntryArea();
 	}
 
 	Composite getDefaultBody() {
-		return defaultBody;
-	}
-
-	Composite getBelowHeader() {
-		return belowHeader;
+		return layers.get(currentLayer).getDefaultBody();
 	}
 
 	Session getSession() {
@@ -134,5 +121,67 @@ public class ArgeoSuiteUi extends Composite {
 		this.session = session;
 	}
 
-	
+	class WorkLayer {
+		private SashForm area;
+		private Composite entryArea;
+		private Composite editorArea;
+		private CTabFolder editorTabFolder;
+
+		private Composite defaultBody;
+
+		WorkLayer(Composite parent, int style) {
+			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(area, SWT.BORDER);
+				entryArea = new Composite(area, SWT.BORDER);
+			} else {
+				entryArea = new Composite(area, SWT.NONE);
+				editorArea = new Composite(area, SWT.NONE);
+			}
+			int[] weights = new int[] { 2000, 8000 };
+			area.setWeights(weights);
+			editorArea.setLayout(new GridLayout());
+
+			editorTabFolder = new CTabFolder(editorArea, SWT.NONE);
+			editorTabFolder.setLayoutData(CmsUiUtils.fillAll());
+
+			// TODO make it dynamic
+			Composite buttons = new Composite(editorTabFolder, SWT.NONE);
+			buttons.setLayout(CmsUiUtils.noSpaceGridLayout());
+			ToolBar toolBar = new ToolBar(buttons, SWT.NONE);
+			toolBar.setLayoutData(new GridData(SWT.END, SWT.TOP, false, false));
+			ToolItem deleteItem = new ToolItem(toolBar, SWT.PUSH);
+			deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme));
+			deleteItem.setEnabled(false);
+			editorTabFolder.setTopRight(buttons);
+
+			CTabItem defaultTab = new CTabItem(editorTabFolder, SWT.NONE);
+			// defaultTab.setText("Home");
+			defaultTab.setImage(dashboard.getSmallIcon(theme));
+			defaultBody = new Composite(editorTabFolder, SWT.NONE);
+			defaultTab.setControl(defaultBody);
+			editorTabFolder.setSelection(defaultTab);
+
+		}
+
+		Composite getArea() {
+			return area;
+		}
+
+		Composite getEntryArea() {
+			return entryArea;
+		}
+
+		CTabFolder getEditorTabFolder() {
+			return editorTabFolder;
+		}
+
+		Composite getDefaultBody() {
+			return defaultBody;
+		}
+
+	}
+
 }