[jbosstools-commits] JBoss Tools SVN: r26565 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/menu and 1 other directories.

Author: dmaliarevich Date: 2010-11-15 11:15:16 -0500 (Mon, 15 Nov 2010) New Revision: 26565 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://jira.jboss.org/browse/JBIDE-7584 , context menu was fixed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties 2010-11-15 16:11:15 UTC (rev 26564) +++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.properties 2010-11-15 16:15:16 UTC (rev 26565) @@ -13,7 +13,7 @@ exportUserTagsTemplatesWizardDescription=Export User specified tag templates to the local file system importUserTagsTemplatesWizardName=User specified tag templates importUserTagsTemplatesWizardDescription=Import User specified tag templates from the local file system -vpe.menu.preferences=Vpe Preferences +vpe.menu.preferences=Visual Page Editor Preferences vpe.toolbar.preferences=Preferences vpe.toolbar.refresh=Refresh vpe.toolbar.page_design_options=Page Design Options @@ -22,4 +22,4 @@ vpe.toolbar.show_non_visual_tags=Show non-visual tags vpe.toolbar.show_text_formatting=Show text formatting bar vpe.toolbar.show_bundle_as_el=Show bundle's messages as EL expressions -vpe.toolbar.name=VPE Toolbar \ No newline at end of file +vpe.toolbar.name=Visual Page Editor Toolbar \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-11-15 16:11:15 UTC (rev 26564) +++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-11-15 16:15:16 UTC (rev 26565) @@ -117,46 +117,6 @@ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" contextId="org.jboss.tools.vpe.editorContext" sequence="M1+M2+Tab"/> - <key - commandId="org.jboss.tools.vpe.commands.preferencesCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+1"/> - <key - commandId="org.jboss.tools.vpe.commands.refreshCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+2"/> - <key - commandId="org.jboss.tools.vpe.commands.pageDesignOptionsCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+3"/> - <key - commandId="org.jboss.tools.vpe.commands.rotateEditorsCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+4"/> - <key - commandId="org.jboss.tools.vpe.commands.showBorderCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+5"/> - <key - commandId="org.jboss.tools.vpe.commands.showNonVisualTagsCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+6"/> - <key - commandId="org.jboss.tools.vpe.commands.showTextFormattingCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+7"/> - <key - commandId="org.jboss.tools.vpe.commands.showBundleAsELCommand" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - contextId="org.eclipse.ui.contexts.window" - sequence="M1+M2+8"/> </extension> <extension point="org.jboss.tools.jst.jsp.visulaEditorImplementations" id="org.jboss.tools.vpe.editor.VpeEditorPartFactory"> @@ -222,63 +182,6 @@ </dynamic> </menuContribution> <menuContribution - locationURI="popup:org.eclipse.ui.popup.any?after=additions"> - <separator - name="org.jboss.tools.separator.vpePrefs" visible="true" > - </separator> - <menu - id="org.jboss.tools.vpe.menus.VpePreferences" - label="%vpe.menu.preferences" - mnemonic="M"> - <command - commandId="org.jboss.tools.vpe.commands.preferencesCommand" - icon="icons/preferences.gif" - id="org.jboss.tools.vpe.menus.preferencesCommand" - mnemonic="S"/> - <command - commandId="org.jboss.tools.vpe.commands.refreshCommand" - icon="icons/refresh.gif" - id="org.jboss.tools.vpe.menus.refreshCommand" - mnemonic="S"/> - <command - commandId="org.jboss.tools.vpe.commands.pageDesignOptionsCommand" - icon="icons/point_to_css.gif" - id="org.jboss.tools.vpe.menus.pageDesignOptionsCommand" - mnemonic="S"/> - <command - commandId="org.jboss.tools.vpe.commands.rotateEditorsCommand" - id="org.jboss.tools.vpe.menus.rotateEditorsCommand" - mnemonic="S"/> - <command - commandId="org.jboss.tools.vpe.commands.showBorderCommand" - icon="icons/border.gif" - style="toggle" - id="org.jboss.tools.vpe.menus.showBorderCommand" - mnemonic="S"/> - <command - commandId="org.jboss.tools.vpe.commands.showNonVisualTagsCommand" - icon="icons/non-visual-tags.gif" - style="toggle" - id="org.jboss.tools.vpe.menus.showNonVisualTagsCommand" - mnemonic="S"/> - <command - commandId="org.jboss.tools.vpe.commands.showTextFormattingCommand" - icon="icons/text-formatting.gif" - style="toggle" - id="org.jboss.tools.vpe.menus.showTextFormattingCommand" - mnemonic="S"/> - <command - commandId="org.jboss.tools.vpe.commands.showBundleAsELCommand" - icon="icons/bundle-as-el.gif" - style="toggle" - id="org.jboss.tools.vpe.menus.showBundleAsELCommand" - mnemonic="S"/> - <visibleWhen checkEnabled="false"> - <reference definitionId="org.jboss.tools.ui.vpe.editor"/> - </visibleWhen> - </menu> - </menuContribution> - <menuContribution locationURI="toolbar:org.jboss.tools.jst.jsp.toolbars.sampleToolbar?after=org.jboss.tools.jst.jsp.toolbars.i18"> <command commandId="org.jboss.tools.vpe.commands.preferencesCommand" Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java 2010-11-15 16:11:15 UTC (rev 26564) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java 2010-11-15 16:15:16 UTC (rev 26565) @@ -13,12 +13,18 @@ import java.text.MessageFormat; import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IContributionItem; +import org.eclipse.jface.action.IMenuCreator; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.swt.events.HelpListener; +import org.eclipse.swt.widgets.Event; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.menus.IMenuService; @@ -35,6 +41,7 @@ import org.jboss.tools.vpe.editor.menu.action.SelectThisTagAction; import org.jboss.tools.vpe.editor.menu.action.StripTagAction; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; +import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage; import org.jboss.tools.vpe.editor.template.IZoomEventManager; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; @@ -95,8 +102,8 @@ menuManager.add(new InsertContributionItem(node)); addIfEnabled(new StripTagAction(node)); /* - * https://jira.jboss.org/browse/JBIDE-7222 Adding ExternalizeStrings - * dialog to the VPE context menu + * https://jira.jboss.org/browse/JBIDE-7222 + * Adding ExternalizeStrings dialog to the VPE context menu */ if (ExternalizeStringsUtils.isSelectionCorrect(vpeMenuUtil .getSelection())) { @@ -105,7 +112,22 @@ addSeparator(); if (topLevelMenu) { addZoomActions(); + addSeparator(); } + /* + * https://jira.jboss.org/browse/JBIDE-7584 + * Add Visual Page Editor Preferences Item to the context menu + */ + menuManager.add(new ActionContributionItem(new Action() { + @Override + public void run() { + VpeEditorPreferencesPage.openPreferenceDialog(); + } + @Override + public String getText() { + return VpeUIMessages.VPE_PREFERENCES_MENU_LABEL; + } + })); addSeparator(); if (topLevelMenu) { addIfEnabled(new DumpSourceAction()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-11-15 16:11:15 UTC (rev 26564) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-11-15 16:15:16 UTC (rev 26565) @@ -163,6 +163,5 @@ public static String LIST_IS_EMPTY; public static String COULD_NOT_OPEN_VPE_RESOURCES_DIALOG; - - + public static String VPE_PREFERENCES_MENU_LABEL; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-11-15 16:11:15 UTC (rev 26564) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-11-15 16:15:16 UTC (rev 26565) @@ -153,4 +153,5 @@ # Other messages CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=Cannot load taglibs from PageContext! -COULD_NOT_OPEN_VPE_RESOURCES_DIALOG=Could not open Vpe Resources Dialog! \ No newline at end of file +COULD_NOT_OPEN_VPE_RESOURCES_DIALOG=Could not open Vpe Resources Dialog! +VPE_PREFERENCES_MENU_LABEL=Preferences.. \ No newline at end of file