diff options
author | Brian de Alwis | 2012-12-06 13:50:28 +0000 |
---|---|---|
committer | Brian de Alwis | 2012-12-06 13:50:28 +0000 |
commit | f58eeeba9a8cb3c7a1352091b0d4cefe365b7ba1 (patch) | |
tree | 734d106429dcb8d69d2f996eea07191851ed1503 | |
parent | c02cd061116f3621689ff875c0c9c846c60051d9 (diff) | |
download | eclipse.platform.ui-f58eeeba9a8cb3c7a1352091b0d4cefe365b7ba1.tar.gz eclipse.platform.ui-f58eeeba9a8cb3c7a1352091b0d4cefe365b7ba1.tar.xz eclipse.platform.ui-f58eeeba9a8cb3c7a1352091b0d4cefe365b7ba1.zip |
Bug 395913 - Show View dialog has 'ok' & 'cancel' button text all lower case
Bug 385037 - ShowViewDialog - Enable multi-user environment
Fix commit 699191aabd7973643a37575c2ba93419fadcead7 as per Lars'
patch on bug 385037
2 files changed, 7 insertions, 4 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ShowViewDialog.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ShowViewDialog.java index 66ee79e01ab..06d03bc6cb2 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ShowViewDialog.java +++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ShowViewDialog.java @@ -24,6 +24,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogLabelKeys; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.PopupDialog; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -137,9 +138,10 @@ public class ShowViewDialog extends Dialog implements */ protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, - IDialogLabelKeys.OK_LABEL_KEY, true); + JFaceResources.getString(IDialogLabelKeys.OK_LABEL_KEY), true); createButton(parent, IDialogConstants.CANCEL_ID, - IDialogLabelKeys.CANCEL_LABEL_KEY, false); + JFaceResources.getString(IDialogLabelKeys.CANCEL_LABEL_KEY), + false); updateButtons(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java index 487c75d4e71..7af0a3ee715 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java @@ -18,6 +18,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogLabelKeys; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.PopupDialog; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -143,9 +144,9 @@ public class ShowViewDialog extends Dialog implements */ protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, - IDialogLabelKeys.OK_LABEL_KEY, true); + JFaceResources.getString(IDialogLabelKeys.OK_LABEL_KEY), true); createButton(parent, IDialogConstants.CANCEL_ID, - IDialogLabelKeys.CANCEL_LABEL_KEY, false); + JFaceResources.getString(IDialogLabelKeys.CANCEL_LABEL_KEY), false); updateButtons(); } |