- * Creates the grouping controls that will appear in the top-right in the - * default layout. The default grouping controls are a label and a combo - * box. + * Creates the grouping controls that will appear in the top-right in + * the default layout. The default grouping controls are a label and a + * combo box. *
*
* Subclasses may extend or override this method. Before this method
* completes, groupingCombo should be initialized.
- * Subclasses must create a combo box which contains the
- * possible groupings.
+ * Subclasses must create a combo box which contains the possible
+ * groupings.
*
null.
- * @return The composite containing the grouping controls, or the grouping
- * control itself (if there is only one control).
+ * The composite in which the grouping control should be
+ * placed; must not be null.
+ * @return The composite containing the grouping controls, or the
+ * grouping control itself (if there is only one control).
*/
protected Control createGroupingControl(final Composite parent) {
// Create the composite that will contain the grouping controls.
@@ -196,11 +201,11 @@
layout.marginHeight = 0;
groupingControl.setLayout(layout);
groupingControl.setFont(parent.getFont());
-
+
return groupingControl;
}
}
-
+
/**
* A label provider that simply extracts the command name and the formatted
* trigger sequence from a given binding, and matches them to the correct
@@ -223,15 +228,15 @@
* The index of the column containing the trigger sequence.
*/
private static final int COLUMN_WHEN = 2;
-
+
/**
* The index of the column containing the Category.
*/
private static final int COLUMN_CATEGORY = 3;
-
+
/**
* The index of the column with the image for User binding
- */
+ */
private static final int COLUMN_USER = 4;
/**
@@ -272,13 +277,13 @@
}
}
return null;
-
+
case COLUMN_USER:
- if (((Binding)value).getType()==Binding.USER)
+ if (((Binding) value).getType() == Binding.USER)
return ImageFactory.getImage("change"); //$NON-NLS-1$
return ImageFactory.getImage("blank"); //$NON-NLS-1$
}
-
+
} else if (value instanceof ParameterizedCommand) {
switch (columnIndex) {
case COLUMN_COMMAND:
@@ -301,7 +306,7 @@
}
return null;
}
-
+
} else if ((value instanceof Category) || (value instanceof String)) {
switch (columnIndex) {
case COLUMN_COMMAND:
@@ -335,25 +340,27 @@
case COLUMN_COMMAND:
try {
return binding.getParameterizedCommand().getName();
-
+
} catch (final NotDefinedException e) {
return NewKeysPreferenceMessages.Undefined_Command;
}
case COLUMN_TRIGGER_SEQUENCE:
return binding.getTriggerSequence().format();
-
+
case COLUMN_WHEN:
try {
- return contextService.getContext(binding.getContextId()).getName();
- } catch (NotDefinedException e1) {
- return NewKeysPreferenceMessages.Undefined_Context;
- }
+ return contextService
+ .getContext(binding.getContextId()).getName();
+ } catch (NotDefinedException e1) {
+ return NewKeysPreferenceMessages.Undefined_Context;
+ }
case COLUMN_CATEGORY:
try {
- return binding.getParameterizedCommand().getCommand().getCategory().getName();
- } catch (NotDefinedException e) {
- return NewKeysPreferenceMessages.Unavailable_Category;
- }
+ return binding.getParameterizedCommand().getCommand()
+ .getCategory().getName();
+ } catch (NotDefinedException e) {
+ return NewKeysPreferenceMessages.Unavailable_Category;
+ }
default:
return null;
}
@@ -388,15 +395,16 @@
return NewKeysPreferenceMessages.Undefined_Command;
}
}
- if (columnIndex== COLUMN_TRIGGER_SEQUENCE)
+ if (columnIndex == COLUMN_TRIGGER_SEQUENCE)
return ""; //$NON-NLS-1$
-
- if (columnIndex==COLUMN_WHEN)
+
+ if (columnIndex == COLUMN_WHEN)
return ""; //$NON-NLS-1$
-
- if (columnIndex==COLUMN_CATEGORY){
+
+ if (columnIndex == COLUMN_CATEGORY) {
try {
- return ((ParameterizedCommand) value).getCommand().getCategory().getName();
+ return ((ParameterizedCommand) value).getCommand()
+ .getCategory().getName();
} catch (NotDefinedException e) {
// TODO Auto-generated catch block
return NewKeysPreferenceMessages.Unavailable_Category;
@@ -416,7 +424,7 @@
private int sortColumn = 0;
private boolean ascending = true;
-
+
public final int category(final Object element) {
switch (grouping) {
case GROUPING_CATEGORY:
@@ -560,20 +568,20 @@
}
} else { // (GROUPING_NONE_NAME.equals(selectedText))
-
- IBaseLabelProvider baseLabel = filteredTree.getViewer().getLabelProvider();
+
+ IBaseLabelProvider baseLabel = filteredTree.getViewer()
+ .getLabelProvider();
if (baseLabel instanceof ITableLabelProvider) {
ITableLabelProvider tableProvider = (ITableLabelProvider) baseLabel;
String e1p = tableProvider.getColumnText(a, sortColumn);
String e2p = tableProvider.getColumnText(b, sortColumn);
- if (e1p!=null && e2p!=null){
+ if (e1p != null && e2p != null) {
int result = getComparator().compare(e1p, e2p);
- return ascending ? result : (-1) * result;
-
+ return ascending ? result : (-1) * result;
+
}
}
return super.compare(viewer, a, b);
-
}
} catch (final NotDefinedException e) {
@@ -582,7 +590,7 @@
return 0;
}
-
+
/**
* @return Returns the sortColumn.
*/
@@ -591,7 +599,8 @@
}
/**
- * @param sortColumn The sortColumn to set.
+ * @param sortColumn
+ * The sortColumn to set.
*/
public void setSortColumn(int sortColumn) {
this.sortColumn = sortColumn;
@@ -605,7 +614,8 @@
}
/**
- * @param ascending The ascending to set.
+ * @param ascending
+ * The ascending to set.
*/
public void setAscending(boolean ascending) {
this.ascending = ascending;
@@ -665,6 +675,10 @@
*/
private static final String ICON_GROUP_OF_BINDINGS = "$nl$/icons/full/obj16/keygroups_obj.gif"; //$NON-NLS-1$
+ private static final String CONTEXT_ID_ACTION_SETS = "org.eclipse.ui.contexts.actionSet"; //$NON-NLS-1$
+
+ private static final String CONTEXT_ID_INTERNAL = ".internal."; //$NON-NLS-1$
+
/**
* The number of items to show in the bindings table tree.
*/
@@ -675,11 +689,14 @@
* NamedHandleObject instances to the end user.
*/
private static final NamedHandleObjectComparator NAMED_HANDLE_OBJECT_COMPARATOR = new NamedHandleObjectComparator();
-
- private final static String TAG_DIALOG_SECTION = "org.eclipse.ui.preferences.keysPreferencePage"; //$NON-NLS-1$
-
+
+ public final static String TAG_DIALOG_SECTION = "org.eclipse.ui.preferences.keysPreferencePage"; //$NON-NLS-1$
+
private final String TAG_FIELD = "showAllField"; //$NON-NLS-1$
+ private static final String TAG_FILTER_ACTION_SETS = "actionSetFilter"; //$NON-NLS-1$
+ private static final String TAG_FILTER_INTERNAL = "internalFilter"; //$NON-NLS-1$
+
/**
* Sorts the given array of NamedHandleObject instances based
* on their name. This is generally useful if they will be displayed to an
@@ -798,6 +815,10 @@
*/
private Button showAllCheckBox = null;
+ private boolean filterActionSetContexts = true;
+
+ private boolean filterInternalContexts = true;
+
/**
* The combo box containing the list of possible contexts to choose from.
* This value is null until the contents are create.
@@ -816,11 +837,11 @@
private final void bindingAdd(final Binding binding) {
if (!(binding.getParameterizedCommand().getCommand().isDefined()))
return;
-
+
// Remember the parameterized command and context.
markedParameterizedCommand = binding.getParameterizedCommand();
markedContextId = binding.getContextId();
-
+
// Update the preference page.
update();
@@ -842,13 +863,13 @@
final String contextId = binding.getContextId();
final String schemeId = binding.getSchemeId();
final KeySequence triggerSequence = binding.getKeySequence();
- if (binding.getType()==Binding.USER) {
+ if (binding.getType() == Binding.USER) {
localChangeManager.removeBinding(binding);
} else {
- // TODO This should be the user's personal scheme.
- localChangeManager.addBinding(new KeyBinding(triggerSequence, null,
- schemeId, contextId, null, null, null, Binding.USER));
+ // TODO This should be the user's personal scheme.
+ localChangeManager.addBinding(new KeyBinding(triggerSequence, null,
+ schemeId, contextId, null, null, null, Binding.USER));
}
update();
}
@@ -880,11 +901,26 @@
final Button advancedButton = new Button(buttonBar, SWT.PUSH);
gridData = new GridData();
widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
- advancedButton.setText(NewKeysPreferenceMessages.AdvancedButton_Text);
+ advancedButton.setText(NewKeysPreferenceMessages.AdvancedButton_Text);
gridData.widthHint = Math.max(widthHint, advancedButton.computeSize(
SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
advancedButton.setLayoutData(gridData);
+ advancedButton.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ public void widgetSelected(SelectionEvent e) {
+ KeysPreferenceFiltersDialog dialog = new KeysPreferenceFiltersDialog(
+ getShell());
+ dialog.setFilterActionSet(filterActionSetContexts);
+ dialog.setFilterInternal(filterInternalContexts);
+ if (dialog.open() == Window.OK) {
+ filterActionSetContexts = dialog.getFilterActionSet();
+ filterInternalContexts = dialog.getFilterInternal();
+ whenCombo.setInput(getContexts());
+ }
+ }
+ });
return buttonBar;
}
@@ -896,6 +932,15 @@
protected final Control createContents(final Composite parent) {
GridLayout layout = null;
+ IDialogSettings settings = getDialogSettings();
+ if (settings.get(TAG_FILTER_ACTION_SETS) != null) {
+ filterActionSetContexts = settings
+ .getBoolean(TAG_FILTER_ACTION_SETS);
+ }
+ if (settings.get(TAG_FILTER_INTERNAL) != null) {
+ filterInternalContexts = settings.getBoolean(TAG_FILTER_INTERNAL);
+ }
+
// Creates a composite to hold all of the page contents.
final Composite page = new Composite(parent, SWT.NONE);
layout = new GridLayout(1, false);
@@ -941,7 +986,8 @@
// The command name label.
final Label commandNameLabel = new Label(leftDataArea, SWT.NONE);
- commandNameLabel.setText(NewKeysPreferenceMessages.CommandNameLabel_Text);
+ commandNameLabel
+ .setText(NewKeysPreferenceMessages.CommandNameLabel_Text);
// The current command name.
commandNameValueLabel = new Label(leftDataArea, SWT.NONE);
@@ -953,7 +999,7 @@
// The binding label.
final Label bindingLabel = new Label(leftDataArea, SWT.NONE);
- bindingLabel.setText(NewKeysPreferenceMessages.BindingLabel_Text);
+ bindingLabel.setText(NewKeysPreferenceMessages.BindingLabel_Text);
// The key sequence entry widget.
bindingText = new Text(leftDataArea, SWT.BORDER);
@@ -977,7 +1023,8 @@
// Button for adding trapped key strokes
final Button addKeyButton = new Button(leftDataArea, SWT.LEFT
| SWT.ARROW);
- addKeyButton.setToolTipText(NewKeysPreferenceMessages.AddKeyButton_ToolTipText);
+ addKeyButton
+ .setToolTipText(NewKeysPreferenceMessages.AddKeyButton_ToolTipText);
gridData = new GridData();
gridData.heightHint = schemeCombo.getCombo().getTextHeight();
addKeyButton.setLayoutData(gridData);
@@ -1027,7 +1074,7 @@
// The when label.
final Label whenLabel = new Label(leftDataArea, SWT.NONE);
- whenLabel.setText(NewKeysPreferenceMessages.WhenLabel_Text);
+ whenLabel.setText(NewKeysPreferenceMessages.WhenLabel_Text);
// The when combo.
whenCombo = new ComboViewer(leftDataArea);
@@ -1038,6 +1085,7 @@
whenCombo.getCombo().setLayoutData(gridData);
whenCombo.setLabelProvider(new NamedHandleObjectLabelProvider());
whenCombo.setContentProvider(new ArrayContentProvider());
+ whenCombo.setComparator(new ViewerComparator());
// RIGHT DATA AREA
// Creates the right data area.
@@ -1051,14 +1099,16 @@
// The description label.
final Label descriptionLabel = new Label(rightDataArea, SWT.NONE);
- descriptionLabel.setText(NewKeysPreferenceMessages.DescriptionLabel_Text);
+ descriptionLabel
+ .setText(NewKeysPreferenceMessages.DescriptionLabel_Text);
gridData = new GridData();
gridData.grabExcessHorizontalSpace = true;
gridData.horizontalAlignment = SWT.FILL;
- descriptionLabel.setLayoutData(gridData);
-
+ descriptionLabel.setLayoutData(gridData);
+
// The description value.
- descriptionValueText = new Text(rightDataArea,SWT.BORDER|SWT.MULTI|SWT.H_SCROLL);
+ descriptionValueText = new Text(rightDataArea, SWT.BORDER | SWT.MULTI
+ | SWT.H_SCROLL);
gridData = new GridData(GridData.FILL_BOTH);
gridData.horizontalIndent = 20;
descriptionValueText.setLayoutData(gridData);
@@ -1083,7 +1133,7 @@
// Create the label.
final Label schemeLabel = new Label(schemeControls, SWT.NONE);
- schemeLabel.setText(NewKeysPreferenceMessages.SchemeLabel_Text);
+ schemeLabel.setText(NewKeysPreferenceMessages.SchemeLabel_Text);
// Create the combo.
schemeCombo = new ComboViewer(schemeControls);
@@ -1105,7 +1155,8 @@
final Button deleteSchemeButton = new Button(schemeControls, SWT.PUSH);
gridData = new GridData();
widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
- deleteSchemeButton.setText(NewKeysPreferenceMessages.DeleteSchemeButton_Text);
+ deleteSchemeButton
+ .setText(NewKeysPreferenceMessages.DeleteSchemeButton_Text);
gridData.widthHint = Math.max(widthHint, deleteSchemeButton
.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
deleteSchemeButton.setLayoutData(gridData);
@@ -1117,7 +1168,7 @@
GridData gridData;
filteredTree = new GroupedFilteredTree(parent, SWT.SINGLE
- | SWT.FULL_SELECTION | SWT.BORDER, new PatternFilter());
+ | SWT.FULL_SELECTION | SWT.BORDER, new PatternFilter());
final GridLayout layout = new GridLayout(2, false);
layout.marginWidth = 0;
filteredTree.setLayout(layout);
@@ -1140,91 +1191,96 @@
}
}
- final BindingComparator comparator = new BindingComparator();
- comparator.setSortColumn(0);
-
+ final BindingComparator comparator = new BindingComparator();
+ comparator.setSortColumn(0);
+
// Create the columns for the tree.
-
+
final TreeColumn commandNameColumn = new TreeColumn(tree, SWT.LEFT,
BindingLabelProvider.COLUMN_COMMAND);
- commandNameColumn.setText(NewKeysPreferenceMessages.CommandNameColumn_Text);
+ commandNameColumn
+ .setText(NewKeysPreferenceMessages.CommandNameColumn_Text);
tree.setSortColumn(commandNameColumn);
- tree.setSortDirection(comparator.isAscending()?SWT.UP:SWT.DOWN);
- commandNameColumn.addSelectionListener(new SelectionAdapter(){
+ tree.setSortDirection(comparator.isAscending() ? SWT.UP : SWT.DOWN);
+ commandNameColumn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- if (comparator.getSortColumn()==BindingLabelProvider.COLUMN_COMMAND) {
- comparator.setAscending(!comparator.isAscending());
- }
- tree.setSortColumn(commandNameColumn);
- tree.setSortDirection(comparator.isAscending()?SWT.UP:SWT.DOWN);
- comparator.setSortColumn(BindingLabelProvider.COLUMN_COMMAND);
- filteredTree.getViewer().refresh();
-
+ if (comparator.getSortColumn() == BindingLabelProvider.COLUMN_COMMAND) {
+ comparator.setAscending(!comparator.isAscending());
+ }
+ tree.setSortColumn(commandNameColumn);
+ tree.setSortDirection(comparator.isAscending() ? SWT.UP
+ : SWT.DOWN);
+ comparator.setSortColumn(BindingLabelProvider.COLUMN_COMMAND);
+ filteredTree.getViewer().refresh();
+
}
-
+
});
final TreeColumn triggerSequenceColumn = new TreeColumn(tree, SWT.LEFT,
BindingLabelProvider.COLUMN_TRIGGER_SEQUENCE);
- triggerSequenceColumn.setText(NewKeysPreferenceMessages.TriggerSequenceColumn_Text);
- triggerSequenceColumn.addSelectionListener(new SelectionAdapter(){
+ triggerSequenceColumn
+ .setText(NewKeysPreferenceMessages.TriggerSequenceColumn_Text);
+ triggerSequenceColumn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- if (comparator.getSortColumn()==BindingLabelProvider.COLUMN_TRIGGER_SEQUENCE) {
- comparator.setAscending(!comparator.isAscending());
- }
- tree.setSortColumn(triggerSequenceColumn);
- tree.setSortDirection(comparator.isAscending()?SWT.UP:SWT.DOWN);
- comparator.setSortColumn(BindingLabelProvider.COLUMN_TRIGGER_SEQUENCE);
- filteredTree.getViewer().refresh();
-
+ if (comparator.getSortColumn() == BindingLabelProvider.COLUMN_TRIGGER_SEQUENCE) {
+ comparator.setAscending(!comparator.isAscending());
+ }
+ tree.setSortColumn(triggerSequenceColumn);
+ tree.setSortDirection(comparator.isAscending() ? SWT.UP
+ : SWT.DOWN);
+ comparator
+ .setSortColumn(BindingLabelProvider.COLUMN_TRIGGER_SEQUENCE);
+ filteredTree.getViewer().refresh();
+
}
-
+
});
-
+
final TreeColumn whenColumn = new TreeColumn(tree, SWT.LEFT,
BindingLabelProvider.COLUMN_WHEN);
whenColumn.setText(NewKeysPreferenceMessages.WhenColumn_Text);
- whenColumn.addSelectionListener(new SelectionAdapter(){
+ whenColumn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- if (comparator.getSortColumn()==BindingLabelProvider.COLUMN_WHEN) {
- comparator.setAscending(!comparator.isAscending());
- }
- tree.setSortColumn(whenColumn);
- tree.setSortDirection(comparator.isAscending()?SWT.UP:SWT.DOWN);
- comparator.setSortColumn(BindingLabelProvider.COLUMN_WHEN);
- filteredTree.getViewer().refresh();
-
+ if (comparator.getSortColumn() == BindingLabelProvider.COLUMN_WHEN) {
+ comparator.setAscending(!comparator.isAscending());
+ }
+ tree.setSortColumn(whenColumn);
+ tree.setSortDirection(comparator.isAscending() ? SWT.UP
+ : SWT.DOWN);
+ comparator.setSortColumn(BindingLabelProvider.COLUMN_WHEN);
+ filteredTree.getViewer().refresh();
+
}
-
+
});
-
final TreeColumn categoryColumn = new TreeColumn(tree, SWT.LEFT,
BindingLabelProvider.COLUMN_CATEGORY);
categoryColumn.setText(NewKeysPreferenceMessages.CategoryColumn_Text);
- categoryColumn.addSelectionListener(new SelectionAdapter(){
+ categoryColumn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- if (comparator.getSortColumn()==BindingLabelProvider.COLUMN_CATEGORY) {
- comparator.setAscending(!comparator.isAscending());
- }
- tree.setSortColumn(categoryColumn);
- tree.setSortDirection(comparator.isAscending()?SWT.UP:SWT.DOWN);
- comparator.setSortColumn(BindingLabelProvider.COLUMN_CATEGORY);
- filteredTree.getViewer().refresh();
-
+ if (comparator.getSortColumn() == BindingLabelProvider.COLUMN_CATEGORY) {
+ comparator.setAscending(!comparator.isAscending());
+ }
+ tree.setSortColumn(categoryColumn);
+ tree.setSortDirection(comparator.isAscending() ? SWT.UP
+ : SWT.DOWN);
+ comparator.setSortColumn(BindingLabelProvider.COLUMN_CATEGORY);
+ filteredTree.getViewer().refresh();
+
}
-
+
});
-
+
new TreeColumn(tree, SWT.LEFT, BindingLabelProvider.COLUMN_USER);
-
-
+
// Set up the providers for the viewer.
final TreeViewer viewer = filteredTree.getViewer();
viewer.setLabelProvider(new BindingLabelProvider());
viewer.setContentProvider(new TreeNodeContentProvider());
-
+
viewer.setComparator(comparator);
-
+
/*
* Listen for selection changes so that the data controls can be
* updated.
@@ -1239,7 +1295,7 @@
filteredTree.getPatternFilter().setIncludeLeadingWildcard(true);
return filteredTree;
}
-
+
private final Control createTreeControls(final Composite parent) {
GridLayout layout;
GridData gridData;
@@ -1263,7 +1319,7 @@
gridData.verticalAlignment = SWT.TOP;
showAllCheckBox.setLayoutData(gridData);
showAllCheckBox.setText(NewKeysPreferenceMessages.ShowAllCheckBox_Text);
- IDialogSettings settings=getDialogSettings();
+ IDialogSettings settings = getDialogSettings();
showAllCheckBox.setSelection(settings.getBoolean(TAG_FIELD));
showAllCheckBox.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
@@ -1275,7 +1331,8 @@
final Button addBindingButton = new Button(treeControls, SWT.PUSH);
gridData = new GridData();
widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
- addBindingButton.setText(NewKeysPreferenceMessages.AddBindingButton_Text);
+ addBindingButton
+ .setText(NewKeysPreferenceMessages.AddBindingButton_Text);
gridData.widthHint = Math.max(widthHint, addBindingButton.computeSize(
SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
addBindingButton.setLayoutData(gridData);
@@ -1289,7 +1346,8 @@
final Button removeBindingButton = new Button(treeControls, SWT.PUSH);
gridData = new GridData();
widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
- removeBindingButton.setText(NewKeysPreferenceMessages.RemoveBindingButton_Text);
+ removeBindingButton
+ .setText(NewKeysPreferenceMessages.RemoveBindingButton_Text);
gridData.widthHint = Math.max(widthHint, removeBindingButton
.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
removeBindingButton.setLayoutData(gridData);
@@ -1339,7 +1397,8 @@
setScheme(localChangeManager.getActiveScheme());
// Update the when combo.
- whenCombo.setInput(sortByName(contextService.getDefinedContexts()));
+ whenCombo.setInput(getContexts());
+
}
/*
@@ -1348,10 +1407,14 @@
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
public final void init(final IWorkbench workbench) {
- bindingService = (IBindingService) workbench.getService(IBindingService.class);
- commandImageService = (ICommandImageService) workbench.getService(ICommandImageService.class);
- commandService = (ICommandService) workbench.getService(ICommandService.class);
- contextService = (IContextService) workbench.getService(IContextService.class);
+ bindingService = (IBindingService) workbench
+ .getService(IBindingService.class);
+ commandImageService = (ICommandImageService) workbench
+ .getService(ICommandImageService.class);
+ commandService = (ICommandService) workbench
+ .getService(ICommandService.class);
+ contextService = (IContextService) workbench
+ .getService(IContextService.class);
}
/**
@@ -1400,7 +1463,7 @@
IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID,
contextId, null, null, null, Binding.USER);
- if (keyBinding.getType()==Binding.USER) {
+ if (keyBinding.getType() == Binding.USER) {
localChangeManager.removeBinding(keyBinding);
}
localChangeManager.addBinding(binding);
@@ -1643,7 +1706,6 @@
whenCombo.setSelection(new StructuredSelection(
contextService.getContext(binding.getContextId())));
keySequenceText.setKeySequence(binding.getKeySequence());
-
} else if (object instanceof ParameterizedCommand) {
final ParameterizedCommand command = (ParameterizedCommand) object;
@@ -1706,7 +1768,7 @@
if (localChangeManager
.getActiveBindingsDisregardingContextFor(command).length > 0) {
commandItr.remove();
-
+
}
}
@@ -1716,12 +1778,13 @@
// Add the marked parameterized command, if any.
if (markedParameterizedCommand != null) {
bindings.add(markedParameterizedCommand);
- markedParameterizedCommand=null;
+ markedParameterizedCommand = null;
}
// Check the grouping.
final String grouping = NewKeysPreferenceMessages.GroupingCombo_None_Text;
- if (NewKeysPreferenceMessages.GroupingCombo_Category_Text.equals(grouping)) {
+ if (NewKeysPreferenceMessages.GroupingCombo_Category_Text
+ .equals(grouping)) {
// Group all of the bindings by category.
final HashMap bindingsByCategory = new HashMap();
final Iterator bindingItr = bindings.iterator();
@@ -1775,7 +1838,8 @@
// Set the input.
viewer.setInput(elements);
- } else if (NewKeysPreferenceMessages.GroupingCombo_When_Text.equals(grouping)) {
+ } else if (NewKeysPreferenceMessages.GroupingCombo_When_Text
+ .equals(grouping)) {
// Group all of the bindings by context.
final HashMap bindingsByContextId = new HashMap();
final Iterator bindingItr = bindings.iterator();
@@ -1839,8 +1903,10 @@
// Repack all of the columns.
final Tree tree = viewer.getTree();
final TreeColumn[] columns = tree.getColumns();
- if (NewKeysPreferenceMessages.GroupingCombo_Category_Text.equals(grouping)
- || NewKeysPreferenceMessages.GroupingCombo_When_Text.equals(grouping)) {
+ if (NewKeysPreferenceMessages.GroupingCombo_Category_Text
+ .equals(grouping)
+ || NewKeysPreferenceMessages.GroupingCombo_When_Text
+ .equals(grouping)) {
columns[BindingLabelProvider.COLUMN_COMMAND].setWidth(240);
} else {
columns[BindingLabelProvider.COLUMN_COMMAND].setWidth(240);
@@ -1850,8 +1916,7 @@
columns[BindingLabelProvider.COLUMN_CATEGORY].setWidth(130);
columns[BindingLabelProvider.COLUMN_USER].setWidth(22);
}
-
-
+
/**
* Save the state of the receiver.
*
@@ -1862,11 +1927,14 @@
return;
}
dialogSettings.put(TAG_FIELD, showAllCheckBox.getSelection());
+ dialogSettings.put(TAG_FILTER_ACTION_SETS, filterActionSetContexts);
+ dialogSettings.put(TAG_FILTER_INTERNAL, filterInternalContexts);
}
-
+
protected IDialogSettings getDialogSettings() {
- IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();
-
+ IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault()
+ .getDialogSettings();
+
IDialogSettings settings = workbenchSettings
.getSection(TAG_DIALOG_SECTION);
@@ -1875,4 +1943,48 @@
}
return settings;
}
+
+ protected Object[] getContexts() {
+
+ Context[] contexts = contextService.getDefinedContexts();
+ List filteredContexts = new ArrayList();
+ try {
+ if (filterActionSetContexts) {
+ for (int i = 0; i < contexts.length; i++) {
+ String parentId = contexts[i].getParentId();
+ boolean check = false;
+ if (contexts[i].getId().equalsIgnoreCase(
+ CONTEXT_ID_ACTION_SETS)) {
+ check = true;
+ }
+ while (parentId != null) {
+ if (parentId.equalsIgnoreCase(CONTEXT_ID_ACTION_SETS)) {
+ check = true;
+ }
+ parentId = contextService.getContext(parentId)
+ .getParentId();
+ }
+ if (!check) {
+ filteredContexts.add(contexts[i]);
+ }
+ }
+ } else {
+ filteredContexts.addAll(Arrays.asList(contexts));
+ }
+
+ if (filterInternalContexts) {
+ for (int i = 0; i < filteredContexts.size(); i++) {
+ if (((Context) filteredContexts.get(i)).getId().indexOf(
+ CONTEXT_ID_INTERNAL) != -1) {
+ filteredContexts.remove(i);
+ }
+ }
+ }
+
+ } catch (NotDefinedException e) {
+ return contexts;
+ }
+
+ return filteredContexts.toArray();
+ }
}
Index: Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java,v
retrieving revision 1.7
diff -u -r1.7 NewKeysPreferenceMessages.java
--- Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java 26 Apr 2007 18:20:56 -0000 1.7
+++ Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java 27 Apr 2007 02:04:33 -0000
@@ -53,6 +53,10 @@
public static String Unavailable_Category;
public static String Undefined_Context;
+ public static String KeysPreferenceFilterDialog_Title;
+ public static String ActionSetFilterCheckBox_Text;
+ public static String InternalFilterCheckBox_Text;
+
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, NewKeysPreferenceMessages.class);
Index: Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties,v
retrieving revision 1.12
diff -u -r1.12 NewKeysPreferencePage.properties
--- Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties 26 Apr 2007 18:20:56 -0000 1.12
+++ Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties 27 Apr 2007 02:04:34 -0000
@@ -41,3 +41,7 @@
Undefined_Context=Undefined Context
+ActionSetFilterCheckBox_Text= Filter action set contexts
+InternalFilterCheckBox_Text = Filter internal contexts
+KeysPreferenceFilterDialog_Title= When Context Filters
+
Index: Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java
===================================================================
RCS file: Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java
diff -N Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.ui.internal.keys;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.preferences.ViewSettingsDialog;
+
+/**
+ * Creates a dialog box for applying filter selection of When combo box in
+ * NewKeysPreferencePage
+ *
+ * @since 3.3
+ *
+ */
+public class KeysPreferenceFiltersDialog extends ViewSettingsDialog {
+
+ private Button actionSetFilterCheckBox;
+ private Button internalFilterCheckBox;
+
+ private boolean filterActionSet;
+ private boolean filterInternal;
+
+ void setFilterActionSet(boolean b) {
+ filterActionSet = b;
+ }
+
+ void setFilterInternal(boolean b) {
+ filterInternal = b;
+ }
+
+ boolean getFilterActionSet() {
+ return filterActionSet;
+ }
+
+ boolean getFilterInternal() {
+ return filterInternal;
+ }
+
+ /**
+ * @param parentShell
+ */
+ public KeysPreferenceFiltersDialog(Shell parentShell) {
+ super(parentShell);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.preferences.ViewSettingsDialog#performDefaults()
+ */
+ protected void performDefaults() {
+ actionSetFilterCheckBox.setSelection(true);
+ internalFilterCheckBox.setSelection(true);
+ super.performDefaults();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+ */
+ protected Control createDialogArea(Composite parent) {
+ Composite topComposite = (Composite) super.createDialogArea(parent);
+ super.createDialogArea(parent);
+ GridLayout layout = new GridLayout(1, false);
+ topComposite.setLayout(layout);
+ topComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL));
+ actionSetFilterCheckBox = new Button(topComposite, SWT.CHECK);
+ actionSetFilterCheckBox
+ .setText(NewKeysPreferenceMessages.ActionSetFilterCheckBox_Text);
+ internalFilterCheckBox = new Button(topComposite, SWT.CHECK);
+ internalFilterCheckBox
+ .setText(NewKeysPreferenceMessages.InternalFilterCheckBox_Text);
+
+ actionSetFilterCheckBox.setSelection(filterActionSet);
+ internalFilterCheckBox.setSelection(filterInternal);
+
+ return topComposite;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.dialogs.Dialog#okPressed()
+ */
+ protected void okPressed() {
+ filterActionSet = actionSetFilterCheckBox.getSelection();
+ filterInternal = internalFilterCheckBox.getSelection();
+ super.okPressed();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
+ */
+ protected void configureShell(Shell newShell) {
+ super.configureShell(newShell);
+ newShell
+ .setText(NewKeysPreferenceMessages.KeysPreferenceFilterDialog_Title);
+ }
+
+}