Attachment #171059 for bug #263528




import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
import org.eclipse.mylyn.internal.provisional.commons.ui.GradientCanvas;
import org.eclipse.mylyn.internal.tasks.core.notifications.IServiceMessageListener;

import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.forms.FormColors;
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.events.HyperlinkAdapter;


		buttonsComp.setLayout(gLayout);

		// Disabled for initial 3.4 release as per bug#263528
//		settingsLink = new ImageHyperlink(buttonsComp, SWT.NONE);
//		settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES));
//		settingsLink.addHyperlinkListener(new HyperlinkAdapter() {
//			@Override
//			public void linkActivated(HyperlinkEvent e) {
//				PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn(
//						TaskListServiceMessageControl.this.parent.getShell(),
//						"org.eclipse.mylyn.tasks.ui.preferences", null, null); //$NON-NLS-1$
//				if (pref != null) {
//					pref.open();
//				}
//			}
//
//			@Override
//			public void linkEntered(HyperlinkEvent e) {
//				settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES_HOVER));
//			}
//
//			@Override
//			public void linkExited(HyperlinkEvent e) {
//				settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES));
//			}
//		});
			}
		});

		closeLink = new ImageHyperlink(buttonsComp, SWT.NONE);
		closeLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));





	private Button taskListTooltipEnabledButton;

	// Disabled for initial 3.4 release as per bug#263528
//	private Button taskListServiceMessageEnabledButton;

	public TasksUiPreferencePage() {
		super();

		getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,
				taskListTooltipEnabledButton.getSelection());

		// Disabled for initial 3.4 release as per bug#263528
//		getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
//				taskListServiceMessageEnabledButton.getSelection());

		getPreferenceStore().setValue(ITasksUiPreferenceConstants.WEEK_START_DAY, getWeekStartValue());
		//getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_STARTHOUR, hourDayStart.getSelection());
//		getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());
		MonitorUiPlugin.getDefault().getPreferenceStore().setValue(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED,
				timeoutEnabledButton.getSelection());
		MonitorUiPlugin.getDefault().getPreferenceStore().setValue(ActivityContextManager.ACTIVITY_TIMEOUT,
				timeoutMinutes.getSelection() * (60 * 1000));

		MonitorUiPlugin.getDefault().getPreferenceStore().setValue(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED,
				activityTrackingEnabledButton.getSelection());
		MonitorUiPlugin.getDefault()
				.getPreferenceStore()
				.setValue(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED, activityTrackingEnabledButton.getSelection());

		String taskDirectory = taskDirectoryText.getText();
		taskDirectory = taskDirectory.replaceAll(BACKSLASH_MULTI, FORWARDSLASH);

		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));

		// Disabled for initial 3.4 release as per bug#263528
//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));

		weekStartCombo.select(getPreferenceStore().getInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
		//hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));

		int minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getInt(ActivityContextManager.ACTIVITY_TIMEOUT)
				/ MS_MINUTES;
		timeoutMinutes.setSelection(minutes);
		timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
				ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));

		activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
				MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
				.getPreferenceStore()
				.getBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));

		return true;
	}

		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));

		// Disabled for initial 3.4 release as per bug#263528
//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));

		// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(
		// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));

		weekStartCombo.select(getPreferenceStore().getDefaultInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
		//	hourDayStart.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
//		hourDayEnd.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
		int activityTimeoutMinutes = MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultInt(
				ActivityContextManager.ACTIVITY_TIMEOUT)
				.getDefaultInt(ActivityContextManager.ACTIVITY_TIMEOUT)
				/ MS_MINUTES;
		timeoutMinutes.setSelection(activityTimeoutMinutes);
		timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
				ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));

		activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
				MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
				.getPreferenceStore()
				.getDefaultBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));

		updateRefreshGroupEnablements();
	}

		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));

		// Disabled for initial 3.4 release as per bug#263528
