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%2FDefaultHeader.java;h=080bac2cfa121b92817a22a95aecabfb700c6641;hp=692a23badf2c4c1f3c5d2446420a5404ddb676d5;hb=3523f6ae47201064ca7393ea2f476a81ff4e4728;hpb=f3eb8b1fe54100344c6455543b44043684235daa

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java
index 692a23b..080bac2 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java
@@ -7,7 +7,7 @@ import java.util.TreeMap;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-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;
@@ -23,14 +23,18 @@ 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.BundleContext;
+import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;
 
-/** HEader of a standard Argeo Suite applicaiton. */
+/** HEader of a standard Argeo Suite application. */
 public class DefaultHeader implements CmsUiProvider, ManagedService {
 	public final static String TITLE_PROPERTY = "argeo.suite.ui.header.title";
 	private Map<String, String> properties;
 
+	private Localized title = null;
+
 	@Override
 	public Control createUi(Composite parent, Node context) throws RepositoryException {
 		CmsView cmsView = CmsView.getCmsView(parent);
@@ -44,9 +48,11 @@ public class DefaultHeader implements CmsUiProvider, ManagedService {
 		lead.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, true, false));
 		lead.setLayout(new GridLayout());
 		Label lbl = new Label(lead, SWT.NONE);
-		String title = properties.get(TITLE_PROPERTY);
-		lbl.setText(LocaleUtils.isLocaleKey(title) ? LocaleUtils.local(title, getClass().getClassLoader()).toString()
-				: title);
+//		String title = properties.get(TITLE_PROPERTY);
+//		// TODO expose the localized
+//		lbl.setText(LocaleUtils.isLocaleKey(title) ? LocaleUtils.local(title, getClass().getClassLoader()).toString()
+//				: title);
+		lbl.setText(title.lead());
 		CmsUiUtils.style(lbl, SuiteStyle.headerTitle);
 		lbl.setLayoutData(CmsUiUtils.fillWidth());
 
@@ -85,8 +91,33 @@ public class DefaultHeader implements CmsUiProvider, ManagedService {
 		return lbl;
 	}
 
-	public void init(Map<String, String> properties) {
+	public void init(BundleContext bundleContext, Map<String, String> properties) {
 		this.properties = new TreeMap<>(properties);
+		String titleStr = (String) properties.get(TITLE_PROPERTY);
+		if (titleStr != null) {
+			if (titleStr.startsWith("%")) {
+				title = new Localized() {
+
+					@Override
+					public String name() {
+						return titleStr;
+					}
+
+					@Override
+					public ClassLoader getL10nClassLoader() {
+						return bundleContext != null
+								? bundleContext.getBundle().adapt(BundleWiring.class).getClassLoader()
+								: getClass().getClassLoader();
+					}
+				};
+			} else {
+				title = new Localized.Untranslated(titleStr);
+			}
+		}
+	}
+
+	public void destroy() {
+
 	}
 
 	@Override
@@ -95,4 +126,8 @@ public class DefaultHeader implements CmsUiProvider, ManagedService {
 			this.properties.putAll(LangUtils.dictToStringMap(properties));
 	}
 
+	public Localized getTitle() {
+		return title;
+	}
+
 }