diff options
author | Jean Michel-Lemieux | 2004-05-11 16:24:24 +0000 |
---|---|---|
committer | Jean Michel-Lemieux | 2004-05-11 16:24:24 +0000 |
commit | e6931f8e79254dbe238cca39f165516f5b5ee2d5 (patch) | |
tree | 97b06aab5bf88b2204263be7df296b0c7ec348ec | |
parent | 78792440193843e87fd588aeb248099e48f3ff65 (diff) | |
download | eclipse.platform.team-e6931f8e79254dbe238cca39f165516f5b5ee2d5.tar.gz eclipse.platform.team-e6931f8e79254dbe238cca39f165516f5b5ee2d5.tar.xz eclipse.platform.team-e6931f8e79254dbe238cca39f165516f5b5ee2d5.zip |
Moved yes/no/always/never dialog to use workbench message dialog with toggle.
5 files changed, 29 insertions, 41 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IPreferenceIds.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IPreferenceIds.java index 2a7a7adcf..caf8e836d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IPreferenceIds.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IPreferenceIds.java @@ -31,9 +31,6 @@ public interface IPreferenceIds { public static final String SYNCVIEW_DEFAULT_PERSPECTIVE = PREFIX + "syncview_default_perspective"; //$NON-NLS-1$ public static final String SYNCVIEW_DEFAULT_PERSPECTIVE_NONE = PREFIX + "sync_view_perspective_none"; //$NON-NLS-1$ public static final String SYNCHRONIZING_COMPLETE_PERSPECTIVE = PREFIX + "sychronizing_default_perspective_to_show"; //$NON-NLS-1$ - public static final String SYNCHRONIZING_COMPLETE_PERSPECTIVE_PROMPT = PREFIX + "sychronizing_default_perspective_to_show_prompt"; //$NON-NLS-1$ - public static final String SYNCHRONIZING_COMPLETE_PERSPECTIVE_ALWAYS = PREFIX + "sychronizing_default_perspective_to_show_always"; //$NON-NLS-1$ - public static final String SYNCHRONIZING_COMPLETE_PERSPECTIVE_NEVER = PREFIX + "sychronizing_default_perspective_to_show_never"; //$NON-NLS-1$ /* * Preference to save the last participant selected via the global synchronize action. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java index ee07b4622..d196efba4 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java @@ -17,6 +17,7 @@ import java.net.URL; import java.util.*; import org.eclipse.compare.structuremergeviewer.DiffNode; import org.eclipse.core.runtime.*; +import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; @@ -131,7 +132,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { store.setDefault(IPreferenceIds.SYNCVIEW_DEFAULT_PERSPECTIVE, TeamSynchronizingPerspective.ID); store.setDefault(IPreferenceIds.SYNCHRONIZING_DEFAULT_PARTICIPANT, GlobalRefreshAction.NO_DEFAULT_PARTICPANT); store.setDefault(IPreferenceIds.SYNCHRONIZING_DEFAULT_PARTICIPANT_SEC_ID, GlobalRefreshAction.NO_DEFAULT_PARTICPANT); - store.setDefault(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE, IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE_PROMPT); + store.setDefault(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE, MessageDialogWithToggle.PROMPT); store.setDefault(IPreferenceIds.SYNCVIEW_REMOVE_FROM_VIEW_NO_PROMPT, false); } @@ -278,13 +279,6 @@ public class TeamUIPlugin extends AbstractUIPlugin { createImageDescriptor(plugin, ISharedImages.IMG_ERROR_OVR, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_WARNING_OVR, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_HOURGLASS_OVR, baseURL); - - createImageDescriptor(plugin, ISharedImages.IMG_SYNC_VIEW, baseURL); - createImageDescriptor(plugin, ISharedImages.IMG_COMPARE_VIEW, baseURL); - - // Collapse all - createImageDescriptor(plugin, ISharedImages.IMG_COLLAPSE_ALL, baseURL); - createImageDescriptor(plugin, ISharedImages.IMG_COLLAPSE_ALL_ENABLED, baseURL); // Target Management Icons createImageDescriptor(plugin, ISharedImages.IMG_SITE_ELEMENT, baseURL); @@ -297,6 +291,8 @@ public class TeamUIPlugin extends AbstractUIPlugin { createImageDescriptor(plugin, ISharedImages.IMG_CHANGE_FILTER, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_IGNORE_WHITESPACE, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_CONTENTS, baseURL); + createImageDescriptor(plugin, ISharedImages.IMG_COLLAPSE_ALL, baseURL); + createImageDescriptor(plugin, ISharedImages.IMG_COLLAPSE_ALL_ENABLED, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_DLG_SYNC_INCOMING_DISABLED, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_DLG_SYNC_OUTGOING_DISABLED, baseURL); @@ -324,15 +320,14 @@ public class TeamUIPlugin extends AbstractUIPlugin { createImageDescriptor(plugin, ISharedImages.IMG_SYNC_MODE_RELEASE_ENABLED, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_SYNC_MODE_FREE_ENABLED, baseURL); - createImageDescriptor(plugin, ISharedImages.IMG_WIZBAN_SHARE, baseURL); - // Wizard banners createImageDescriptor(plugin, ISharedImages.IMG_PROJECTSET_IMPORT_BANNER, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_PROJECTSET_EXPORT_BANNER, baseURL); + createImageDescriptor(plugin, ISharedImages.IMG_WIZBAN_SHARE, baseURL); // Live Sync View icons createImageDescriptor(plugin, ISharedImages.IMG_COMPRESSED_FOLDER, baseURL); - createImageDescriptor(plugin, ISharedImages.IMG_WARNING, baseURL); + createImageDescriptor(plugin, ISharedImages.IMG_SYNC_VIEW, baseURL); createImageDescriptor(plugin, ISharedImages.IMG_HIERARCHICAL, baseURL); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties index 281357618..b915512b8 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties @@ -378,8 +378,7 @@ ParticipantCompareDialog.3=Do you want to save changes? RefreshCompleteDialog.21=Show only the latest new incoming changes RefreshCompleteDialog.22=Don't show this dialog again. SynchronizeManager.27=Confirm Perspective Switch -SynchronizeManager.28=Never -SynchronizeManager.29=Always +SynchronizeManager.31=&Remember my decision SynchronizeManager.30=Synchronization is associated with the {0} perspective. Do you want to switch to that perspective now? RefreshCompleteDialog.9=Changes RefreshSubscriberJob.2=Synchronizing {0} diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java index a618039e4..747029423 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/SyncViewerPreferencePage.java @@ -13,7 +13,9 @@ package org.eclipse.team.internal.ui.preferences; import java.text.Collator; import java.text.DateFormat; import java.util.*; + import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.preference.*; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; @@ -73,9 +75,9 @@ public class SyncViewerPreferencePage extends FieldEditorPreferencePage implemen synchronizePerspectiveSwitch= new RadioGroupFieldEditor(SYNCHRONIZING_COMPLETE_PERSPECTIVE, Policy.bind("SyncViewerPreferencePage.13"), 3, //$NON-NLS-1$ new String[][] { - {Policy.bind("SyncViewerPreferencePage.14"), SYNCHRONIZING_COMPLETE_PERSPECTIVE_ALWAYS}, //$NON-NLS-1$ - {Policy.bind("SyncViewerPreferencePage.42"), SYNCHRONIZING_COMPLETE_PERSPECTIVE_NEVER}, //$NON-NLS-1$ - {Policy.bind("SyncViewerPreferencePage.16"), SYNCHRONIZING_COMPLETE_PERSPECTIVE_PROMPT} //$NON-NLS-1$ + {Policy.bind("SyncViewerPreferencePage.14"), MessageDialogWithToggle.ALWAYS}, //$NON-NLS-1$ + {Policy.bind("SyncViewerPreferencePage.42"), MessageDialogWithToggle.NEVER}, //$NON-NLS-1$ + {Policy.bind("SyncViewerPreferencePage.16"), MessageDialogWithToggle.PROMPT} //$NON-NLS-1$ }, getFieldEditorParent(), true); addField(synchronizePerspectiveSwitch); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java index e971f40a4..cd0f467a2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java @@ -15,7 +15,8 @@ import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.dialogs.MessageDialogWithToggle; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.ListenerList; import org.eclipse.swt.widgets.Display; import org.eclipse.team.core.TeamException; @@ -464,16 +465,17 @@ public class SynchronizeManager implements ISynchronizeManager { */ private boolean promptForPerspectiveSwitch() { // Decide if a prompt is even required - String option = TeamUIPlugin.getPlugin().getPreferenceStore().getString(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE); - if(option.equals(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE_ALWAYS)) { + IPreferenceStore store = TeamUIPlugin.getPlugin().getPreferenceStore(); + String option = store.getString(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE); + if(option.equals(MessageDialogWithToggle.ALWAYS)) { return true; - } else if(option.equals(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE_NEVER)) { + } else if(option.equals(MessageDialogWithToggle.NEVER)) { return false; } // Otherwise determine if a prompt is required IPerspectiveRegistry registry= PlatformUI.getWorkbench().getPerspectiveRegistry(); - String defaultSyncPerspectiveId = TeamUIPlugin.getPlugin().getPreferenceStore().getString(IPreferenceIds.SYNCVIEW_DEFAULT_PERSPECTIVE); + String defaultSyncPerspectiveId = store.getString(IPreferenceIds.SYNCVIEW_DEFAULT_PERSPECTIVE); IPerspectiveDescriptor perspectiveDescriptor = registry.findPerspectiveWithId(defaultSyncPerspectiveId); IWorkbenchPage page = TeamUIPlugin.getActivePage(); if(page != null) { @@ -487,29 +489,22 @@ public class SynchronizeManager implements ISynchronizeManager { if(perspectiveDescriptor != null) { String perspectiveName = perspectiveDescriptor.getLabel(); - MessageDialog m = new MessageDialog(Display.getDefault().getActiveShell(), + MessageDialogWithToggle m = MessageDialogWithToggle.openYesNoQuestion(Display.getDefault().getActiveShell(), Policy.bind("SynchronizeManager.27"), //$NON-NLS-1$ - null, // accept the default window icon Policy.bind("SynchronizeManager.30", perspectiveDescriptor.getLabel()), //$NON-NLS-1$ - MessageDialog.QUESTION, - new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, Policy.bind("SynchronizeManager.29"), Policy.bind("SynchronizeManager.28")}, //$NON-NLS-1$ //$NON-NLS-2$ - 0); // yes is the default + Policy.bind("SynchronizeManager.31"), //$NON-NLS-1$ + false /* toggle state */, + store, + IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE); - int result = m.open(); + int result = m.getReturnCode(); switch (result) { - // yes - case 0 : + // yes, ok + case IDialogConstants.YES_ID: + case IDialogConstants.OK_ID : return true; // no - case 1 : - return false; - // always - case 2 : - TeamUIPlugin.getPlugin().getPreferenceStore().setValue(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE, IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE_ALWAYS); - return true; - // never - case 3 : - TeamUIPlugin.getPlugin().getPreferenceStore().setValue(IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE, IPreferenceIds.SYNCHRONIZING_COMPLETE_PERSPECTIVE_NEVER); + case IDialogConstants.NO_ID : return false; } } |