From ca00512f6d810a729bf26bc5ff4544099a5f4e09 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Tue, 13 Oct 2015 15:13:46 -0400 Subject: [PATCH] Bug 458771 - Cannot refresh an editor in standalone debugger -Add Refresh command to File menu. -Enable 'Refresh on Access' by default, like Eclipse for C/C++ package -Reorder the File menu a bit so that Exit is last Change-Id: I3636cd20da1a2523ca1574674cf6ebc59a124860 Signed-off-by: Marc-Andre Laperle (cherry picked from commit 803bf0db80a7352841f0caa4e35ea7e7ecbbc2c6) --- .../build.properties | 3 ++- .../plugin_customization.ini | 4 ++++ .../application/ApplicationActionBarAdvisor.java | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 debug/org.eclipse.cdt.debug.application/plugin_customization.ini diff --git a/debug/org.eclipse.cdt.debug.application/build.properties b/debug/org.eclipse.cdt.debug.application/build.properties index f1a1a6a63fc..1641833f33f 100644 --- a/debug/org.eclipse.cdt.debug.application/build.properties +++ b/debug/org.eclipse.cdt.debug.application/build.properties @@ -6,4 +6,5 @@ bin.includes = plugin.xml,\ plugin.properties,\ scripts/,\ about.html,\ - icons/ + icons/,\ + plugin_customization.ini diff --git a/debug/org.eclipse.cdt.debug.application/plugin_customization.ini b/debug/org.eclipse.cdt.debug.application/plugin_customization.ini new file mode 100644 index 00000000000..44bbad10fa0 --- /dev/null +++ b/debug/org.eclipse.cdt.debug.application/plugin_customization.ini @@ -0,0 +1,4 @@ +org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false + +# lightweight auto-refresh on access by default +org.eclipse.core.resources/refresh.lightweight.enabled=true diff --git a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationActionBarAdvisor.java b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationActionBarAdvisor.java index 33a0d5e032d..338dd0368ef 100644 --- a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationActionBarAdvisor.java +++ b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationActionBarAdvisor.java @@ -60,6 +60,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { private IWorkbenchAction undoAction; private IWorkbenchAction redoAction; + private IWorkbenchAction refreshAction; public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) { super(configurer); @@ -109,6 +110,9 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { redoAction = ActionFactory.REDO.create(window); register(redoAction); + refreshAction = ActionFactory.REFRESH.create(window); + register(refreshAction); + aboutAction = ActionFactory.ABOUT.create(window); aboutAction .setImageDescriptor(IDEInternalWorkbenchImages @@ -149,6 +153,15 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { menu.add(new Separator()); + // This is to make sure "Open File" gets added before Exit + menu.add(new GroupMarker(IWorkbenchActionConstants.NEW_EXT)); + + ActionContributionItem refreshExecutableItem = new ActionContributionItem(refreshAction); + menu.add(refreshExecutableItem); + + // This is to make sure "Convert line delimiters" gets added before Exit + menu.add(new GroupMarker(IWorkbenchActionConstants.SAVE_EXT)); + // If we're on OS X we shouldn't show this command in the File menu. It // should be invisible to the user. However, we should not remove it - // the carbon UI code will do a search through our menu structure @@ -156,6 +169,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { // application menu. ActionContributionItem quitItem = new ActionContributionItem(quitAction); quitItem.setVisible(!Util.isMac()); + menu.add(new Separator()); menu.add(quitItem); menu.add(new GroupMarker(IWorkbenchActionConstants.FILE_END)); return menu;