//		taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
//		taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);
//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
	}

	private void createTaskActivityGroup(Composite container) {

		group.setLayout(new GridLayout(3, false));
		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

		boolean activityTrackingEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
				MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED);

		boolean timeoutEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
				ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED);
				.getPreferenceStore()
				.getBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED);

		activityTrackingEnabledButton = new Button(group, SWT.CHECK);
		activityTrackingEnabledButton.setText(Messages.TasksUiPreferencePage_Enable_Time_Tracking);

		timeoutMinutes.setIncrement(5);
		timeoutMinutes.setMaximum(60);
		timeoutMinutes.setMinimum(1);
		long minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getLong(
				ActivityContextManager.ACTIVITY_TIMEOUT)
				.getLong(ActivityContextManager.ACTIVITY_TIMEOUT)
				/ MS_MINUTES;
		timeoutMinutes.setSelection((int) minutes);
		timeoutMinutes.addSelectionListener(new SelectionAdapter() {

Lines 659-667 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java (-3 / +4 lines)
659		659
660	serviceMessageManager = new ServiceMessageManager(serviceMessageUrl, lastMod, etag, checktime);	660	serviceMessageManager = new ServiceMessageManager(serviceMessageUrl, lastMod, etag, checktime);
661		661
662	if (getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED)) {	662	// Disabled for initial 3.4 release as per bug#263528
663	serviceMessageManager.start();	663	// if (getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED)) {
664	}	664	// serviceMessageManager.start();
		665	// }
665		666
666	// trigger lazy initialization	667	// trigger lazy initialization
667	new TasksUiInitializationJob().schedule();	668	new TasksUiInitializationJob().schedule();

Return to bug 263528

Lines 20-26 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListServiceMessageControl.java (-28 / +24 lines)
20	import org.eclipse.core.runtime.Status;	20	import org.eclipse.core.runtime.Status;
21	import org.eclipse.jface.dialogs.Dialog;	21	import org.eclipse.jface.dialogs.Dialog;
22	import org.eclipse.jface.preference.IPreferenceStore;	22	import org.eclipse.jface.preference.IPreferenceStore;
23	import org.eclipse.jface.preference.PreferenceDialog;
24	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;	23	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
25	import org.eclipse.mylyn.internal.provisional.commons.ui.GradientCanvas;	24	import org.eclipse.mylyn.internal.provisional.commons.ui.GradientCanvas;
26	import org.eclipse.mylyn.internal.tasks.core.notifications.IServiceMessageListener;	25	import org.eclipse.mylyn.internal.tasks.core.notifications.IServiceMessageListener;
Lines 50-56 Link Here
50	import org.eclipse.swt.widgets.Label;	49	import org.eclipse.swt.widgets.Label;
51	import org.eclipse.swt.widgets.Link;	50	import org.eclipse.swt.widgets.Link;
52	import org.eclipse.ui.PlatformUI;	51	import org.eclipse.ui.PlatformUI;
53	import org.eclipse.ui.dialogs.PreferencesUtil;
54	import org.eclipse.ui.forms.FormColors;	52	import org.eclipse.ui.forms.FormColors;
55	import org.eclipse.ui.forms.IFormColors;	53	import org.eclipse.ui.forms.IFormColors;
56	import org.eclipse.ui.forms.events.HyperlinkAdapter;	54	import org.eclipse.ui.forms.events.HyperlinkAdapter;
Lines 150-181 Link Here
150		148
151	buttonsComp.setLayout(gLayout);	149	buttonsComp.setLayout(gLayout);
152		150
153	settingsLink = new ImageHyperlink(buttonsComp, SWT.NONE);	151	// Disabled for initial 3.4 release as per bug#263528
154	settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES));	152	// settingsLink = new ImageHyperlink(buttonsComp, SWT.NONE);
155	// TableWrapData data = new TableWrapData();	153	// settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES));
156	// data.align = TableWrapData.RIGHT;	154	// settingsLink.addHyperlinkListener(new HyperlinkAdapter() {
157	// settingsLink.setLayoutData(data);	155	// @Override
158	settingsLink.addHyperlinkListener(new HyperlinkAdapter() {	156	// public void linkActivated(HyperlinkEvent e) {
159	@Override	157	// PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn(
160	public void linkActivated(HyperlinkEvent e) {	158	// TaskListServiceMessageControl.this.parent.getShell(),
161	PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn(	159	// "org.eclipse.mylyn.tasks.ui.preferences", null, null); //$NON-NLS-1$
162	TaskListServiceMessageControl.this.parent.getShell(),	160	// if (pref != null) {
163	"org.eclipse.mylyn.tasks.ui.preferences", null, null); //$NON-NLS-1$	161	// pref.open();
164	if (pref != null) {	162	// }
165	pref.open();	163	// }
166	}	164	//
167	}	165	// @Override
168		166	// public void linkEntered(HyperlinkEvent e) {
169	@Override	167	// settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES_HOVER));
170	public void linkEntered(HyperlinkEvent e) {	168	// }
171	settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES_HOVER));	169	//
172	}	170	// @Override
173		171	// public void linkExited(HyperlinkEvent e) {
174	@Override	172	// settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES));
175	public void linkExited(HyperlinkEvent e) {	173	// }
176	settingsLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_PREFERENCES));	174	// });
177	}
178	});
179		175
180	closeLink = new ImageHyperlink(buttonsComp, SWT.NONE);	176	closeLink = new ImageHyperlink(buttonsComp, SWT.NONE);
181	closeLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));	177	closeLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));

