X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FArgeoSuiteUi.java;h=73dc2f4e4be0d2eeaf6485d5ba720cd7bd475da6;hb=29abcc0fa99e1c3fdee5beb9fff62b70b9dff519;hp=2505c4596e60185c96ccd3e272b723b01a95f718;hpb=5ace611de7a12d74a6b606861b89a2d3517514b0;p=gpl%2Fargeo-suite.git

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 2505c45..73dc2f4 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
@@ -1,35 +1,51 @@
 package org.argeo.suite.ui;
 
+import static org.argeo.suite.ui.SuiteIcon.dashboard;
+
+import javax.jcr.Session;
+
+import org.argeo.cms.ui.CmsTheme;
+import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.util.CmsUiUtils;
 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.RowLayout;
-import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
 
-public class ArgeoSuiteUi {
-	private Composite parent;
+/** The {@link CmsView} for the work ergonomics of Argeo Suite. */
+public class ArgeoSuiteUi extends Composite {
+	private static final long serialVersionUID = 6207018859086689108L;
 
 	private Composite header;
+	private Composite belowHeader;
 	private Composite leadPane;
 
 	private SashForm dynamicArea;
 	private Composite entryArea;
-	private CTabFolder editorArea;
+	private Composite editorArea;
+	private CTabFolder editorTabFolder;
 
 	private Composite defaultBody;
 
+	private CmsTheme theme;
+	
+	private Session session;
+
 	public ArgeoSuiteUi(Composite parent, int style) {
-		this.parent = parent;
-		parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+		super(parent, style);
+		theme = CmsTheme.getCmsTheme(parent);
+		this.setLayout(CmsUiUtils.noSpaceGridLayout());
 
-		header = new Composite(parent, SWT.NONE);
-		CmsUiUtils.style(header, WorkStyles.header);
+		header = new Composite(this, SWT.NONE);
+		CmsUiUtils.style(header, SuiteStyle.header);
 		header.setLayoutData(CmsUiUtils.fillWidth());
 
-		Composite belowHeader = new Composite(parent, SWT.NONE);
+		belowHeader = new Composite(this, SWT.NONE);
 		belowHeader.setLayoutData(CmsUiUtils.fillAll());
 		belowHeader.setLayout(CmsUiUtils.noSpaceGridLayout(2));
 
@@ -41,36 +57,46 @@ public class ArgeoSuiteUi {
 			dynamicArea = new SashForm(belowHeader, SWT.HORIZONTAL);
 		}
 		leadPane.setLayoutData(CmsUiUtils.fillHeight());
-		CmsUiUtils.style(leadPane, WorkStyles.leadPane);
+		CmsUiUtils.style(leadPane, SuiteStyle.leadPane);
 		dynamicArea.setLayoutData(CmsUiUtils.fillAll());
 
 		if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc.
-			editorArea = new CTabFolder(dynamicArea, SWT.NONE);
-			entryArea = new Composite(dynamicArea, SWT.NONE);
+			editorArea = new Composite(dynamicArea, SWT.BORDER);
+			entryArea = new Composite(dynamicArea, SWT.BORDER);
 		} else {
 			entryArea = new Composite(dynamicArea, SWT.NONE);
-			editorArea = new CTabFolder(dynamicArea, SWT.NONE);
+			editorArea = new Composite(dynamicArea, SWT.NONE);
 		}
 		int[] weights = new int[] { 2000, 8000 };
 		dynamicArea.setWeights(weights);
-
-		Composite buttons = new Composite(editorArea, SWT.NONE);
-		buttons.setLayout(new RowLayout(SWT.HORIZONTAL));
-		Button delete = new Button(buttons, SWT.PUSH);
-		delete.setText("Delete");
-		editorArea.setTopRight(buttons);
-
-		CTabItem defaultTab = new CTabItem(editorArea, SWT.NONE);
-		defaultTab.setText("Home");
-		defaultBody = new Composite(editorArea, SWT.NONE);
+		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);
 	}
 
-	Composite getParent() {
-		return parent;
-	}
+	/*
+	 * GETTERS / SETTERS
+	 */
 
 	Composite getHeader() {
 		return header;
@@ -88,12 +114,25 @@ public class ArgeoSuiteUi {
 		return entryArea;
 	}
 
-	CTabFolder getEditorArea() {
-		return editorArea;
+	CTabFolder getEditorTabFolder() {
+		return editorTabFolder;
 	}
 
 	Composite getDefaultBody() {
 		return defaultBody;
 	}
 
+	Composite getBelowHeader() {
+		return belowHeader;
+	}
+
+	Session getSession() {
+		return session;
+	}
+
+	void setSession(Session session) {
+		this.session = session;
+	}
+
+	
 }