From: bsinou <bsinou@argeo.org>
Date: Sat, 8 Apr 2017 10:29:55 +0000 (+0200)
Subject: Use better icons for task context menu
X-Git-Tag: argeo-suite-0.1.9~8
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=14ce482f51205f19cdfc74ba9a596485b4e41b2e

Use better icons for task context menu
---

diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/activities/cancel.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/activities/cancel.gif
new file mode 100644
index 0000000..2b88506
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/activities/cancel.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/activities/done.png b/org.argeo.suite.apps/theme/argeo-classic/icons/activities/done.png
new file mode 100644
index 0000000..a9925a0
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/activities/done.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/workbench-ext.css b/org.argeo.suite.apps/theme/argeo-classic/workbench-ext.css
index 4d94db0..c2bfdb5 100644
--- a/org.argeo.suite.apps/theme/argeo-classic/workbench-ext.css
+++ b/org.argeo.suite.apps/theme/argeo-classic/workbench-ext.css
@@ -268,14 +268,14 @@ Button[PUSH][FLAT].createFolder_btn:pressed, Button[PUSH][FLAT].shareFolder_btn:
 	background-color: #fde2d5;
 }
 
-/**  PEOPLE  **/
+/**  ACTIVITIES  **/
 
 Button[PUSH][FLAT].markAsDone_btn {
-	background-image: url( theme/argeo-classic/icons/fs/open.png);
+	background-image: url( theme/argeo-classic/icons/activities/done.png);
 }
 
 Button[PUSH][FLAT].cancel_btn {
-	background-image: url( theme/argeo-classic/icons/fs/open.png);
+	background-image: url( theme/argeo-classic/icons/activities/cancel.gif);
 }
 
 Button[PUSH][FLAT].cancel_btn,
@@ -301,6 +301,8 @@ Button[PUSH][FLAT].markAsDone_btn:pressed {
 	background-color: #fde2d5;
 }
 
+/**  PEOPLE  **/
+
 Button[PUSH][FLAT].small_delete_btn{
 	background-image: url( theme/argeo-classic/icons/actions/deleteSmall.gif);
 	background-repeat: no-repeat;
diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index a2a9829..d41dc87 100644
--- a/org.argeo.suite.workbench.rap/plugin.xml
+++ b/org.argeo.suite.workbench.rap/plugin.xml
@@ -24,7 +24,7 @@
 			id="org.argeo.suite.workbench.rap.defaultDashboardEditor"
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
 			icon="theme/argeo-classic/icons/dashboard.gif"
-			name="My Dashboard">
+			name="Dashboard">
 		</editor>
 	</extension>
 	
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index eb7c569..82591e5 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -14,6 +14,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.activities.ActivitiesNames;
 import org.argeo.activities.ActivitiesService;
+import org.argeo.activities.workbench.parts.TaskViewerContextMenu;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.util.CmsUtils;
@@ -34,10 +35,15 @@ import org.argeo.tracker.core.TrackerUtils;
 import org.argeo.tracker.ui.TaskListLabelProvider;
 import org.argeo.tracker.ui.TaskVirtualListComposite;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 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.graphics.Color;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.layout.RowLayout;
@@ -122,7 +128,38 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 			TaskListLabelProvider labelProvider = new TaskListLabelProvider(trackerService);
 			tvlc = new TaskVirtualListComposite(parent, SWT.NO_FOCUS, labelProvider, 54);
 			tvlc.setLayoutData(EclipseUiUtils.fillAll());
-			tvlc.getTableViewer().setInput(JcrUtils.nodeIteratorToList(nit).toArray());
+			final TableViewer viewer = tvlc.getTableViewer();
+			viewer.setInput(JcrUtils.nodeIteratorToList(nit).toArray());
+			final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getSession(),
+					activitiesService) {
+				private static final long serialVersionUID = 1640863021424194303L;
+
+				@Override
+				public boolean performAction(String actionId) {
+					boolean hasChanged = super.performAction(actionId);
+					if (hasChanged) {
+						viewer.getTable().setFocus();
+						forceRefresh(null);
+						// NodeIterator nit =
+						// activitiesService.getMyTasks(getSession(), true);
+						// viewer.setInput(JcrUtils.nodeIteratorToList(nit).toArray());
+					}
+					return hasChanged;
+				}
+			};
+			viewer.getTable().addMouseListener(new MouseAdapter() {
+				private static final long serialVersionUID = 6737579410648595940L;
+
+				@Override
+				public void mouseDown(MouseEvent e) {
+					if (e.button == 3) {
+						// contextMenu.setCurrFolderPath(currDisplayedFolder);
+						contextMenu.show(viewer.getTable(), new Point(e.x, e.y),
+								(IStructuredSelection) viewer.getSelection());
+					}
+				}
+			});
+
 		}
 	}