diff options
17 files changed, 134 insertions, 113 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-blocker.gif b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-blocker.gif Binary files differdeleted file mode 100644 index 78ae38bfa..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-blocker.gif +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-bug.gif b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-bug.gif Binary files differnew file mode 100644 index 000000000..692d2facd --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-bug.gif diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-enhancement.gif b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-enhancement.gif Binary files differdeleted file mode 100644 index a04b96ee9..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-enhancement.gif +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-feature.gif b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-feature.gif Binary files differnew file mode 100644 index 000000000..66dfff891 --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-feature.gif diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java index 942e02e2f..b7306b1ff 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java @@ -47,9 +47,9 @@ public class BugzillaImages { public static final ImageDescriptor OPEN = create("", "openresult.gif"); - public static final ImageDescriptor OVERLAY_MAJOR = create(T_VIEW, "overlay-blocker.gif"); + public static final ImageDescriptor OVERLAY_MAJOR = create(T_VIEW, "overlay-bug.gif"); - public static final ImageDescriptor OVERLAY_ENHANCEMENT = create(T_VIEW, "overlay-enhancement.gif"); + public static final ImageDescriptor OVERLAY_ENHANCEMENT = create(T_VIEW, "overlay-feature.gif"); private static ImageDescriptor create(String prefix, String name) { try { diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskDecorator.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskDecorator.java index 7cf712c84..542cac76c 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskDecorator.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskDecorator.java @@ -25,9 +25,9 @@ public class BugzillaTaskDecorator implements ILightweightLabelDecorator { if (element instanceof BugzillaTask) { String kind = ((BugzillaTask)element).getKind(); if ("major".equals(kind) || "blocker".equals(kind)) { - decoration.addOverlay(BugzillaImages.OVERLAY_MAJOR, IDecoration.TOP_LEFT); + decoration.addOverlay(BugzillaImages.OVERLAY_MAJOR, IDecoration.BOTTOM_RIGHT); } else if ("enhancement".equals(kind)){ - decoration.addOverlay(BugzillaImages.OVERLAY_ENHANCEMENT, IDecoration.TOP_LEFT); + decoration.addOverlay(BugzillaImages.OVERLAY_ENHANCEMENT, IDecoration.BOTTOM_RIGHT); } } else if (element instanceof BugzillaQueryHit) { BugzillaQueryHit hit = (BugzillaQueryHit)element; diff --git a/org.eclipse.mylyn.help.ui/doc/new.html b/org.eclipse.mylyn.help.ui/doc/new.html index 9f95ec1a6..91b047cc1 100644 --- a/org.eclipse.mylyn.help.ui/doc/new.html +++ b/org.eclipse.mylyn.help.ui/doc/new.html @@ -191,7 +191,7 @@ <p align="right"><b>Icons and overlays</b></p> </td> <td valign="top" width="70%"> - Overlay descriptions, priority, notes...<p> + Overlay descriptions, priority, notes, status<p> </td> </tr> <tr> diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool16/task-remote.gif b/org.eclipse.mylyn.tasks.ui/icons/etool16/task-remote.gif Binary files differindex d0d46a007..b06d68694 100644 --- a/org.eclipse.mylyn.tasks.ui/icons/etool16/task-remote.gif +++ b/org.eclipse.mylyn.tasks.ui/icons/etool16/task-remote.gif diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/status-conflict.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/status-conflict.gif Binary files differnew file mode 100644 index 000000000..1e364acb5 --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/icons/eview16/status-conflict.gif diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/status-normal.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/status-normal.gif Binary files differnew file mode 100644 index 000000000..45b759436 --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/icons/eview16/status-normal.gif diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/status-server-context.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/status-server-context.gif Binary files differnew file mode 100644 index 000000000..0af770abc --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/icons/eview16/status-server-context.gif diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml index 56f5620a5..0096f4dd0 100644 --- a/org.eclipse.mylyn.tasks.ui/plugin.xml +++ b/org.eclipse.mylyn.tasks.ui/plugin.xml @@ -29,38 +29,6 @@ name="Task Activity Report (Experimental)"> </wizard> </extension> - <extension - point="org.eclipse.ui.importWizards"> - <wizard - category="org.eclipse.mylar.tasklist.importcategory" - class="org.eclipse.mylar.internal.tasklist.ui.wizards.TaskDataImportWizard" - icon="icons/eview16/task-list.gif" - id="org.eclipse.mylar.tasklist.ui.importWizard" - name="Mylar Task Data"> - <description> - Import Mylar task data files from file system. - </description> - </wizard> - <category - id="org.eclipse.mylar.tasklist.importcategory" - name="Mylar"/> - </extension> - - <extension point="org.eclipse.ui.exportWizards"> - <wizard - category="org.eclipse.mylar.tasklist.exportcategory" - class="org.eclipse.mylar.internal.tasklist.ui.wizards.TaskDataExportWizard" - icon="icons/eview16/task-list.gif" - id="org.eclipse.mylar.tasklist.ui.exportWizard" - name="Mylar Task Data"> - <description> - Export Mylar task data files to the file system. - </description> - </wizard> - <category - id="org.eclipse.mylar.tasklist.exportcategory" - name="Mylar"/> - </extension> <extension point="org.eclipse.ui.decorators"> @@ -79,7 +47,7 @@ </decorator> </extension> - + <extension point="org.eclipse.ui.views"> <view diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/RepositoryTaskDecorator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/RepositoryTaskDecorator.java index 54064756f..3c22c7815 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/RepositoryTaskDecorator.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/RepositoryTaskDecorator.java @@ -21,7 +21,6 @@ import org.eclipse.mylar.provisional.tasklist.AbstractQueryHit; import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryQuery; import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryTask; import org.eclipse.mylar.provisional.tasklist.ITask; -import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryTask.RepositoryTaskSyncState; /** * @author Mik Kersten @@ -40,23 +39,17 @@ public class RepositoryTaskDecorator implements ILightweightLabelDecorator { decoration.addSuffix(" [ <unknown host> ]"); } } - } else if (element instanceof AbstractRepositoryTask) { + } else if (element instanceof AbstractRepositoryTask) { decoration.addOverlay(TaskListImages.OVERLAY_REPOSITORY, IDecoration.BOTTOM_LEFT); - AbstractRepositoryTask repositoryTask = (AbstractRepositoryTask)element; - if (repositoryTask.getSyncState() == RepositoryTaskSyncState.OUTGOING) { - decoration.addOverlay(TaskListImages.OVERLAY_OUTGOING, IDecoration.TOP_RIGHT); - } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING) { - decoration.addOverlay(TaskListImages.OVERLAY_INCOMMING, IDecoration.TOP_RIGHT); - } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.CONFLICT) { - decoration.addOverlay(TaskListImages.OVERLAY_CONFLICT, IDecoration.TOP_RIGHT); - } } else if (element instanceof AbstractQueryHit) { - ITask correspondingTask = ((AbstractQueryHit)element).getCorrespondingTask(); - if (correspondingTask == null) { - decoration.addOverlay(TaskListImages.OVERLAY_INCOMMING, IDecoration.TOP_RIGHT); - } else { - decorate(correspondingTask, decoration); - } + decoration.addOverlay(TaskListImages.OVERLAY_REPOSITORY, IDecoration.BOTTOM_LEFT); + +// ITask correspondingTask = ((AbstractQueryHit)element).getCorrespondingTask(); +// if (correspondingTask == null) { +// decoration.addOverlay(TaskListImages.OVERLAY_INCOMMING, IDecoration.TOP_RIGHT); +// } else { +// decorate(correspondingTask, decoration); +// } } else if (element instanceof ITask) { String url = ((ITask)element).getUrl(); if (url != null && !url.trim().equals("") && !url.equals("http://")) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/TaskListImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/TaskListImages.java index 00c7df8ed..89be5c0e6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/TaskListImages.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/TaskListImages.java @@ -39,7 +39,7 @@ public class TaskListImages { public static final Color GRAY_LIGHT = new Color(Display.getDefault(), 170, 170, 170); - public static final Color COLOR_TASK_COMPLETED = new Color(Display.getDefault(), 170, 170, 170); + public static final Color COLOR_TASK_COMPLETED = new Color(Display.getDefault(), 170, 170, 170); public static final Color COLOR_TASK_ACTIVE = new Color(Display.getDefault(), 36, 22, 50); @@ -52,13 +52,13 @@ public class TaskListImages { private static final String T_ELCL = "elcl16"; private static final String T_EVIEW = "eview16"; - + private static final String T_TOOL = "etool16"; - + // public static final Point SIZE_SMALL = new Point(16, 16); - - public static final Point SIZE_WIDE = new Point(22, 16); - + + public static final Point SIZE = new Point(16, 16); + private static final URL baseURL = MylarTaskListPlugin.getDefault().getBundle().getEntry("/icons/"); public static final ImageDescriptor TASKLIST = create("eview16", "task-list.gif"); @@ -77,10 +77,10 @@ public class TaskListImages { public static final ImageDescriptor COLOR_PALETTE = create(T_ELCL, "color-palette.gif"); - public static final ImageDescriptor TASK = createSize(create(T_TOOL, "task.gif"), SIZE_WIDE); + public static final ImageDescriptor TASK = createSize(create(T_TOOL, "task.gif"), SIZE); + + public static final ImageDescriptor TASK_NOTES = createSize(create(T_TOOL, "task-notes.gif"), SIZE); - public static final ImageDescriptor TASK_NOTES = createSize(create(T_TOOL, "task-notes.gif"), SIZE_WIDE); - public static final ImageDescriptor TASK_NEW = create(T_TOOL, "task-new.gif"); public static final ImageDescriptor OVERLAY_WEB = create(T_TOOL, "overlay-web.gif"); @@ -88,19 +88,20 @@ public class TaskListImages { public static final ImageDescriptor TASK_WEB = createWithOverlay(TASK, OVERLAY_WEB, false, true); public static final ImageDescriptor TASK_WEB_REMOTE = create(T_TOOL, "overlay-web.gif"); - - public static final ImageDescriptor CATEGORY = createSize(create(T_TOOL, "category.gif"), SIZE_WIDE); + + public static final ImageDescriptor CATEGORY = createSize(create(T_TOOL, "category.gif"), SIZE); public static final ImageDescriptor CATEGORY_NEW = create(T_TOOL, "category-new.gif"); - public static final ImageDescriptor CATEGORY_ARCHIVE = createSize(create(T_TOOL, "category-archive.gif"), SIZE_WIDE); + public static final ImageDescriptor CATEGORY_ARCHIVE = createSize(create(T_TOOL, "category-archive.gif"), SIZE); + public static final ImageDescriptor TASK_REMOTE = createSize(create(T_TOOL, "task-remote.gif"), SIZE); - public static final ImageDescriptor TASK_REMOTE = createSize(create(T_TOOL, "task-remote.gif"), SIZE_WIDE); public static final ImageDescriptor TASK_REPOSITORY = create(T_TOOL, "task-repository.gif"); -// public static final ImageDescriptor TASK_REPOSITORY_NOTES = create(T_TOOL, "task-repository-notes.gif"); - + // public static final ImageDescriptor TASK_REPOSITORY_NOTES = + // create(T_TOOL, "task-repository-notes.gif"); + public static final ImageDescriptor TASK_REPOSITORY_NEW = create(T_TOOL, "task-repository-new.gif"); public static final ImageDescriptor OVERLAY_INCOMMING = create(T_EVIEW, "overlay-incoming.gif"); @@ -110,17 +111,37 @@ public class TaskListImages { public static final ImageDescriptor OVERLAY_CONFLICT = create(T_EVIEW, "overlay-conflicting.gif"); public static final ImageDescriptor OVERLAY_REPOSITORY = create(T_EVIEW, "overlay-repository.gif"); - - public static final ImageDescriptor TASK_REPOSITORY_INCOMMING = createWithOverlay(TASK_REPOSITORY, - OVERLAY_INCOMMING, true, false); - public static final ImageDescriptor TASK_REPOSITORY_CONFLICT = createWithOverlay(TASK_REPOSITORY, OVERLAY_CONFLICT, - true, false); - - public static final ImageDescriptor TASK_REPOSITORY_OUTGOING = createWithOverlay(TASK_REPOSITORY, OVERLAY_OUTGOING, - true, false); + + public static final ImageDescriptor STATUS_NORMAL = create(T_EVIEW, "status-normal.gif"); + + public static final ImageDescriptor STATUS_CONTEXT = create(T_EVIEW, "status-server-context.gif"); - public static final ImageDescriptor QUERY = createSize(create(T_TOOL, "query.gif"), SIZE_WIDE); + public static final ImageDescriptor STATUS_NORMAL_INCOMING = createWithOverlay( + STATUS_NORMAL, + OVERLAY_INCOMMING, true, true); + + public static final ImageDescriptor STATUS_NORMAL_OUTGOING = createWithOverlay( + STATUS_NORMAL, + OVERLAY_CONFLICT, true, true); + + public static final ImageDescriptor STATUS_NORMAL_CONFLICT = createWithOverlay( + STATUS_NORMAL, + OVERLAY_CONFLICT, true, true); + + public static final ImageDescriptor STATUS_CONTEXT_INCOMING = createWithOverlay( + STATUS_CONTEXT, + OVERLAY_INCOMMING, true, true); + + public static final ImageDescriptor STATUS_CONTEXT_OUTGOING = createWithOverlay( + STATUS_CONTEXT, + OVERLAY_CONFLICT, true, true); + + public static final ImageDescriptor STATUS_CONTEXT_CONFLICT = createWithOverlay( + STATUS_CONTEXT, + OVERLAY_CONFLICT, true, true); + + public static final ImageDescriptor QUERY = createSize(create(T_TOOL, "query.gif"), SIZE); public static final ImageDescriptor QUERY_NEW = create(T_TOOL, "query-new.gif"); @@ -136,11 +157,12 @@ public class TaskListImages { public static final ImageDescriptor GO_INTO = create(T_TOOL, "go-into.gif"); - public static final ImageDescriptor TASK_ACTIVE = createSize(create(T_TOOL, "task-active.gif"), SIZE_WIDE); + public static final ImageDescriptor TASK_ACTIVE = createSize(create(T_TOOL, "task-active.gif"), SIZE); - public static final ImageDescriptor TASK_INACTIVE = createSize(create(T_TOOL, "task-inactive.gif"), SIZE_WIDE); + public static final ImageDescriptor TASK_INACTIVE = createSize(create(T_TOOL, "task-inactive.gif"), SIZE); - public static final ImageDescriptor TASK_INACTIVE_CONTEXT = createSize(create(T_TOOL, "task-context.gif"), SIZE_WIDE); + public static final ImageDescriptor TASK_INACTIVE_CONTEXT = createSize(create(T_TOOL, "task-context.gif"), + SIZE); public static final ImageDescriptor TASK_COMPLETE = create(T_TOOL, "task-complete.gif"); @@ -148,18 +170,18 @@ public class TaskListImages { public static final ImageDescriptor COLLAPSE_ALL = create(T_ELCL, "collapseall.png"); - public static final ImageDescriptor PRIORITY_1 = createSize(create(T_EVIEW, "priority-1.gif"), SIZE_WIDE); - - public static final ImageDescriptor PRIORITY_2 = createSize(create(T_EVIEW, "priority-2.gif"), SIZE_WIDE); - - public static final ImageDescriptor PRIORITY_3 = createSize(create(T_EVIEW, "priority-3.gif"), SIZE_WIDE); - - public static final ImageDescriptor PRIORITY_4 = createSize(create(T_EVIEW, "priority-4.gif"), SIZE_WIDE); - - public static final ImageDescriptor PRIORITY_5 = createSize(create(T_EVIEW, "priority-5.gif"), SIZE_WIDE); - + public static final ImageDescriptor PRIORITY_1 = createSize(create(T_EVIEW, "priority-1.gif"), SIZE); + + public static final ImageDescriptor PRIORITY_2 = createSize(create(T_EVIEW, "priority-2.gif"), SIZE); + + public static final ImageDescriptor PRIORITY_3 = createSize(create(T_EVIEW, "priority-3.gif"), SIZE); + + public static final ImageDescriptor PRIORITY_4 = createSize(create(T_EVIEW, "priority-4.gif"), SIZE); + + public static final ImageDescriptor PRIORITY_5 = createSize(create(T_EVIEW, "priority-5.gif"), SIZE); + public static final ImageDescriptor CALENDAR = create(T_EVIEW, "task-activity.gif"); - + private static ImageDescriptor create(String prefix, String name) { try { return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name)); @@ -171,7 +193,7 @@ public class TaskListImages { private static ImageDescriptor createSize(ImageDescriptor base, Point size) { return new TaskListImageDescriptor(base, size); } - + private static ImageDescriptor createWithOverlay(ImageDescriptor base, ImageDescriptor overlay, boolean top, boolean left) { return new TaskListImageDescriptor(base, overlay, top, left); @@ -210,23 +232,23 @@ public class TaskListImages { } } -//class TaskImageDescriptor extends CompositeImageDescriptor { +// class TaskImageDescriptor extends CompositeImageDescriptor { // -// private Point size; +// private Point size; // -// private ImageDescriptor contents; +// private ImageDescriptor contents; // -// public TaskImageDescriptor(ImageDescriptor contents, Point size) { -// this.contents = contents; -// } +// public TaskImageDescriptor(ImageDescriptor contents, Point size) { +// this.contents = contents; +// } // -// @Override -// protected void drawCompositeImage(int width, int height) { -// super.drawImage(contents.getImageData(), width, height); -// } +// @Override +// protected void drawCompositeImage(int width, int height) { +// super.drawImage(contents.getImageData(), width, height); +// } // -// @Override -// protected Point getSize() { -// return size; -// } -//} +// @Override +// protected Point getSize() { +// return size; +// } +// } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListTableLabelProvider.java index 070c3f457..19035c809 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListTableLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListTableLabelProvider.java @@ -21,11 +21,14 @@ import org.eclipse.jface.viewers.ITableFontProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.mylar.internal.tasklist.ui.TaskListImages; import org.eclipse.mylar.provisional.core.MylarPlugin; +import org.eclipse.mylar.provisional.tasklist.AbstractQueryHit; import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryQuery; +import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryTask; import org.eclipse.mylar.provisional.tasklist.ITask; import org.eclipse.mylar.provisional.tasklist.ITaskContainer; import org.eclipse.mylar.provisional.tasklist.ITaskListElement; import org.eclipse.mylar.provisional.tasklist.Task; +import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryTask.RepositoryTaskSyncState; import org.eclipse.mylar.provisional.tasklist.Task.PriorityLevel; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; @@ -71,12 +74,14 @@ public class TaskListTableLabelProvider extends DecoratingLabelProvider implemen return null; case 2: return null; + case 3: + return null; // if (element instanceof ITaskContainer || element instanceof AbstractRepositoryQuery) { // return null; // } else { // return element.getPriority(); // } - case 3: + case 4: return super.getText(obj); } } @@ -110,8 +115,36 @@ public class TaskListTableLabelProvider extends DecoratingLabelProvider implemen if (element instanceof ITaskContainer || element instanceof AbstractRepositoryQuery) { return null; } - return super.getImage(element); + return super.getImage(element); } else if (columnIndex == 2) { + AbstractRepositoryTask repositoryTask = null; + if (element instanceof AbstractQueryHit) { + repositoryTask = ((AbstractQueryHit)element).getCorrespondingTask(); + } else if (element instanceof AbstractRepositoryTask) { + repositoryTask = (AbstractRepositoryTask)element; + } + if (repositoryTask != null) { + if (!repositoryTask.hasServerContext()) { + if (repositoryTask.getSyncState() == RepositoryTaskSyncState.OUTGOING) { + return TaskListImages.getImage(TaskListImages.STATUS_NORMAL_OUTGOING); + } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING) { + return TaskListImages.getImage(TaskListImages.STATUS_NORMAL_INCOMING); + } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.CONFLICT) { + return TaskListImages.getImage(TaskListImages.STATUS_NORMAL_CONFLICT); + } + } else { + if (repositoryTask.getSyncState() == RepositoryTaskSyncState.OUTGOING) { + return TaskListImages.getImage(TaskListImages.STATUS_CONTEXT_OUTGOING); + } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING) { + return TaskListImages.getImage(TaskListImages.STATUS_CONTEXT_INCOMING); + } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.CONFLICT) { + return TaskListImages.getImage(TaskListImages.STATUS_CONTEXT_CONFLICT); + } + } + } else { + return null; + } + } else if (columnIndex == 3) { if (element instanceof ITaskListElement && !(element instanceof ITaskContainer)) { ITaskListElement taskElement = (ITaskListElement) element; return getImageForPriority(PriorityLevel.fromString(taskElement.getPriority())); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListView.java index 9994675dc..98e2c7b58 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasklist/ui/views/TaskListView.java @@ -191,9 +191,9 @@ public class TaskListView extends ViewPart { static final String FILTER_LABEL = "<filter>"; - protected String[] columnNames = new String[] { "", ".", "!", "Description" }; + protected String[] columnNames = new String[] { "", " ", " ", "!", "Description" }; - protected int[] columnWidths = new int[] { 60, 20, 10, 160 }; + protected int[] columnWidths = new int[] { 60, 16, 8, 8, 160 }; private TreeColumn[] columns; @@ -693,7 +693,8 @@ public class TaskListView extends ViewPart { @Override public void createPartControl(Composite parent) { - filteredTree = new TaskListFilteredTree(parent, SWT.MULTI | SWT.VERTICAL | SWT.H_SCROLL | SWT.V_SCROLL + filteredTree = new TaskListFilteredTree(parent, + SWT.MULTI | SWT.VERTICAL | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION, new TaskListPatternFilter()); filteredTree.setInitialText(""); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/AbstractRepositoryTask.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/AbstractRepositoryTask.java index ca571df49..9f216a7b9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/AbstractRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/AbstractRepositoryTask.java @@ -158,4 +158,8 @@ public abstract class AbstractRepositoryTask extends Task { public void setDirty(boolean isDirty) { this.isDirty = isDirty; } + + public boolean hasServerContext() { + return false; + } } |