From 7bd43750ccd792743e2567930baf2705629af17a Mon Sep 17 00:00:00 2001 From: David Weiser Date: Tue, 1 Aug 2017 12:48:27 +0200 Subject: Detached HEAD dialog should use verbs (close) instead of OK * uses constructor of MessageDialogWithToggle to set close button label Bug: 518506 Change-Id: I3b37e084339ba52d843a038c1f4f9ce9ddb6d9f4 Signed-off-by: David Weiser --- .../egit/ui/internal/branch/BranchOperationUI.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java index 36b075a693..14475ac132 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchOperationUI.java @@ -375,13 +375,20 @@ public class BranchOperationUI { if (store.getBoolean(UIPreferences.SHOW_DETACHED_HEAD_WARNING)) { String toggleMessage = UIText.BranchResultDialog_DetachedHeadWarningDontShowAgain; - MessageDialogWithToggle.openInformation(PlatformUI - .getWorkbench().getActiveWorkbenchWindow() - .getShell(), - UIText.BranchOperationUI_DetachedHeadTitle, + + MessageDialogWithToggle dialog = new MessageDialogWithToggle( + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(), + UIText.BranchOperationUI_DetachedHeadTitle, null, UIText.BranchOperationUI_DetachedHeadMessage, - toggleMessage, false, store, - UIPreferences.SHOW_DETACHED_HEAD_WARNING); + MessageDialog.INFORMATION, + new String[] { IDialogConstants.CLOSE_LABEL }, + 0, toggleMessage, false); + dialog.open(); + if (dialog.getToggleState()) { + store.setValue(UIPreferences.SHOW_DETACHED_HEAD_WARNING, + false); + } } } }); -- cgit v1.2.3