NEW - bug 303278: Let the Task Trim Widget finally escape from incubation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=303278
diff --git a/org.eclipse.mylyn.sandbox.ui/plugin.xml b/org.eclipse.mylyn.sandbox.ui/plugin.xml
index 66b109a..73b802f 100644
--- a/org.eclipse.mylyn.sandbox.ui/plugin.xml
+++ b/org.eclipse.mylyn.sandbox.ui/plugin.xml
@@ -109,34 +109,6 @@
</provider>
</extension>
- <!--
- <extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- id="org.eclipse.mylyn.tasks.ui.propertyTester"
- namespace="org.eclipse.mylyn.tasks.ui"
- properties="trimEnabled"
- type="java.lang.Object"
- class="org.eclipse.mylyn.internal.tasks.ui.TaskPropertyTester">
- </propertyTester>
- </extension>
- -->
-
- <!-- moved to the org.eclipse.mylyn.tasks.ui
- <extension point="org.eclipse.ui.commands">
- <command id="org.eclipse.mylyn.tasks.ui.command.previousTask"
- name="Task Trim Command"/>
- <command id="org.eclipse.mylyn.ui.context.capture.pause.command"
- name="Pause Capturing Context Command"/>
- </extension>
-
- <extension point="org.eclipse.ui.handlers">
- <handler commandId="org.eclipse.mylyn.tasks.ui.command.previousTask"
- class="org.eclipse.mylyn.internal.tasks.ui.TaskHistoryHandler"/>
- <handler commandId="org.eclipse.mylyn.ui.context.capture.pause.command"
- class="org.eclipse.mylyn.internal.tasks.ui.ContextCapturePauseHandler"/>
- </extension>
- -->
-
<!-- ==================== Commands ==================== -->
<extension point="org.eclipse.ui.commands">
@@ -198,46 +170,16 @@
<!-- ==================== Menus ==================== -->
<extension point="org.eclipse.ui.menus">
- <!-- menu for pulldown command -->
- <menuContribution locationURI="menu:org.eclipse.mylyn.tasks.ui.trim">
- <dynamic
- class="org.eclipse.mylyn.internal.tasks.ui.TaskHistoryDropDown"
- id="org.eclipse.mylyn.tasks.ui.trim.dropdown"/>
- </menuContribution>
-
- <menuContribution locationURI="toolbar:org.eclipse.ui.trim.command2?after">
- <toolbar id="org.eclipse.mylyn.tasks.ui.trim.container">
- <command
- id="org.eclipse.mylyn.tasks.ui.trim"
- commandId="org.eclipse.mylyn.tasks.ui.command.previousTask"
- label="Previous Task"
- icon="icons/etool16/navigate-previous.gif"
- style="pulldown">
- </command>
-
- <control
- class="org.eclipse.mylyn.internal.tasks.ui.TaskTrimWidget"
- id="org.eclipse.mylyn.tasks.ui.trim.control"/>
- <!-- for some reason this doesn't work
- <visibleWhen checkEnabled="false">
- <test forcePluginActivation="true"
- property="org.eclipse.mylyn.tasks.ui.trimEnabled"/>
- </visibleWhen>
- <visibleWhen><not><systemTest property="os.name" value="Windows XP"/></not></visibleWhen>
- -->
- </toolbar>
- </menuContribution>
-
- <menuContribution locationURI="menu:org.eclipse.mylyn.tasks.ui.views.tasks?after=additions">
- <command
- id="org.eclipse.mylyn.ui.context.capture.pause"
- commandId="org.eclipse.mylyn.ui.context.capture.pause.command"
- label="Pause Context (Experimental)"
- tooltip="Pause Capturing Context"
- icon="icons/elcl16/capture-pause.gif"
- style="toggle"/>
- </menuContribution>
- </extension>
+ <menuContribution locationURI="menu:org.eclipse.mylyn.tasks.ui.views.tasks?after=additions">
+ <command
+ id="org.eclipse.mylyn.ui.context.capture.pause"
+ commandId="org.eclipse.mylyn.ui.context.capture.pause.command"
+ label="Pause Context (Experimental)"
+ tooltip="Pause Capturing Context"
+ icon="icons/elcl16/capture-pause.gif"
+ style="toggle"/>
+ </menuContribution>
+ </extension>
<extension point="org.eclipse.ui.newWizards">
<wizard
diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/SandboxUiPreferencePage.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/SandboxUiPreferencePage.java
index 8b97a6e..e6a93fe 100644
--- a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/SandboxUiPreferencePage.java
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/SandboxUiPreferencePage.java
@@ -42,8 +42,6 @@
private Button activateOnOpen;
- private Button showTaskTrimButton;
-
private Button useStrikethrough;
public SandboxUiPreferencePage() {
@@ -56,7 +54,6 @@
GridLayout layout = new GridLayout(1, false);
container.setLayout(layout);
- createTaskNavigationGroup(container);
createTaskListGroup(container);
createJavaGroup(container);
@@ -67,20 +64,6 @@
// ignore
}
- private void createTaskNavigationGroup(Composite parent) {
- Group navigationGroup = new Group(parent, SWT.NONE);
- navigationGroup.setText("Task Navigation");
- navigationGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
- navigationGroup.setLayout(new GridLayout());
-
- IPreferenceStore uiPreferenceStore = TasksUiPlugin.getDefault().getPreferenceStore();
-
- showTaskTrimButton = new Button(navigationGroup, SWT.CHECK);
- showTaskTrimButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
- showTaskTrimButton.setText("Show Task Trim widget");
- showTaskTrimButton.setSelection(uiPreferenceStore.getBoolean(ITasksUiPreferenceConstants.SHOW_TRIM));
- }
-
private void createTaskListGroup(Composite parent) {
Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
group.setText("Task List");
@@ -111,16 +94,15 @@
enableErrorInterest = new Button(group, SWT.CHECK);
enableErrorInterest.setText("Enable predicted interest of errors (significantly increases view refresh).");
- enableErrorInterest.setSelection(SandboxUiPlugin.getDefault().getPreferenceStore().getBoolean(
- InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS));
+ enableErrorInterest.setSelection(SandboxUiPlugin.getDefault()
+ .getPreferenceStore()
+ .getBoolean(InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS));
}
@Override
public boolean performOk() {
IPreferenceStore uiPreferenceStore = TasksUiPlugin.getDefault().getPreferenceStore();
- uiPreferenceStore.setValue(ITasksUiPreferenceConstants.SHOW_TRIM, showTaskTrimButton.getSelection());
-
uiPreferenceStore.setValue(ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED,
useStrikethrough.getSelection());
@@ -129,33 +111,37 @@
uiPreferenceStore.setValue(ITasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT,
incomingOverlaysButton.getSelection());
- SandboxUiPlugin.getDefault().getPreferenceStore().setValue(
- InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS, enableErrorInterest.getSelection());
+ SandboxUiPlugin.getDefault()
+ .getPreferenceStore()
+ .setValue(InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS, enableErrorInterest.getSelection());
return true;
}
@Override
public boolean performCancel() {
- enableErrorInterest.setSelection(SandboxUiPlugin.getDefault().getPreferenceStore().getBoolean(
- InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS));
+ enableErrorInterest.setSelection(SandboxUiPlugin.getDefault()
+ .getPreferenceStore()
+ .getBoolean(InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS));
- useStrikethrough.setSelection(TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
- ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED));
+ useStrikethrough.setSelection(TasksUiPlugin.getDefault()
+ .getPreferenceStore()
+ .getBoolean(ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED));
IPreferenceStore uiPreferenceStore = TasksUiPlugin.getDefault().getPreferenceStore();
activateOnOpen.setSelection(uiPreferenceStore.getBoolean(ITasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED));
- showTaskTrimButton.setSelection(uiPreferenceStore.getBoolean(ITasksUiPreferenceConstants.SHOW_TRIM));
return true;
}
@Override
public void performDefaults() {
super.performDefaults();
- enableErrorInterest.setSelection(SandboxUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
- InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS));
+ enableErrorInterest.setSelection(SandboxUiPlugin.getDefault()
+ .getPreferenceStore()
+ .getDefaultBoolean(InterestInducingProblemListener.PREDICTED_INTEREST_ERRORS));
- useStrikethrough.setSelection(TasksUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
- ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED));
+ useStrikethrough.setSelection(TasksUiPlugin.getDefault()
+ .getPreferenceStore()
+ .getDefaultBoolean(ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED));
}
}