Lines 109-115 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java (-48 / +42 lines)
109		109
110	private Button taskListTooltipEnabledButton;	110	private Button taskListTooltipEnabledButton;
111		111
112	private Button taskListServiceMessageEnabledButton;	112	// Disabled for initial 3.4 release as per bug#263528
		113	// private Button taskListServiceMessageEnabledButton;
113		114
114	public TasksUiPreferencePage() {	115	public TasksUiPreferencePage() {
115	super();	116	super();
Lines 210-231 Link Here
210	getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,	211	getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,
211	taskListTooltipEnabledButton.getSelection());	212	taskListTooltipEnabledButton.getSelection());
212		213
213	getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,	214	// Disabled for initial 3.4 release as per bug#263528
214	taskListServiceMessageEnabledButton.getSelection());	215	// getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
		216	// taskListServiceMessageEnabledButton.getSelection());
215		217
216	getPreferenceStore().setValue(ITasksUiPreferenceConstants.WEEK_START_DAY, getWeekStartValue());	218	getPreferenceStore().setValue(ITasksUiPreferenceConstants.WEEK_START_DAY, getWeekStartValue());
217	//getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_STARTHOUR, hourDayStart.getSelection());	219	//getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_STARTHOUR, hourDayStart.getSelection());
218	// getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());	220	// getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());
219	MonitorUiPlugin.getDefault()	221	MonitorUiPlugin.getDefault().getPreferenceStore().setValue(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED,
220	.getPreferenceStore()	222	timeoutEnabledButton.getSelection());
221	.setValue(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED, timeoutEnabledButton.getSelection());	223	MonitorUiPlugin.getDefault().getPreferenceStore().setValue(ActivityContextManager.ACTIVITY_TIMEOUT,
222	MonitorUiPlugin.getDefault()	224	timeoutMinutes.getSelection() * (60 * 1000));
223	.getPreferenceStore()	225
224	.setValue(ActivityContextManager.ACTIVITY_TIMEOUT, timeoutMinutes.getSelection() * (60 * 1000));	226	MonitorUiPlugin.getDefault().getPreferenceStore().setValue(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED,
225		227	activityTrackingEnabledButton.getSelection());
226	MonitorUiPlugin.getDefault()
227	.getPreferenceStore()
228	.setValue(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED, activityTrackingEnabledButton.getSelection());
229		228
230	String taskDirectory = taskDirectoryText.getText();	229	String taskDirectory = taskDirectoryText.getText();
231	taskDirectory = taskDirectory.replaceAll(BACKSLASH_MULTI, FORWARDSLASH);	230	taskDirectory = taskDirectory.replaceAll(BACKSLASH_MULTI, FORWARDSLASH);
Lines 284-291 Link Here
284	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(	283	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
285	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));	284	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
286		285
287	taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(	286	// Disabled for initial 3.4 release as per bug#263528
288	ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));	287	// taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
		288	// ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
