X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FDefaultLeadPane.java;h=9a5248e7db8d85d2cc1f2fd1dd22806ea633f846;hp=b777debd2a45afbd882dc62fb8b9ff7696057ed1;hb=f3eb8b1fe54100344c6455543b44043684235daa;hpb=3b2923f0bc172a755c68d4a3700dcd73287fcd8c

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
index b777deb..9a5248e 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
@@ -3,6 +3,7 @@ package org.argeo.suite.ui;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -12,16 +13,23 @@ import javax.jcr.RepositoryException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.LocaleUtils;
 import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.ui.CmsTheme;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.CmsView;
+import org.argeo.cms.ui.util.CmsIcon;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.suite.RankedObject;
 import org.argeo.suite.SuiteUtils;
+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.eclipse.swt.widgets.Label;
 import org.osgi.framework.Constants;
 
 /** Side pane listing various perspectives. */
@@ -33,18 +41,32 @@ public class DefaultLeadPane implements CmsUiProvider {
 	}
 
 	private Map<String, RankedObject<SuiteLayer>> layers = Collections.synchronizedSortedMap(new TreeMap<>());
-	private String[] defaultLayers;
-	private String[] adminLayers;
+	private List<String> defaultLayers;
+	private List<String> adminLayers;
 
 	@Override
 	public Control createUi(Composite parent, Node node) throws RepositoryException {
 		CmsView cmsView = CmsView.getCmsView(parent);
+		parent.setLayout(CmsUiUtils.noSpaceGridLayout());
+		Composite appLayersC = new Composite(parent, SWT.NONE);
+		CmsUiUtils.style(appLayersC, SuiteStyle.leadPane);
 		GridLayout layout = new GridLayout();
 		layout.verticalSpacing = 10;
 		layout.marginTop = 10;
 		layout.marginLeft = 10;
 		layout.marginRight = 10;
-		parent.setLayout(layout);
+		appLayersC.setLayout(layout);
+		appLayersC.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
+
+		Composite adminLayersC = new Composite(parent, SWT.NONE);
+		CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
+		GridLayout adminLayout = new GridLayout();
+		adminLayout.verticalSpacing = 10;
+		adminLayout.marginBottom = 10;
+		adminLayout.marginLeft = 10;
+		adminLayout.marginRight = 10;
+		adminLayersC.setLayout(adminLayout);
+		adminLayersC.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, true));
 
 //		boolean isAdmin = cmsView.doAs(() -> CurrentUser.isInRole(NodeConstants.ROLE_USER_ADMIN));
 		Set<String> userRoles = cmsView.doAs(() -> CurrentUser.roles());
@@ -68,15 +90,26 @@ public class DefaultLeadPane implements CmsUiProvider {
 				// TODO deal with i10n
 				String titleStr = (String) layerObj.getProperties().get(SuiteLayer.Property.title.name());
 				Localized title = null;
-				if (titleStr != null)
-					title = new Localized.Untranslated(titleStr);
+				if (titleStr != null) {
+					if (titleStr.startsWith("%")) {
+						// LocaleUtils.local(titleStr, getClass().getClassLoader());
+						title = () -> titleStr;
+					} else {
+						title = new Localized.Untranslated(titleStr);
+					}
+				}
 
 				String iconName = (String) layerObj.getProperties().get(SuiteLayer.Property.icon.name());
 				SuiteIcon icon = null;
 				if (iconName != null)
 					icon = SuiteIcon.valueOf(iconName);
 
-				Button b = SuiteUiUtils.createLayerButton(parent, layerId, title, icon);
+				Composite buttonParent;
+				if (adminLayers.contains(layerId))
+					buttonParent = adminLayersC;
+				else
+					buttonParent = appLayersC;
+				Button b = createLayerButton(buttonParent, layerId, title, icon);
 				if (first == null)
 					first = b;
 			}
@@ -112,15 +145,23 @@ public class DefaultLeadPane implements CmsUiProvider {
 		return first;
 	}
 
+	protected void processLayer(String layerDef) {
+
+	}
+
 	public void init(Map<String, Object> properties) {
-		defaultLayers = (String[]) properties.get(Property.defaultLayers.toString());
+		String[] defaultLayers = (String[]) properties.get(Property.defaultLayers.toString());
 		if (defaultLayers == null)
 			throw new IllegalArgumentException("Default layers must be set.");
+		this.defaultLayers = Arrays.asList(defaultLayers);
 		if (log.isDebugEnabled())
 			log.debug("Default layers: " + Arrays.asList(defaultLayers));
-		adminLayers = (String[]) properties.get(Property.adminLayers.toString());
-		if (adminLayers != null)
-			log.error("DEPRECATED - Admin layers: " + Arrays.asList(adminLayers));
+		String[] adminLayers = (String[]) properties.get(Property.adminLayers.toString());
+		if (adminLayers != null) {
+			this.adminLayers = Arrays.asList(adminLayers);
+			if (log.isDebugEnabled())
+				log.debug("Admin layers: " + Arrays.asList(adminLayers));
+		}
 	}
 
 	public void addLayer(SuiteLayer layer, Map<String, Object> properties) {
@@ -140,4 +181,26 @@ public class DefaultLeadPane implements CmsUiProvider {
 			}
 		}
 	}
+
+	protected Button createLayerButton(Composite parent, String layer, Localized msg, CmsIcon icon) {
+		CmsTheme theme = CmsTheme.getCmsTheme(parent);
+		Button button = new Button(parent, SWT.PUSH);
+		CmsUiUtils.style(button, SuiteStyle.leadPane);
+		if (icon != null)
+			button.setImage(icon.getBigIcon(theme));
+		button.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
+		// button.setToolTipText(msg.lead());
+		if (msg != null) {
+			Label lbl = new Label(parent, SWT.CENTER);
+			CmsUiUtils.style(lbl, SuiteStyle.leadPane);
+			//CmsUiUtils.markup(lbl);
+			ClassLoader l10nClassLoader = getClass().getClassLoader();
+			String txt = LocaleUtils.lead(msg, l10nClassLoader);
+//			String txt = msg.lead();
+			lbl.setText(txt);
+			lbl.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
+		}
+		CmsUiUtils.sendEventOnSelect(button, SuiteEvent.switchLayer.topic(), SuiteEvent.LAYER, layer);
+		return button;
+	}
 }