X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FDefaultLeadPane.java;h=6c6047492901242c8e1e1f5058aa87b42af521c5;hb=a91a037c1d7d94a47e356918952a106b5071cf5c;hp=cbc0a7846636223bf9862fc40b941a8dacd15a6d;hpb=6dd21e8d47a1ecc92cf9f958af9ce1a97655fa68;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
index cbc0a78..6c60474 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
@@ -1,11 +1,12 @@
 package org.argeo.suite.ui;
 
-import java.util.Dictionary;
 import java.util.Map;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.Localized;
 import org.argeo.cms.ui.CmsTheme;
 import org.argeo.cms.ui.CmsUiProvider;
@@ -13,15 +14,17 @@ import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.util.CmsIcon;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.osgi.service.cm.ConfigurationException;
-import org.osgi.service.cm.ManagedService;
+import org.eclipse.swt.widgets.Label;
 
 /** Side pane listing various perspectives. */
-public class DefaultLeadPane implements CmsUiProvider, ManagedService {
+public class DefaultLeadPane implements CmsUiProvider {
+	private final static Log log = LogFactory.getLog(DefaultLeadPane.class);
+
 	@Override
 	public Control createUi(Composite parent, Node node) throws RepositoryException {
 		CmsView cmsView = CmsView.getCmsView(parent);
@@ -32,30 +35,30 @@ public class DefaultLeadPane implements CmsUiProvider, ManagedService {
 		layout.marginRight = 10;
 		parent.setLayout(layout);
 
-		Button dashboardB = createButton(parent, SuiteMsg.dashboard, SuiteIcon.dashboard);
+		Button dashboardB = createButton(parent, SuiteMsg.dashboard.name(), SuiteMsg.dashboard, SuiteIcon.dashboard);
 		if (!cmsView.isAnonymous()) {
-			createButton(parent, SuiteMsg.documents, SuiteIcon.documents);
-			createButton(parent, SuiteMsg.people, SuiteIcon.people);
-			createButton(parent, SuiteMsg.locations, SuiteIcon.location);
+//			createButton(parent, SuiteMsg.documents.name(), SuiteMsg.documents, SuiteIcon.documents);
+//			createButton(parent, SuiteMsg.people.name(), SuiteMsg.people, SuiteIcon.people);
+			createButton(parent, SuiteMsg.locations.name(), SuiteMsg.locations, SuiteIcon.location);
 		}
 		return dashboardB;
 	}
 
-	protected Button createButton(Composite parent, Localized msg, CmsIcon icon) {
+	protected Button createButton(Composite parent, String layer, Localized msg, CmsIcon icon) {
 		CmsTheme theme = CmsTheme.getCmsTheme(parent);
-		Button button = new Button(parent, SWT.FLAT);
+		Button button = new Button(parent, SWT.PUSH);
 		CmsUiUtils.style(button, SuiteStyle.leadPane);
-		button.setToolTipText(msg.lead());
 		button.setImage(icon.getBigIcon(theme));
+		button.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
+		//button.setToolTipText(msg.lead());
+		Label lbl = new Label(parent,SWT.NONE);
+		CmsUiUtils.style(lbl, SuiteStyle.leadPane);
+		lbl.setText(msg.lead());
+		lbl.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
+		CmsUiUtils.sendEventOnSelect(button, SuiteEvent.switchLayer.topic(), SuiteEvent.LAYER, layer);
 		return button;
 	}
 
-	@Override
-	public void updated(Dictionary<String, ?> properties) throws ConfigurationException {
-		// TODO Auto-generated method stub
-
-	}
-
 	public void init(Map<String, String> properties) {
 
 	}