X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/InternalBrowserDialog.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/InternalBrowserDialog.java index 11cb860..75f74e3 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/InternalBrowserDialog.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/InternalBrowserDialog.java @@ -4,14 +4,13 @@ * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html - * + �* * Contributors: * IBM - Initial API and implementation **********************************************************************/ package net.sourceforge.phpeclipse.webbrowser.internal; import net.sourceforge.phpeclipse.webbrowser.IInternalWebBrowserWorkingCopy; -import net.sourceforge.phpeclipse.webbrowser.internal.SWTUtil; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; @@ -21,20 +20,25 @@ 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.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; + /** * */ public class InternalBrowserDialog extends Dialog { protected IInternalWebBrowserWorkingCopy browser; + protected boolean isEdit; + protected Button newPageCheckbox; + protected Button clearURLHistoryCheckbox; - + /** * @param parentShell */ - public InternalBrowserDialog(Shell parentShell, IInternalWebBrowserWorkingCopy browser) { + public InternalBrowserDialog(Shell parentShell, + IInternalWebBrowserWorkingCopy browser) { super(parentShell); this.browser = browser; isEdit = true; @@ -42,43 +46,51 @@ public class InternalBrowserDialog extends Dialog { protected void configureShell(Shell shell) { super.configureShell(shell); - + if (isEdit) - shell.setText(WebBrowserUIPlugin.getResource("%editInternalBrowser")); + shell.setText(WebBrowserUIPlugin + .getResource("%editInternalBrowser")); } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); - ((GridLayout)composite.getLayout()).numColumns = 1; - + ((GridLayout) composite.getLayout()).numColumns = 1; + Composite comp = new Composite(composite, SWT.NONE); GridLayout layout = new GridLayout(1, true); layout.marginHeight = 10; layout.marginWidth = 10; comp.setLayout(layout); comp.setLayoutData(new GridData(GridData.FILL_BOTH)); - WorkbenchHelp.setHelp(composite, ContextIds.PREF_BROWSER_INTERNAL); - - newPageCheckbox = SWTUtil.createCheckbox(comp, WebBrowserUIPlugin.getResource("%prefBrowserNewPage"), false); - clearURLHistoryCheckbox = SWTUtil.createCheckbox(comp, WebBrowserUIPlugin.getResource("%clearURLHistory"), true); - + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, + ContextIds.PREF_BROWSER_INTERNAL); + + newPageCheckbox = SWTUtil.createCheckbox(comp, WebBrowserUIPlugin + .getResource("%prefBrowserNewPage"), false); + clearURLHistoryCheckbox = SWTUtil.createCheckbox(comp, + WebBrowserUIPlugin.getResource("%clearURLHistory"), true); + newPageCheckbox.setSelection(browser.getUseNewPage()); clearURLHistoryCheckbox.setSelection(browser.getClearHistoryOnExit()); - + return composite; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ protected void okPressed() { browser.setUseNewPage(newPageCheckbox.getSelection()); browser.setClearHistoryOnExit(clearURLHistoryCheckbox.getSelection()); browser.save(); - + super.okPressed(); } } \ No newline at end of file