X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FDefaultHeader.java;h=9581b8c5846034a51065778fe300ecddc5ae3f4a;hb=446d637e8e7c48edce93f11de493fdf22171eb3e;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..9581b8c 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,13 +2,11 @@ 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; @@ -29,9 +27,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))); @@ -65,7 +63,7 @@ public class DefaultHeader implements CmsUiProvider { userL.setText(CurrentUser.getDisplayName()); Button logoutB = new Button(end, SWT.FLAT); // CmsUiUtils.style(logoutB, SuiteStyle.header); - logoutB.setImage(SuiteIcon.logout.getSmallIcon(theme)); + logoutB.setImage(theme.getSmallIcon(SuiteIcon.logout)); logoutB.addSelectionListener(new SelectionAdapter() { private static final long serialVersionUID = 7116760083964201233L;