Attachment 5944 Details for Bug 37280 – Patch to CyclePartAction, IPreferenceConstants, messages.properties, WorkbenchPreferencePage

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to CyclePartAction, IPreferenceConstants, messages.properties, WorkbenchPreferencePage

org.eclipse.ui.workbench-Bug37280.patch (text/plain), 5.87 KB, created by Douglas Pollock

on 2003-09-02 13:56:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Pollock

Created: 2003-09-02 13:56:25 EDT

Size: 5.87 KB

patch

obsolete

>Index: Eclipse UI/org/eclipse/ui/internal/CyclePartAction.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CyclePartAction.java,v
>retrieving revision 1.25
>diff -u -r1.25 CyclePartAction.java
>--- Eclipse UI/org/eclipse/ui/internal/CyclePartAction.java	26 Aug 2003 13:59:31 -0000	1.25
>+++ Eclipse UI/org/eclipse/ui/internal/CyclePartAction.java	2 Sep 2003 17:50:57 -0000
>@@ -14,6 +14,7 @@
> import java.util.Iterator;
> import java.util.SortedSet;
> 
>+import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.FocusEvent;
> import org.eclipse.swt.events.FocusListener;
>@@ -379,7 +380,9 @@
> 				//printKeyEvent(e);
> 				//System.out.println("accelerat:\t" + accelerator + "\t (" + KeySupport.formatStroke(Stroke.create(accelerator), true) + ")");
> 				
>-				if ((firstKey || quickReleaseMode) && keyCode == stateMask)
>+				final IPreferenceStore store = WorkbenchPlugin.getDefault().getPreferenceStore();
>+				final boolean stickyCycle = store.getBoolean(IPreferenceConstants.STICKY_CYCLE);
>+				if ((!stickyCycle && (firstKey || quickReleaseMode)) && keyCode == stateMask)
> 					ok(dialog, table);
> 			}
> 		});
>Index: Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java,v
>retrieving revision 1.19
>diff -u -r1.19 IPreferenceConstants.java
>--- Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java	10 Mar 2003 22:09:22 -0000	1.19
>+++ Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java	2 Sep 2003 17:50:57 -0000
>@@ -88,6 +88,9 @@
> 	//Eclipse.  Will improve startup time for editors that have a long open time.
> 	public static final String CLOSE_EDITORS_ON_EXIT = "CLOSE_EDITORS_ON_EXIT"; //$NON-NLS-1$
> 	
>+	//Boolean: true = keep cycle part dialog open when keys released
>+	public static final String STICKY_CYCLE = "STICKY_CYCLE"; //$NON-NLS-1$
>+	
> 	//List of plugins but that extends "startup" extension point but are overriden by the user.
> 	//String of plugin unique ids separated by ";"
> 	public static final String PLUGINS_NOT_ACTIVATED_ON_STARTUP = "PLUGINS_NOT_ACTIVATED_ON_STARTUP"; //$NON-NLS-1$
>Index: Eclipse UI/org/eclipse/ui/internal/messages.properties
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v
>retrieving revision 1.126
>diff -u -r1.126 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	11 Aug 2003 14:15:22 -0000	1.126
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	2 Sep 2003 17:50:57 -0000
>@@ -740,6 +740,7 @@
> WorkbenchPreference.exitPromptButton = &Confirm exit when closing last window
> WorkbenchPreference.editorsListButton = &Show Editors drop-down
> WorkbenchPreference.closeEditorsButton = Close all editors on &exit
>+WorkbenchPreference.stickyCycleButton = Keep next/previous part dialog open
> WorkbenchPreference.showTasks = Show &Problems view when build has errors or warnings
> WorkbenchPreference.replaceCurrent = &Replace current
> WorkbenchPreference.control = Ctrl
>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java,v
>retrieving revision 1.19
>diff -u -r1.19 WorkbenchPreferencePage.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java	3 Jul 2003 18:42:39 -0000	1.19
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java	2 Sep 2003 17:50:57 -0000
>@@ -31,6 +31,7 @@
> 	private Button autoSaveAllButton;
> 	private Button refreshButton;
> 	private Button showTasks;
>+	private Button stickyCycleButton;
> 	private Button exitPromptButton;
> 	private IntegerFieldEditor saveInterval;
> 
>@@ -82,6 +83,10 @@
> 		showTasks.setText(WorkbenchMessages.getString("WorkbenchPreference.showTasks")); //$NON-NLS-1$
> 		showTasks.setFont(font);
> 
>+		stickyCycleButton = new Button(composite, SWT.CHECK);
>+		stickyCycleButton.setText(WorkbenchMessages.getString("WorkbenchPreference.stickyCycleButton")); //$NON-NLS-1$
>+		stickyCycleButton.setFont(composite.getFont());
>+
> 		createSpace(composite);
> 		createSaveIntervalGroup(composite);
> 		
>@@ -95,6 +100,7 @@
> 		refreshButton.setSelection(store.getBoolean(IPreferenceConstants.REFRESH_WORKSPACE_ON_STARTUP));
> 		exitPromptButton.setSelection(store.getBoolean(IPreferenceConstants.EXIT_PROMPT_ON_CLOSE_LAST_WINDOW));
> 		showTasks.setSelection(store.getBoolean(IPreferenceConstants.SHOW_TASKS_ON_BUILD));
>+		stickyCycleButton.setSelection(store.getBoolean(IPreferenceConstants.STICKY_CYCLE));
> 		
> 		return composite;
> 	}
>@@ -296,6 +302,7 @@
> 		refreshButton.setSelection(store.getDefaultBoolean(IPreferenceConstants.REFRESH_WORKSPACE_ON_STARTUP));
> 		exitPromptButton.setSelection(store.getDefaultBoolean(IPreferenceConstants.EXIT_PROMPT_ON_CLOSE_LAST_WINDOW));
> 		showTasks.setSelection(store.getBoolean(IPreferenceConstants.SHOW_TASKS_ON_BUILD));
>+		stickyCycleButton.setSelection(store.getBoolean(IPreferenceConstants.STICKY_CYCLE));
> 		saveInterval.loadDefault();
> 		
> 		openOnSingleClick = store.getDefaultBoolean(IPreferenceConstants.OPEN_ON_SINGLE_CLICK); //$NON-NLS-1$
>@@ -343,6 +350,9 @@
> 
> 		//store the preference for bringing task view to front on build
> 		store.setValue(IPreferenceConstants.SHOW_TASKS_ON_BUILD, showTasks.getSelection());
>+
>+		// store the keep cycle part dialogs sticky preference
>+		store.setValue(IPreferenceConstants.STICKY_CYCLE, stickyCycleButton.getSelection());
> 
> 		long oldSaveInterval = description.getSnapshotInterval() / 60000;
> 		long newSaveInterval = new Long(saveInterval.getStringValue()).longValue();

Actions: View | Diff

Attachments on bug 37280: 5944 | 5963