Service-Component: OSGI-INF/argeo-office-rap.xml,\
OSGI-INF/appDeployer.xml
-Import-Package: org.argeo.node,\
+Import-Package: org.argeo.api,\
org.eclipse.swt,\
org.eclipse.rap.rwt,\
org.eclipse.rap.rwt.client,\
// Common
APP.pageTitle = 'Argeo Suite';
APP.favicon = 'icons/argeo-e.png';
-APP.theme = new org.argeo.cms.script.Theme(BC, 'org.argeo.theme.argeo2')
+APP.theme = new org.argeo.cms.ui.script.Theme(BC, 'org.argeo.theme.argeo2')
// Office
-APP.ui['office'] = new org.argeo.cms.script.AppUi(APP,
+APP.ui['office'] = new org.argeo.cms.ui.script.AppUi(APP,
new org.argeo.suite.e4.rap.ArgeoSuiteEntryPoint(
'org.argeo.suite.e4/e4xmi/argeo-office.e4xmi'));
APP.ui['office'].pageTitle = 'Office';
// Docs
-APP.ui['docs'] = new org.argeo.cms.script.AppUi(APP,
+APP.ui['docs'] = new org.argeo.cms.ui.script.AppUi(APP,
new org.argeo.suite.e4.rap.ArgeoSuiteEntryPoint(
'org.argeo.suite.e4/e4xmi/argeo-docs.e4xmi'));
APP.ui['docs'].pageTitle = 'Docs';
package org.argeo.suite.e4.rap;
import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.util.CmsTheme;
+import org.argeo.cms.ui.util.CmsTheme;
import org.eclipse.rap.rwt.application.Application;
import org.eclipse.rap.rwt.client.WebClient;
import org.osgi.framework.BundleContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
import org.argeo.cms.e4.rap.CmsLoginLifecycle;
import org.argeo.connect.ui.SystemWorkbenchService;
import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
public class ArgeoSuiteLoginLifecycle extends CmsLoginLifecycle {
private final static Log log = LogFactory.getLog(ArgeoSuiteLoginLifecycle.class);
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.util.CmsTheme;
+import org.argeo.cms.ui.util.CmsTheme;
import org.eclipse.rap.rwt.application.ApplicationConfiguration;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.util.CmsTheme;
+import org.argeo.cms.ui.util.CmsTheme;
import org.eclipse.rap.rwt.application.Application;
import org.eclipse.rap.rwt.client.WebClient;
import org.osgi.framework.Bundle;
import javax.jcr.Repository;
import javax.jcr.Session;
+import org.argeo.api.NodeConstants;
import org.argeo.cms.ui.eclipse.forms.FormToolkit;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.connect.SystemAppService;
import org.argeo.connect.resources.ResourcesService;
import org.argeo.connect.ui.AppWorkbenchService;
import org.argeo.connect.util.ConnectJcrUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
import org.eclipse.e4.ui.di.Focus;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.client.service.BrowserNavigation;
gd.widthHint = widthHint;
gd.heightHint = heightHint;
gadgetCmp.setLayoutData(gd);
- CmsUtils.style(gadgetCmp, ConnectUiStyles.GADGET_BOX);
+ CmsUiUtils.style(gadgetCmp, ConnectUiStyles.GADGET_BOX);
return gadgetCmp;
}
protected Composite createGadgetTitleCmp(Composite parent, String title) {
Composite titleCmp = toolkit.createComposite(parent, SWT.BACKGROUND | SWT.INHERIT_NONE);
- CmsUtils.style(titleCmp, ConnectUiStyles.GADGET_HEADER);
+ CmsUiUtils.style(titleCmp, ConnectUiStyles.GADGET_HEADER);
titleCmp.setBackground(null);
GridData gd = new GridData(SWT.FILL, SWT.TOP, true, false);
titleCmp.setLayoutData(gd);
titleCmp.setLayout(new GridLayout());
Label titleLbl = toolkit.createLabel(titleCmp, title + " ", SWT.BOLD);
- CmsUtils.style(titleLbl, ConnectUiStyles.GADGET_HEADER);
+ CmsUiUtils.style(titleLbl, ConnectUiStyles.GADGET_HEADER);
titleLbl.setBackground(null);
return titleCmp;
}
import org.argeo.activities.ActivitiesService;
import org.argeo.activities.ActivitiesTypes;
import org.argeo.activities.ui.TaskViewerContextMenu;
+import org.argeo.api.NodeUtils;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.connect.ConnectException;
import org.argeo.connect.ConnectNames;
import org.argeo.connect.ui.ConnectWorkbenchUtils;
import org.argeo.connect.util.ConnectJcrUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeUtils;
import org.argeo.suite.e4.SuiteMsg;
import org.argeo.tracker.TrackerNames;
import org.argeo.tracker.TrackerService;
@Override
public void forceRefresh(Object object) {
- CmsUtils.clear(headerCmp);
+ CmsUiUtils.clear(headerCmp);
populateHeaderPart(headerCmp, NodeUtils.getUserHome(getHomeSession()));
- CmsUtils.clear(taskListCmp);
+ CmsUiUtils.clear(taskListCmp);
populateTaskListCmp(taskListCmp);
headerCmp.getParent().layout(true, true);
// Label noTaskLbl = new Label(noTaskCmp, SWT.CENTER);
// noTaskLbl.setText("<i> <big> You have no pending Task. </big> </i>");
- // CmsUtils.markup(noTaskLbl);
+ // CmsUiUtils.markup(noTaskLbl);
// noTaskLbl.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, true));
} else {
// Title
Label titleLbl = new Label(leftCmp, SWT.WRAP | SWT.LEAD);
- CmsUtils.markup(titleLbl);
+ CmsUiUtils.markup(titleLbl);
String titleStr = "<big><b>" + CurrentUser.getDisplayName() + "</b></big>";
titleLbl.setText(titleStr);
GridData gd = new GridData(SWT.BEGINNING, SWT.TOP, false, false);
// LOCAL HELPERS
private void populateMuliValueClickableList(Composite parent, Node[] nodes, ColumnLabelProvider lp,
String listLabel) {
- CmsUtils.clear(parent);
+ CmsUiUtils.clear(parent);
RowLayout rl = new RowLayout(SWT.HORIZONTAL | SWT.WRAP);
rl.wrap = true;
rl.marginLeft = rl.marginTop = rl.marginBottom = 0;
int i = 1;
for (Node node : nodes) {
Link link = new Link(parent, SWT.NONE);
- CmsUtils.markup(link);
+ CmsUiUtils.markup(link);
link.setText(lp.getText(node) + (i != nodes.length ? ", " : ""));
i++;
// Color fc = lp.getForeground(node);
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.activities.ActivitiesService;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.connect.ConnectException;
import org.argeo.connect.ConnectTypes;
import org.argeo.connect.resources.ResourcesService;
Table table = v.getTable();
table.setLinesVisible(true);
table.setHeaderVisible(false);
- CmsUtils.markup(table);
- CmsUtils.setItemHeight(table, 26);
+ CmsUiUtils.markup(table);
+ CmsUiUtils.setItemHeight(table, 26);
v.setContentProvider(new BasicNodeListContentProvider());
v.addDoubleClickListener(new JcrViewerDClickListener(systemWorkbenchService));