From 49e0c9990fb52d49924ce14bba65dcc18f99ccc7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 22 Sep 2022 08:52:22 +0200 Subject: [PATCH] Improve header --- org.argeo.app.theme.default/rap/argeo.css | 2 +- .../src/org/argeo/app/ui/DefaultHeader.java | 26 ++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/org.argeo.app.theme.default/rap/argeo.css b/org.argeo.app.theme.default/rap/argeo.css index db42491..0351d05 100644 --- a/org.argeo.app.theme.default/rap/argeo.css +++ b/org.argeo.app.theme.default/rap/argeo.css @@ -4,7 +4,7 @@ } .argeo-suite-headerTitle { - font: bold 18px sans-serif; + font: bold 24px sans-serif; color: white; background-color: #00294b; } 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 9581b8c..8d52321 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 @@ -10,6 +10,8 @@ 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; @@ -61,17 +63,27 @@ 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(theme.getSmallIcon(SuiteIcon.logout)); - 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.logout)); + logOutL.addMouseListener(new MouseAdapter() { + private static final long serialVersionUID = 6908266850511460799L; @Override - public void widgetSelected(SelectionEvent e) { + public void mouseDown(MouseEvent e) { cmsView.logout(); } - + }); } else { end.setLayout(new GridLayout(1, false)); -- 2.30.2