X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FRecentItems.java;h=53bcdfe9355573cc18098ff04d9147419589d515;hb=f1b87af2e0de38f1f49ab8fe68f9988018914811;hp=bad48b8fb6673091d967b41d82a4a010bf03c9e0;hpb=942fd932e1f6ed3319575c4c1d944912dfca9fa5;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java b/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java index bad48b8..53bcdfe 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java @@ -15,10 +15,10 @@ import javax.jcr.observation.EventListener; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; -import org.argeo.api.cms.CmsTheme; import org.argeo.app.api.EntityType; import org.argeo.app.core.XPathUtils; import org.argeo.app.ui.widgets.DelayedText; +import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.eclipse.ui.EclipseUiUtils; @@ -38,8 +38,6 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -55,7 +53,7 @@ public class RecentItems implements CmsUiProvider { private final static int SEARCH_TEXT_DELAY = 800; private final static int SEARCH_DEFAULT_LIMIT = 100; - private CmsTheme theme; + private CmsSwtTheme theme; private String entityType; @@ -98,9 +96,9 @@ public class RecentItems implements CmsUiProvider { ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT); deleteItem.setEnabled(false); // CmsUiUtils.style(deleteItem, SuiteStyle.recentItems); - deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme)); + deleteItem.setImage(theme.getSmallIcon(SuiteIcon.delete)); ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT); - addItem.setImage(SuiteIcon.add.getSmallIcon(theme)); + addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); entityViewer.getViewer().addDoubleClickListener(new IDoubleClickListener() { @Override @@ -177,19 +175,20 @@ public class RecentItems implements CmsUiProvider { filterTxt.setLayoutData(EclipseUiUtils.fillWidth()); // final ServerPushSession pushSession = new ServerPushSession(); - delayedText.addDelayedModifyListener(null, new ModifyListener() { - private static final long serialVersionUID = 5003010530960334977L; - - public void modifyText(ModifyEvent event) { - delayedText.getText().getDisplay().asyncExec(new Runnable() { - @Override - public void run() { - refreshFilteredList(); - } - }); - // pushSession.stop(); - } - }); + delayedText.addListener((s) -> refreshFilteredList()); +// delayedText.addDelayedModifyListener(null, new ModifyListener() { +// private static final long serialVersionUID = 5003010530960334977L; +// +// public void modifyText(ModifyEvent event) { +// delayedText.getText().getDisplay().asyncExec(new Runnable() { +// @Override +// public void run() { +// refreshFilteredList(); +// } +// }); +// // pushSession.stop(); +// } +// }); // Jump to the first item of the list using the down arrow filterTxt.addKeyListener(new KeyListener() { @@ -214,9 +213,9 @@ public class RecentItems implements CmsUiProvider { } }); - parent.addDisposeListener((e) -> { - delayedText.close(); - }); +// parent.addDisposeListener((e) -> { +// delayedText.close(); +// }); } protected TableViewer createListPart(Composite parent, ILabelProvider labelProvider) {