NEW - bug 195691: allow users to mark up screenshots

https://bugs.eclipse.org/bugs/show_bug.cgi?id=195691

4 files changed, 8 insertions, 4 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool16/cut.gif b/org.eclipse.mylyn.tasks.ui/icons/etool16/cut.gif
new file mode 100644
index 000000000..d044e5977
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool16/cut.gif
diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool16/edit.gif b/org.eclipse.mylyn.tasks.ui/icons/etool16/edit.gif
new file mode 100644
index 000000000..e8de66252
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool16/edit.gif
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
index 38c8219d4..0f0a06205 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
@@ -177,6 +177,10 @@ public class TasksUiImages {
 
 	public static final ImageDescriptor CLEAR = create(T_TOOL, "clear.gif");
 	
+	public static final ImageDescriptor EDIT = create(T_TOOL, "edit.gif");
+	
+	public static final ImageDescriptor CUT = create(T_TOOL, "cut.gif");
+	
 	public static final ImageDescriptor ATTACHMENT_PATCH = create(T_OBJ, "attachment-patch.gif");
 
 	public static final ImageDescriptor TASK_RETRIEVE = create(T_TOOL, "task-retrieve.gif");
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ScreenshotAttachmentPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ScreenshotAttachmentPage.java
index 92b4ed475..add552d2f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ScreenshotAttachmentPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ScreenshotAttachmentPage.java
@@ -238,7 +238,7 @@ public class ScreenshotAttachmentPage extends WizardPage implements IImageCreato
 			}
 		};
 		cropAction.setToolTipText("Crop");
-		cropAction.setImageDescriptor(ImageDescriptor.createFromFile(getClass(), "crop.png"));
+		cropAction.setImageDescriptor(TasksUiImages.CUT);
 		cropAction.setEnabled(false);
 
 		markAction = new Action("&Annotate", IAction.AS_RADIO_BUTTON) {
@@ -252,8 +252,8 @@ public class ScreenshotAttachmentPage extends WizardPage implements IImageCreato
 			}
 		};
 		markAction.setToolTipText("Draw annotations on screenshot image");
-		markAction.setImageDescriptor(ImageDescriptor.createFromFile(getClass(), "mark.gif"));
-		markAction.setDisabledImageDescriptor(ImageDescriptor.createFromFile(getClass(), "mark_disabled.gif"));
+		markAction.setImageDescriptor(TasksUiImages.EDIT);
+//		markAction.setDisabledImageDescriptor(ImageDescriptor.createFromFile(getClass(), "mark_disabled.gif"));
 		markAction.setEnabled(false);
 
 		colorAction = new Action("", IAction.AS_DROP_DOWN_MENU) {
@@ -295,7 +295,7 @@ public class ScreenshotAttachmentPage extends WizardPage implements IImageCreato
 			}
 		};
 		clearAction.setToolTipText("Clear all annotations made on screenshot image");
-		clearAction.setImageDescriptor(ImageDescriptor.createFromFile(getClass(), "erase.png"));
+		clearAction.setImageDescriptor(TasksUiImages.CLEAR);
 		clearAction.setEnabled(false);
 
 		tbm.add(createAndConfigureCI(captureAction));