Attachment 248892 Details for Bug 121057 – Addition of only Apply button in Preference Page

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

[patch] Addition of only Apply button in Preference Page

Bug 121057 - JFace New.patch (text/plain), 3.65 KB, created by Sarika Sinha

on 2014-11-25 04:05:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Sarika Sinha

Created: 2014-11-25 04:05:50 EST

Size: 3.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>diff --git src/org/eclipse/jface/preference/PreferencePage.java src/org/eclipse/jface/preference/PreferencePage.java
>index 102f8e6..b1e982d 100644
>--- src/org/eclipse/jface/preference/PreferencePage.java
>+++ src/org/eclipse/jface/preference/PreferencePage.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2013 IBM Corporation and others.
>+ * Copyright (c) 2000, 2014 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
>@@ -78,7 +78,15 @@
>      *
>      * @see #noDefaultAndApplyButton
>      */
>-    private boolean createDefaultAndApplyButton = true;
>+	private boolean createApplyButton = true;
>+
>+	/**
>+	 * Whether this page has the standard Apply button; <code>false</code> by
>+	 * default.
>+	 *
>+	 * @see #noApplyButton
>+	 */
>+	private boolean createDefaultButton = true;
> 
>     /**
>      * Standard Defaults button, or <code>null</code> if none.
>@@ -250,7 +258,7 @@
> 
>         contributeButtons(buttonBar);
>         
>-        if (createDefaultAndApplyButton) {
>+		if (createApplyButton && createDefaultButton) {
>             layout.numColumns = layout.numColumns + 2;
> 			String[] labels = JFaceResources.getStrings(new String[] {
> 					"defaults", "apply" }); //$NON-NLS-2$//$NON-NLS-1$
>@@ -286,7 +294,27 @@
> 			});
>             applyButton.setEnabled(isValid());
>             applyDialogFont(buttonBar);
>-        } else {
>+		} else if (createApplyButton) {
>+			layout.numColumns = layout.numColumns + 1;
>+			String label = JFaceResources.getString("apply"); //$NON-NLS-1$
>+			int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
>+			applyButton = new Button(buttonBar, SWT.PUSH);
>+			applyButton.setText(label);
>+			Dialog.applyDialogFont(applyButton);
>+			GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
>+			Point minButtonSize = applyButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
>+			data.widthHint = Math.max(widthHint, minButtonSize.x);
>+			applyButton.setLayoutData(data);
>+			applyButton.addSelectionListener(new SelectionAdapter() {
>+				@Override
>+				public void widgetSelected(SelectionEvent e) {
>+					performApply();
>+				}
>+			});
>+			applyButton.setEnabled(isValid());
>+			applyDialogFont(buttonBar);
>+
>+		} else {
>             /* Check if there are any other buttons on the button bar.
>              * If not, throw away the button bar composite.  Otherwise
>              * there is an unusually large button bar.
>@@ -408,15 +436,30 @@
>      * </p>
>      */
>     protected void noDefaultAndApplyButton() {
>-        createDefaultAndApplyButton = false;
>+		createApplyButton = false;
>+		createDefaultButton = false;
>     }
> 
>     /**
>-     * The <code>PreferencePage</code> implementation of this 
>-     * <code>IPreferencePage</code> method returns <code>true</code>
>-     * if the page is valid.
>-     * @see IPreferencePage#okToLeave()
>-     */
>+	 * Enable creation of the standard Apply button for this page.
>+	 * <p>
>+	 * Subclasses wishing a preference page with this button should call
>+	 * this framework method before the page's control has been created.
>+	 * </p>
>+	 * 
>+	 * @since 3.11
>+	 */
>+	protected void noDefaultButton() {
>+		createDefaultButton = false;
>+	}
>+
>+	/**
>+	 * The <code>PreferencePage</code> implementation of this
>+	 * <code>IPreferencePage</code> method returns <code>true</code> if the page
>+	 * is valid.
>+	 * 
>+	 * @see IPreferencePage#okToLeave()
>+	 */
>     @Override
> 	public boolean okToLeave() {
>         return isValid();

Flags:

daniel_megert: review-

Actions: View | Diff

Attachments on bug 121057: 248562 | 248563 | 248564 | 248892 | 248893 | 248894 | 249124 | 249125 | 249126 | 249127 | 249277 | 249279 | 249458 | 249512