X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2Fwidgets%2FTabbedArea.java;h=4b97b9ad4d5b2da2d3816c5a599f0d26a22ed78f;hp=c281904e989d8d4b8b67b47f4c6ce4cb99b0a468;hb=3cf66bc01bb8ad4c55139ae01be5a5bdb3759e2c;hpb=39f4b81ef1b30af7640654ec9eede6bea2ce4adf

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
index c281904..4b97b9a 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
@@ -5,10 +5,10 @@ import java.util.List;
 
 import javax.jcr.Node;
 
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.Selected;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.cms.ui.viewers.Section;
-import org.argeo.eclipse.ui.Selected;
 import org.argeo.jcr.Jcr;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
@@ -46,15 +46,15 @@ public class TabbedArea extends Composite {
 
 	public TabbedArea(Composite parent, int style) {
 		super(parent, SWT.NONE);
-		CmsUiUtils.style(parent, bodyStyle);
+		CmsSwtUtils.style(parent, bodyStyle);
 
-		setLayout(CmsUiUtils.noSpaceGridLayout());
+		setLayout(CmsSwtUtils.noSpaceGridLayout());
 
 		// TODO manage tabs at bottom or sides
 		headers = new Composite(this, SWT.NONE);
-		headers.setLayoutData(CmsUiUtils.fillWidth());
+		headers.setLayoutData(CmsSwtUtils.fillWidth());
 		body = new Composite(this, SWT.NONE);
-		body.setLayoutData(CmsUiUtils.fillAll());
+		body.setLayoutData(CmsSwtUtils.fillAll());
 		// body.setLayout(new FormLayout());
 		stackLayout = new StackLayout();
 		body.setLayout(stackLayout);
@@ -66,11 +66,11 @@ public class TabbedArea extends Composite {
 		for (Control tab : headers.getChildren())
 			tab.dispose();
 
-		headers.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(tabCount, true)));
+		headers.setLayout(CmsSwtUtils.noSpaceGridLayout(new GridLayout(tabCount, true)));
 
 		if (sections.size() == 0) {
 			Composite emptyHeader = new Composite(headers, SWT.NONE);
-			emptyHeader.setLayoutData(CmsUiUtils.fillAll());
+			emptyHeader.setLayoutData(CmsSwtUtils.fillAll());
 			emptyHeader.setLayout(new GridLayout());
 			Label lbl = new Label(emptyHeader, SWT.NONE);
 			lbl.setText("");
@@ -82,13 +82,13 @@ public class TabbedArea extends Composite {
 		for (Section section : sections) {
 			boolean selected = section == currentSection;
 			Composite sectionHeader = section.createHeader(headers);
-			CmsUiUtils.style(sectionHeader, selected ? tabSelectedStyle : tabStyle);
+			CmsSwtUtils.style(sectionHeader, selected ? tabSelectedStyle : tabStyle);
 			int headerColumns = singleTab ? 1 : 2;
 			sectionHeader.setLayout(new GridLayout(headerColumns, false));
-			sectionHeader.setLayout(CmsUiUtils.noSpaceGridLayout(headerColumns));
+			sectionHeader.setLayout(CmsSwtUtils.noSpaceGridLayout(headerColumns));
 			Button title = new Button(sectionHeader, SWT.FLAT);
-			CmsUiUtils.style(title, selected ? tabSelectedStyle : tabStyle);
-			title.setLayoutData(CmsUiUtils.fillWidth());
+			CmsSwtUtils.style(title, selected ? tabSelectedStyle : tabStyle);
+			title.setLayoutData(CmsSwtUtils.fillWidth());
 			title.addSelectionListener((Selected) (e) -> showTab(tabIndex(section.getNode())));
 			Node node = section.getNode();
 			String titleStr = Jcr.getTitle(node);
@@ -101,7 +101,7 @@ public class TabbedArea extends Composite {
 					closeItem.setImage(closeIcon);
 				else
 					closeItem.setText("X");
-				CmsUiUtils.style(closeItem, selected ? tabSelectedStyle : tabStyle);
+				CmsSwtUtils.style(closeItem, selected ? tabSelectedStyle : tabStyle);
 				closeItem.addSelectionListener((Selected) (e) -> closeTab(section));
 			}
 		}
@@ -147,7 +147,7 @@ public class TabbedArea extends Composite {
 			return;
 		}
 		if (sections.size() == 0)
-			CmsUiUtils.clear(body);
+			CmsSwtUtils.clear(body);
 		Section currentSection = getCurrentSection();
 		int currentIndex = sections.indexOf(currentSection);
 		Section previousSection = new Section(body, SWT.NONE, context);
@@ -171,7 +171,7 @@ public class TabbedArea extends Composite {
 	protected void build(Section section, CmsUiProvider uiProvider, Node context) {
 		for (Control child : section.getChildren())
 			child.dispose();
-		CmsUiUtils.style(section, bodyStyle);
+		CmsSwtUtils.style(section, bodyStyle);
 		section.setNode(context);
 		uiProvider.createUiPart(section, context);