From 14ce482f51205f19cdfc74ba9a596485b4e41b2e Mon Sep 17 00:00:00 2001
From: bsinou <bsinou@argeo.org>
Date: Sat, 8 Apr 2017 12:29:55 +0200
Subject: [PATCH] Use better icons for task context menu

---
 .../argeo-classic/icons/activities/cancel.gif | Bin 0 -> 374 bytes
 .../argeo-classic/icons/activities/done.png   | Bin 0 -> 537 bytes
 .../theme/argeo-classic/workbench-ext.css     |   8 ++--
 org.argeo.suite.workbench.rap/plugin.xml      |   2 +-
 .../parts/DefaultDashboardEditor.java         |  39 +++++++++++++++++-
 5 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 org.argeo.suite.apps/theme/argeo-classic/icons/activities/cancel.gif
 create mode 100644 org.argeo.suite.apps/theme/argeo-classic/icons/activities/done.png

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 0000000000000000000000000000000000000000..2b885067b7ade60ddd5f6ee83e308bfff5e1e8d5
GIT binary patch
literal 374
zcmZ?wbhEHb6krfwXk}n%VPa{UvhKl&{y+0_mamvOd*Q;#%Z}ZD`D50a(^Kazxw0wq
z)3@Jkv-WLTKk3i5DSz^Ex~Hvv^Xb>BU01&S{Jni+{~son=1CjxJpcY@(v-EUr!HJF
z=gFI&i#DI1Fl)uFy)`}a5B=G;<>#+I`?q!c|NozX20-yA3nK%AGJ_7tY>=NAI3_c=
zbI5pXP;eCF5LPnL2yp3W7ZB}8&`3Ju+^uNiVd9a<#KbHw;UlnMqSHY(?x0m6Hy0$d
zu?nda{E#SeY-?gsdQlVbu<;xR3s+W$z-Fd~c|1xP4=gtvXj?Ab^X<+7;ll@5q?67~
ziCWmi+$6ieX{yx%g%)OGM=x8hri2FW0(}ow!}0~KyTzW}n|f-(bLJ*DW+nz}0IGq7
A)&Kwi

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..a9925a06ab02db30c1e7ead9c701c15bc63145cb
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzt4TybR5;7M
zli4mqVHAaX=Q!_TZq*o5LaK&TC+g@aMJbINs;8}1t3yf*$E6r*j>Hs{AQG2a)rMyf
zFQK~pm1x3+7!nu%-M`k}``c>^00{o_1pjWJUTfl8mg=3qGEl8H@}^@w`VUx0_$uy4
z2FhRqKX}xI*?Tv<H&*Dj)Tr<j*}f%KtVns|p$^k=7pCG)bZ)nz(p!uYhmcBtGG4MZ
zhBKz;vsk_?<x?$B#+(Sm9B-A&-Qq;?SOJwD!Fa)z^`0_M+_eepu5##IOknYS`&tC<
z#^ArRgWXi2%vG2uvgcE2i2di<+TKw6qc6;1IyMf?mMlSF4apWIQ-(bTzNj7ETMiu?
z3Y3nE5@K5(^<j-YCz?$CVH?a>1DJd8z#F#0c%*~rM30HE1@2o5m~}ZyoWhqv>ql{V
z1ZGE0lgcoK^lx+eqc*rAX1Ky;Xx3U%u#zG!m-;eD1Qsn@kf3|F9qz~|95=&g3(7!X
zB}JAT>RU;a%vaNOGnJ%e1=K6eAh43c(QN8RQ6~GP%O}Jju$~Ld*%`mO1p<rCAIZx2
bmuq|lzM`o-QVIh|00000NkvXXu0mjfO@{7Q

literal 0
HcmV?d00001

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());
+					}
+				}
+			});
+
 		}
 	}
 
-- 
2.30.2