From 0f31037ebee8a87a57b3cea00822e875701942a9 Mon Sep 17 00:00:00 2001 From: Anton Keks Date: Sat, 29 Aug 2015 14:31:23 +0300 Subject: [PATCH] use OK/cancel buttons in EditOpenersDialog for consistency with other preferences dialogs --- .../azib/ipscan/gui/EditOpenersDialog.java | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/net/azib/ipscan/gui/EditOpenersDialog.java b/src/net/azib/ipscan/gui/EditOpenersDialog.java index 34962e1e..64429861 100644 --- a/src/net/azib/ipscan/gui/EditOpenersDialog.java +++ b/src/net/azib/ipscan/gui/EditOpenersDialog.java @@ -119,19 +119,30 @@ public class EditOpenersDialog extends AbstractModalDialog { editFieldsGroup.layout(); editFieldsGroup.pack(); - Button closeButton = createCloseButton(); - closeButton.setLayoutData(formData(85, SWT.DEFAULT, null, new FormAttachment(editFieldsGroup, 0, SWT.RIGHT), new FormAttachment(editFieldsGroup, 6), null)); - + Button okButton = new Button(shell, SWT.NONE); + okButton.setText(Labels.getLabel("button.OK")); + + Button cancelButton = new Button(shell, SWT.NONE); + cancelButton.setText(Labels.getLabel("button.cancel")); + + positionButtonsInFormLayout(okButton, cancelButton, editFieldsGroup); + shell.pack(); + okButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { + public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { + saveOpeners(); + shell.close(); + } + }); + cancelButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { + public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { + shell.close(); + } + }); + openersList.select(0); loadFieldsForSelection(); - - shell.addListener(SWT.Close, new Listener() { - public void handleEvent(Event e) { - saveOpeners(); - } - }); } private void saveOpeners() {