diff options
3 files changed, 42 insertions, 11 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java index ad649d3eb..2b9623f8b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java @@ -279,8 +279,13 @@ public class TaskPlanningEditor extends TaskFormPage { form = managedForm.getForm(); toolkit = managedForm.getToolkit(); + + form.setImage(TasksUiImages.getImage(TasksUiImages.TASK)); + + if (task != null) { + form.setText("Task: " + task.getSummary()); addHeaderControls(); } @@ -305,6 +310,8 @@ public class TaskPlanningEditor extends TaskFormPage { private void addHeaderControls() { + System.err.println("!!!!!!!!"); + if (form.getForm() != null) { activateAction = new Action() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java index c19c32916..13c34cc30 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java @@ -875,8 +875,10 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { hookOpenAction(); contributeToActionBars(); - TaskListToolTipHandler taskListToolTipHandler = new TaskListToolTipHandler(); - taskListToolTipHandler.activateHoverHelp(getViewer().getControl()); + if (!SWT.getPlatform().equals("carbon")) { + TaskListToolTipHandler taskListToolTipHandler = new TaskListToolTipHandler(); + taskListToolTipHandler.activateHoverHelp(getViewer().getControl()); + } // Set to empty string to disable native tooltips (windows only?) // bug#160897 diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java index bb799b830..bf4dd6565 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java @@ -93,6 +93,7 @@ import org.eclipse.mylyn.tasks.core.TaskContainerDelta; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector; +import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector; @@ -495,16 +496,37 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { toolkit = managedForm.getToolkit(); registerDropListener(form); - // ImageDescriptor overlay = - // TasksUiPlugin.getDefault().getOverlayIcon(repository.getKind()); - // ImageDescriptor imageDescriptor = - // TaskListImages.createWithOverlay(TaskListImages.REPOSITORY, overlay, - // false, - // false); - // form.setImage(TaskListImages.getImage(imageDescriptor)); - +// ImageDescriptor overlay = TasksUiPlugin.getDefault().getOverlayIcon(repository.getConnectorKind()); +// ImageDescriptor imageDescriptor = TasksUiImages.createWithOverlay(TasksUiImages.REPOSITORY, overlay, false, +// false); + form.setImage(TasksUiImages.getImage(TasksUiImages.REPOSITORY)); // toolkit.decorateFormHeading(form.getForm()); + + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(repository.getConnectorKind()); + String kindLabel = ""; + if (connectorUi != null) { + kindLabel = connectorUi.getTaskKindLabel(repositoryTask); + } + String idLabel = ""; + + if (repositoryTask != null) { + idLabel = repositoryTask.getTaskKey(); + } else { + idLabel = taskData.getId(); + } + + if (taskData != null && taskData.isNew()) { + form.setText("New " + kindLabel); + } else if(idLabel != null){ + form.setText(kindLabel + " " + idLabel); + } else { + form.setText(kindLabel); + } + + + + editorComposite = form.getBody(); GridLayout editorLayout = new GridLayout(); editorComposite.setLayout(editorLayout); @@ -522,7 +544,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { } - // setFormHeaderLabel(); +// setFormHeaderLabel(); addHeaderControls(); if (summaryText != null) { |