X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FDefaultHeader.java;h=b8d78c982eaf3689eedc1eefa1b75f1d2c7585a6;hb=7d405778427a344d24b63527f0831c70ece4bf04;hp=d3044933a08f13a3ae6f045ba54696b10735aa0b;hpb=942fd932e1f6ed3319575c4c1d944912dfca9fa5;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultHeader.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultHeader.java
index d304493..b8d78c9 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultHeader.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultHeader.java
@@ -2,16 +2,16 @@ package org.argeo.app.ui;
 
 import java.util.Map;
 
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
-import org.argeo.api.cms.CmsTheme;
-import org.argeo.api.cms.CmsView;
+import org.argeo.api.acr.Content;
+import org.argeo.api.cms.ux.CmsView;
 import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.swt.CmsSwtTheme;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -29,9 +29,9 @@ public class DefaultHeader implements CmsUiProvider {
 	private Localized title = null;
 
 	@Override
-	public Control createUi(Composite parent, Node context) throws RepositoryException {
+	public Control createUiPart(Composite parent, Content context) {
 		CmsView cmsView = CmsSwtUtils.getCmsView(parent);
-		CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+		CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
 
 		parent.setLayout(CmsSwtUtils.noSpaceGridLayout(new GridLayout(3, true)));
 
@@ -63,14 +63,24 @@ public class DefaultHeader implements CmsUiProvider {
 			Label userL = new Label(end, SWT.NONE);
 			CmsSwtUtils.style(userL, SuiteStyle.header);
 			userL.setText(CurrentUser.getDisplayName());
-			Button logoutB = new Button(end, SWT.FLAT);
-//			CmsUiUtils.style(logoutB, SuiteStyle.header);
-			logoutB.setImage(SuiteIcon.logout.getSmallIcon(theme));
-			logoutB.addSelectionListener(new SelectionAdapter() {
-				private static final long serialVersionUID = 7116760083964201233L;
+//			Button logoutB = new Button(end, SWT.FLAT);
+//			logoutB.setImage(theme.getSmallIcon(SuiteIcon.logout));
+//			logoutB.addSelectionListener(new SelectionAdapter() {
+//				private static final long serialVersionUID = 7116760083964201233L;
+//
+//				@Override
+//				public void widgetSelected(SelectionEvent e) {
+//					cmsView.logout();
+//				}
+//
+//			});
+			Label logOutL = new Label(end, 0);
+			logOutL.setImage(theme.getSmallIcon(SuiteIcon.openUserMenu));
+			logOutL.addMouseListener(new MouseAdapter() {
+				private static final long serialVersionUID = 6908266850511460799L;
 
 				@Override
-				public void widgetSelected(SelectionEvent e) {
+				public void mouseDown(MouseEvent e) {
 					cmsView.logout();
 				}