Attachment #212604 for bug #374096

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

View | Details | Raw Unified | Return to bug 374096
Collapse All | Expand All




		TreePart treePart = getTreePart();
		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
		// fix layout to place search button right to the filter text 
		final Control searchButton = treePart.getButton(BUTTON_SEARCH);
		((GridLayout) searchButton.getParent().getLayout()).marginHeight = 2;
		searchButton.setLayoutData(GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.BEGINNING).grab(false, false).hint(SWT.DEFAULT, 19).create());
		searchButton.setToolTipText(PDEUIMessages.ExtensionsPage_searchWithExtensionsFilter);
		Control addButton = treePart.getButton(BUTTON_ADD);
		((GridData) addButton.getLayoutData()).verticalIndent = 16;

				}
			});
		}
		// Layout fixed for Bug 374096
		Display.getCurrent().asyncExec(new Runnable() {
			public void run() {
				int height = fFilteredTree.getFilterControl().getParent().getBounds().height;
				searchButton.setLayoutData(GridDataFactory.defaultsFor(searchButton).align(SWT.FILL, SWT.BEGINNING).grab(false, false).hint(SWT.DEFAULT, height).create());
				searchButton.getParent().layout();
			}
		});
	}

	/**

				}
			}
		};
		fSortAction.setDisabledImageDescriptor(PDEPluginImages.DESC_ALPHAB_SORT_CO_DISABLED);
		toolBarManager.add(fSortAction);
		// Add expand selected leafs action to the toolbar
		fExpandAction = new ToggleExpandStateAction(fFilteredTree, fExtensionTree);
		toolBarManager.add(fExpandAction);
		// Add collapse action to the tool bar
		fCollapseAction = new CollapseAction(fExtensionTree, PDEUIMessages.ExtensionsPage_collapseAll);
		fCollapseAction.setDisabledImageDescriptor(PDEPluginImages.DESC_COLLAPSE_ALL_DISABLED);
		toolBarManager.add(fCollapseAction);

		toolBarManager.update(true);

			getTreePart().setButtonEnabled(BUTTON_SEARCH, searchEnabled);
			fSearchToolbarAction.setEnabled(filterRelatedEnabled);
		}
		// see Bug 374096
		if (getSection() != null && getSection().getTextClient() != null) {
			getSection().getTextClient().redraw();
		}

		if (getPage().getModel().isEditable() == false)
			return;

Lines 1542-1548 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties (-1 / +1 lines)
1542	ExtensionsPage_tabName=Extensions	1542	ExtensionsPage_tabName=Extensions
1543	ExtensionsPage_sortAlpha=Sort the Extensions alphabetically	1543	ExtensionsPage_sortAlpha=Sort the Extensions alphabetically
1544	ExtensionsPage_toggleExpandState=Toggle Expand State	1544	ExtensionsPage_toggleExpandState=Toggle Expand State
1545	ExtensionsPage_searchWithExtensionsFilter=Search with current filter	1545	ExtensionsPage_searchWithExtensionsFilter=Search platform plugins with current filter
1546	ExtensionDetails_title=Extension Details	1546	ExtensionDetails_title=Extension Details
1547	ExtensionDetails_desc=Set the properties of the selected extension. Required fields are denoted by "*".	1547	ExtensionDetails_desc=Set the properties of the selected extension. Required fields are denoted by "*".
1548	ExtensionDetails_id=ID	1548	ExtensionDetails_id=ID

Return to bug 374096

Lines 243-251 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java (-2 / +15 lines)
243	TreePart treePart = getTreePart();	243	TreePart treePart = getTreePart();
244	createViewerPartControl(container, SWT.MULTI, 2, toolkit);	244	createViewerPartControl(container, SWT.MULTI, 2, toolkit);
245	// fix layout to place search button right to the filter text	245	// fix layout to place search button right to the filter text
246	Control searchButton = treePart.getButton(BUTTON_SEARCH);	246	final Control searchButton = treePart.getButton(BUTTON_SEARCH);
247	((GridLayout) searchButton.getParent().getLayout()).marginHeight = 2;	247	((GridLayout) searchButton.getParent().getLayout()).marginHeight = 2;
248	searchButton.setLayoutData(GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.BEGINNING).grab(false, false).hint(SWT.DEFAULT, 19).create());
249	searchButton.setToolTipText(PDEUIMessages.ExtensionsPage_searchWithExtensionsFilter);	248	searchButton.setToolTipText(PDEUIMessages.ExtensionsPage_searchWithExtensionsFilter);
250	Control addButton = treePart.getButton(BUTTON_ADD);	249	Control addButton = treePart.getButton(BUTTON_ADD);
251	((GridData) addButton.getLayoutData()).verticalIndent = 16;	250	((GridData) addButton.getLayoutData()).verticalIndent = 16;
Lines 273-278 Link Here
273	}	272	}
274	});	273	});
275	}	274	}
		275	// Layout fixed for Bug 374096
		276	Display.getCurrent().asyncExec(new Runnable() {
		277	public void run() {
		278	int height = fFilteredTree.getFilterControl().getParent().getBounds().height;
		279	searchButton.setLayoutData(GridDataFactory.defaultsFor(searchButton).align(SWT.FILL, SWT.BEGINNING).grab(false, false).hint(SWT.DEFAULT, height).create());
		280	searchButton.getParent().layout();
		281	}
		282	});
276	}	283	}
277		284
278	/**	285	/**
Lines 317-328 Link Here
317	}	324	}
318	}	325	}
319	};	326	};
		327	fSortAction.setDisabledImageDescriptor(PDEPluginImages.DESC_ALPHAB_SORT_CO_DISABLED);
320	toolBarManager.add(fSortAction);	328	toolBarManager.add(fSortAction);
321	// Add expand selected leafs action to the toolbar	329	// Add expand selected leafs action to the toolbar
322	fExpandAction = new ToggleExpandStateAction(fFilteredTree, fExtensionTree);	330	fExpandAction = new ToggleExpandStateAction(fFilteredTree, fExtensionTree);
323	toolBarManager.add(fExpandAction);	331	toolBarManager.add(fExpandAction);
324	// Add collapse action to the tool bar	332	// Add collapse action to the tool bar
325	fCollapseAction = new CollapseAction(fExtensionTree, PDEUIMessages.ExtensionsPage_collapseAll);	333	fCollapseAction = new CollapseAction(fExtensionTree, PDEUIMessages.ExtensionsPage_collapseAll);
		334	fCollapseAction.setDisabledImageDescriptor(PDEPluginImages.DESC_COLLAPSE_ALL_DISABLED);
326	toolBarManager.add(fCollapseAction);	335	toolBarManager.add(fCollapseAction);
327		336
328	toolBarManager.update(true);	337	toolBarManager.update(true);
Lines 1327-1332 Link Here
1327	getTreePart().setButtonEnabled(BUTTON_SEARCH, searchEnabled);	1336	getTreePart().setButtonEnabled(BUTTON_SEARCH, searchEnabled);
1328	fSearchToolbarAction.setEnabled(filterRelatedEnabled);	1337	fSearchToolbarAction.setEnabled(filterRelatedEnabled);
1329	}	1338	}
		1339	// see Bug 374096
		1340	if (getSection() != null && getSection().getTextClient() != null) {
		1341	getSection().getTextClient().redraw();
		1342	}
1330		1343
1331	if (getPage().getModel().isEditable() == false)	1344	if (getPage().getModel().isEditable() == false)
1332	return;	1345	return;