289		289
290	weekStartCombo.select(getPreferenceStore().getInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);	290	weekStartCombo.select(getPreferenceStore().getInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
291	//hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));	291	//hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
Lines 294-306 Link Here
294	int minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getInt(ActivityContextManager.ACTIVITY_TIMEOUT)	294	int minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getInt(ActivityContextManager.ACTIVITY_TIMEOUT)
295	/ MS_MINUTES;	295	/ MS_MINUTES;
296	timeoutMinutes.setSelection(minutes);	296	timeoutMinutes.setSelection(minutes);
297	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault()	297	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
298	.getPreferenceStore()	298	ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));
299	.getBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));	299
300		300	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
301	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault()	301	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
302	.getPreferenceStore()
303	.getBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
304		302
305	return true;	303	return true;
306	}	304	}
Lines 323-330 Link Here
323	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(	321	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
324	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));	322	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
325		323
326	taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(	324	// Disabled for initial 3.4 release as per bug#263528
327	ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));	325	// taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
		326	// ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
328		327
329	// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(	328	// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(
330	// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));	329	// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));
Lines 338-355 Link Here
338	weekStartCombo.select(getPreferenceStore().getDefaultInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);	337	weekStartCombo.select(getPreferenceStore().getDefaultInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
339	// hourDayStart.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));	338	// hourDayStart.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
340	// hourDayEnd.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));	339	// hourDayEnd.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
341	int activityTimeoutMinutes = MonitorUiPlugin.getDefault()	340	int activityTimeoutMinutes = MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultInt(
342	.getPreferenceStore()	341	ActivityContextManager.ACTIVITY_TIMEOUT)
343	.getDefaultInt(ActivityContextManager.ACTIVITY_TIMEOUT)
344	/ MS_MINUTES;	342	/ MS_MINUTES;
345	timeoutMinutes.setSelection(activityTimeoutMinutes);	343	timeoutMinutes.setSelection(activityTimeoutMinutes);
346	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault()	344	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
347	.getPreferenceStore()	345	ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));
348	.getDefaultBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));	346
349		347	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
350	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault()	348	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
351	.getPreferenceStore()
352	.getDefaultBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
353		349
354	updateRefreshGroupEnablements();	350	updateRefreshGroupEnablements();
355	}	351	}
Lines 500-509 Link Here
500	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(	496	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
501	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));	497	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
502		498
503	taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);	499	// Disabled for initial 3.4 release as per bug#263528
504	taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);	500	// taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
505	taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(	501	// taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);
506	ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));	502	// taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
		503	// ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
507	}	504	}
508		505
509	private void createTaskActivityGroup(Composite container) {	506	private void createTaskActivityGroup(Composite container) {
Lines 512-524 Link Here
512	group.setLayout(new GridLayout(3, false));	509	group.setLayout(new GridLayout(3, false));
513	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	510	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
514		511
515	boolean activityTrackingEnabled = MonitorUiPlugin.getDefault()	512	boolean activityTrackingEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
516	.getPreferenceStore()	513	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED);
517	.getBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED);	514
518		515	boolean timeoutEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
519	boolean timeoutEnabled = MonitorUiPlugin.getDefault()	516	ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED);
520	.getPreferenceStore()
521	.getBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED);
522		517
523	activityTrackingEnabledButton = new Button(group, SWT.CHECK);	518	activityTrackingEnabledButton = new Button(group, SWT.CHECK);
524	activityTrackingEnabledButton.setText(Messages.TasksUiPreferencePage_Enable_Time_Tracking);	519	activityTrackingEnabledButton.setText(Messages.TasksUiPreferencePage_Enable_Time_Tracking);
Lines 551-559 Link Here
551	timeoutMinutes.setIncrement(5);	546	timeoutMinutes.setIncrement(5);
552	timeoutMinutes.setMaximum(60);	547	timeoutMinutes.setMaximum(60);
553	timeoutMinutes.setMinimum(1);	548	timeoutMinutes.setMinimum(1);
554	long minutes = MonitorUiPlugin.getDefault()	549	long minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getLong(
555	.getPreferenceStore()	550	ActivityContextManager.ACTIVITY_TIMEOUT)
556	.getLong(ActivityContextManager.ACTIVITY_TIMEOUT)
557	/ MS_MINUTES;	551	/ MS_MINUTES;
558	timeoutMinutes.setSelection((int) minutes);	552	timeoutMinutes.setSelection((int) minutes);
559	timeoutMinutes.addSelectionListener(new SelectionAdapter() {	553	timeoutMinutes.addSelectionListener(new SelectionAdapter() {