diff options
author | Sam Davis | 2013-12-23 20:40:49 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2014-01-22 01:03:56 +0000 |
commit | e60ad343915bf930367d96232a32c840d9cb9e02 (patch) | |
tree | b56898cd151931b558e0eecaf89c2c253554b353 /org.eclipse.mylyn.tasks.ui | |
parent | 2ee34447ece6defdc170aea9168145894465dce7 (diff) | |
download | org.eclipse.mylyn.tasks-e60ad343915bf930367d96232a32c840d9cb9e02.tar.gz org.eclipse.mylyn.tasks-e60ad343915bf930367d96232a32c840d9cb9e02.tar.xz org.eclipse.mylyn.tasks-e60ad343915bf930367d96232a32c840d9cb9e02.zip |
424188: indicate that repository markup setting may be overridden
Task attributes that set META_ATTRIBUTE_MEDIA_TYPE should be displayed
with the correct markup viewer when available.
Change-Id: I8da533d9fba0dc8fcb101ba9a74da9874b459d80
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=424188
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
3 files changed, 14 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java index 125997eae..1c4ef4945 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java @@ -291,6 +291,8 @@ public class Messages extends NLS { public static String TaskEditorExtensionSettingsContribution_Rendering_Group_Label; + public static String TaskEditorExtensionSettingsContribution_Rendering_Group_Info; + public static String TaskEditorExtensionSettingsContribution_Select_the_capabilities_of_the_task_editor; public static String TaskHyperlinkPresenter_Not_In_Task_List; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionSettingsContribution.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionSettingsContribution.java index 24d8130d9..2cb0e4a18 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionSettingsContribution.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorExtensionSettingsContribution.java @@ -15,6 +15,8 @@ import java.util.SortedSet; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.mylyn.commons.ui.CommonImages; import org.eclipse.mylyn.commons.workbench.WorkbenchUtil; import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorExtensions.RegisteredTaskEditorExtension; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -28,6 +30,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Widget; /** @@ -105,6 +108,13 @@ public class TaskEditorExtensionSettingsContribution extends AbstractTaskReposit } private void createTaskEditorExtensionsControl(Composite parent) { + Composite infoComposite = new Composite(parent, SWT.NONE); + GridLayoutFactory.fillDefaults().numColumns(2).applyTo(infoComposite); + Label infoImage = new Label(infoComposite, SWT.NONE); + infoImage.setImage(CommonImages.getImage(CommonImages.INFORMATION)); + Label infoLabel = new Label(infoComposite, SWT.NONE); + infoLabel.setText(Messages.TaskEditorExtensionSettingsContribution_Rendering_Group_Info); + String defaultExtensionId = TaskEditorExtensions.getDefaultTaskEditorExtensionId(getConnectorKind()); selectedExtensionId = getRepository() == null ? defaultExtensionId diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties index fcacc8b3e..598d81eff 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties @@ -160,7 +160,8 @@ TaskEditorExtensionSettingsContribution__default_=\ (default) TaskEditorExtensionSettingsContribution_Avatar_Button_Label=Show person images from gravatar.com TaskEditorExtensionSettingsContribution_Editor=Task Editor Settings TaskEditorExtensionSettingsContribution_Plain_Text=Plain Text -TaskEditorExtensionSettingsContribution_Rendering_Group_Label=Description and Comments +TaskEditorExtensionSettingsContribution_Rendering_Group_Label=Markup Language for Description, Comments, etc. +TaskEditorExtensionSettingsContribution_Rendering_Group_Info=Attributes may override this setting TaskEditorExtensionSettingsContribution_Select_the_capabilities_of_the_task_editor=Select the capabilities of the task editor TaskHyperlinkPresenter_Not_In_Task_List=Open {0} from Repository TaskUrlHyperlink_Open_URL_in_Task_Editor=Open ''{0}'' in Task Editor |