7:24 a.m.
Author: mareshkau
Date: 2010-11-02 08:24:36 -0400 (Tue, 02 Nov 2010)
New Revision: 26183
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.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-7383, configuration which allows select show action on
vpe toolbar, eather on main eclipse toolbar has been added
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-11-02
11:06:56 UTC (rev 26182)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-11-02
12:24:36 UTC (rev 26183)
@@ -21,6 +21,7 @@
static final String DEFAULT_VPE_TAB = "Default VPE Tab"; //$NON-NLS-1$
static final String VISUAL_SOURCE_EDITORS_SPLITTING = "Visual/Source Editors
Splitting"; //$NON-NLS-1$
static final String VISUAL_SOURCE_EDITORS_WEIGHTS = "Size of Visual Editor Pane
0-100%"; //$NON-NLS-1$
+ static final String SHOW_VISUAL_TOOLBAR = "Show VPE Toolbar"; //$NON-NLS-1$
static final String DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE = "0"; //$NON-NLS-1$
static final String DEFAULT_VPE_TAB_SOURCE_VALUE = "1"; //$NON-NLS-1$
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-11-02
11:06:56 UTC (rev 26182)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-11-02
12:24:36 UTC (rev 26183)
@@ -21,7 +21,7 @@
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) new
DefaultScope()).getNode(JspEditorPlugin.PLUGIN_ID);
-
+ defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_VISUAL_TOOLBAR, false);
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, true);
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, false);
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING, true);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-11-02 11:06:56 UTC (rev 26182)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-11-02 12:24:36 UTC (rev 26183)
@@ -164,19 +164,6 @@
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.jboss.tools.ui.vpe.editor">
- <or>
- <with variable="activeEditorId">
- <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
- </with>
- <with variable="activeEditorId">
- <equals
value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
- </with>
- <with variable="activeEditorId">
- <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
- </with>
- </or>
- </definition>
- <definition id="org.jboss.tools.ui.vpe.editor.invisibleByDefault">
<and>
<or>
<with variable="activeEditorId">
@@ -189,18 +176,15 @@
<equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
</with>
</or>
- <with
- variable="activeContexts">
- <iterate
- operator="or">
- <equals
-
value="org.jboss.tools.jst.jsp.toolbars.sampleToolbar">
- </equals>
- </iterate>
- </with>
+ <with
+ variable="selection">
+ <test
+
property="org.jboss.tools.vpe.showiconsonmaintoolbar">
+ </test>
+ </with>
</and>
</definition>
- </extension>
+ </extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
@@ -302,7 +286,7 @@
id="org.jboss.tools.vpe.toolbars.preferencesCommand"
tooltip="%vpe.toolbar.preferences">
<visibleWhen checkEnabled="false">
- <reference
definitionId="org.jboss.tools.ui.vpe.editor.invisibleByDefault"/>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
</visibleWhen>
</command>
<command
@@ -320,7 +304,7 @@
id="org.jboss.tools.vpe.toolbars.pageDesignOptionsCommand"
tooltip="%vpe.toolbar.page_design_options">
<visibleWhen checkEnabled="false">
- <reference
definitionId="org.jboss.tools.ui.vpe.editor.invisibleByDefault"/>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
</visibleWhen>
</command>
<command
@@ -338,7 +322,7 @@
id="org.jboss.tools.vpe.toolbars.showBorderCommand"
tooltip="%vpe.toolbar.show_border">
<visibleWhen checkEnabled="false">
- <reference
definitionId="org.jboss.tools.ui.vpe.editor.invisibleByDefault"/>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
</visibleWhen>
</command>
<command
@@ -348,7 +332,7 @@
id="org.jboss.tools.vpe.toolbars.showNonVisualTagsCommand"
tooltip="%vpe.toolbar.show_non_visual_tags">
<visibleWhen checkEnabled="false">
- <reference
definitionId="org.jboss.tools.ui.vpe.editor.invisibleByDefault"/>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
</visibleWhen>
</command>
<command
@@ -369,19 +353,11 @@
id="org.jboss.tools.vpe.toolbars.showBundleAsELCommand"
tooltip="%vpe.toolbar.show_bundle_as_el">
<visibleWhen checkEnabled="false">
- <reference
definitionId="org.jboss.tools.ui.vpe.editor.invisibleByDefault"/>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
</visibleWhen>
</command>
</menuContribution>
</extension>
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet label="%vpe.toolbar.name"
- description="Contains Vpe Configuration ToolBar Items"
- id="org.jboss.tools.jst.jsp.toolbars.sampleToolbar"
- visible="false">
- </actionSet>
- </extension>
<extension
point="org.eclipse.ui.exportWizards">
<wizard
@@ -433,4 +409,14 @@
class="org.jboss.tools.vpe.handlers.ShowBundleAsELHandler"
commandId="org.jboss.tools.vpe.commands.showBundleAsELCommand"/>
</extension>
+ <extension
+ point="org.eclipse.core.expressions.propertyTesters">
+ <propertyTester
+ class="org.jboss.tools.vpe.editor.toolbar.VPEPropertyTester"
+ id="org.jboss.tools.vpe.toolbar"
+ namespace="org.jboss.tools.vpe"
+ properties="showiconsonmaintoolbar"
+ type="java.lang.Object">
+ </propertyTester>
+ </extension>
</plugin>
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-02
11:06:56 UTC (rev 26182)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-02
12:24:36 UTC (rev 26183)
@@ -318,9 +318,9 @@
* Restore the state after switching from Preview, for example.
*/
// selectionBar.setVisible(selectionBar.getAlwaysVisibleOption());
- //added by Maksim Areshkau, here we remove Visual Page Editor Toolbar
// setVerticalToolbarVisible(true);
- setVerticalToolbarVisible(false);
+ setVerticalToolbarVisible(JspEditorPlugin.getDefault().getPreferenceStore()
+ .getBoolean(IVpePreferencesPage.SHOW_VISUAL_TOOLBAR));
/*
* Fixes https://jira.jboss.org/jira/browse/JBIDE-3140
* author Denis Maliarevich.
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-11-02
11:06:56 UTC (rev 26182)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-11-02
12:24:36 UTC (rev 26183)
@@ -55,6 +55,7 @@
private Group visualAppearanceGroup;
private Group confirmationGroup;
private Group tabsGroup;
+ private Group visualEditorToolbarGroup;
public VpePreferencesPage() {
super();
@@ -84,39 +85,46 @@
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
pageContainer.setLayout(layout);
pageContainer.setLayoutData(gd);
+
+ visualEditorToolbarGroup = createLayoutGroup(pageContainer, SWT.SHADOW_ETCHED_IN,
VpeUIMessages.VISUAL_EDITOR_TOOLBAR_BEHAVIOR);
- visualAppearanceGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
- visualAppearanceGroup
- .setText(VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE);
- layout = new GridLayout();
- layout.marginHeight = 10;
- layout.marginWidth = 10;
- layout.horizontalSpacing = 10;
- layout.verticalSpacing = 10;
- visualAppearanceGroup.setLayout(layout);
- gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
- visualAppearanceGroup.setLayoutData(gd);
+ visualAppearanceGroup = createLayoutGroup(pageContainer, SWT.SHADOW_ETCHED_IN,
VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE);
+// new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
+// visualAppearanceGroup
+// .setText(VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE);
+// layout = new GridLayout();
+// layout.marginHeight = 10;
+// layout.marginWidth = 10;
+// layout.horizontalSpacing = 10;
+// layout.verticalSpacing = 10;
+// visualAppearanceGroup.setLayout(layout);
+// gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
+// visualAppearanceGroup.setLayoutData(gd);
- confirmationGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
- confirmationGroup.setText(VpeUIMessages.CONFIRMATION_GROUP_TITLE);
- layout = new GridLayout();
- layout.marginHeight = 10;
- layout.marginWidth = 10;
- layout.horizontalSpacing = 10;
- layout.verticalSpacing = 10;
- confirmationGroup.setLayout(layout);
- gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
- confirmationGroup.setLayoutData(gd);
+ confirmationGroup = createLayoutGroup(pageContainer, SWT.SHADOW_ETCHED_IN,
VpeUIMessages.CONFIRMATION_GROUP_TITLE);
- tabsGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
- tabsGroup.setText(VpeUIMessages.TABS_GROUP_TITLE);
- layout = new GridLayout();
- layout.marginHeight = 10;
- layout.marginWidth = 10;
- tabsGroup.setLayout(layout);
- gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
- tabsGroup.setLayoutData(gd);
+// new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
+// confirmationGroup.setText(VpeUIMessages.CONFIRMATION_GROUP_TITLE);
+// layout = new GridLayout();
+// layout.marginHeight = 10;
+// layout.marginWidth = 10;
+// layout.horizontalSpacing = 10;
+// layout.verticalSpacing = 10;
+// confirmationGroup.setLayout(layout);
+// gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
+// confirmationGroup.setLayoutData(gd);
+ tabsGroup = createLayoutGroup(pageContainer, SWT.SHADOW_ETCHED_IN,
VpeUIMessages.TABS_GROUP_TITLE);
+
+// new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
+// tabsGroup.setText(VpeUIMessages.TABS_GROUP_TITLE);
+// layout = new GridLayout();
+// layout.marginHeight = 10;
+// layout.marginWidth = 10;
+// tabsGroup.setLayout(layout);
+// gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
+// tabsGroup.setLayoutData(gd);
+
createFieldEditors();
initialize();
checkState();
@@ -131,6 +139,9 @@
@Override
protected void createFieldEditors() {
+ addField(new BooleanFieldEditor(SHOW_VISUAL_TOOLBAR,
+ VpeUIMessages.SHOW_VPE_TOOLBAR,
+ visualEditorToolbarGroup));
addField(new BooleanFieldEditor(SHOW_BORDER_FOR_UNKNOWN_TAGS,
VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS,
visualAppearanceGroup));
@@ -193,5 +204,26 @@
public IPreferenceStore getPreferenceStore() {
return JspEditorPlugin.getDefault().getPreferenceStore();
}
-
+/**
+ * Creates a layout group for vpe preferencess
+ * @param parent
+ * @param style
+ * @param groupTitle
+ * @return layut grop for VPE Preferences
+ * @author mareshkau
+ */
+ private static Group createLayoutGroup(final Composite parent,final int style, final
String groupTitle){
+ Group prefGroup = new Group(parent, style);
+ prefGroup
+ .setText(groupTitle);
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 10;
+ layout.marginWidth = 10;
+ layout.horizontalSpacing = 10;
+ layout.verticalSpacing = 10;
+ prefGroup.setLayout(layout);
+ GridData gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
+ prefGroup.setLayoutData(gd);
+ return prefGroup;
+ }
}
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-02
11:06:56 UTC (rev 26182)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-11-02
12:24:36 UTC (rev 26183)
@@ -120,6 +120,8 @@
public static String INCLUDED_CSS_FILES_ABOUT;
public static String INCLUDED_TAG_LIBS_ABOUT;
public static String SUBSTITUTED_EL_EXPRESSIONS_ABOUT;
+ public static String VISUAL_EDITOR_TOOLBAR_BEHAVIOR;
+ public static String SHOW_VPE_TOOLBAR;
public static String GENERAL_TAB_TITLE;
public static String VPE_PREFERENCES_PAGE_DESCRIPTION;
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-02
11:06:56 UTC (rev 26182)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-11-02
12:24:36 UTC (rev 26183)
@@ -110,6 +110,7 @@
GENERAL_TAB_TITLE=General
VPE_PREFERENCES_PAGE_DESCRIPTION=Visual Page Editor settings
SHOW_BORDER_FOR_UNKNOWN_TAGS=Show border for unknown tags
+SHOW_VPE_TOOLBAR = Show VPE editor Action on VPE toolbar, otherwise they will be shown
on\n main eclipse toolbar
SHOW_SELECTION_TAG_BAR=Show selection tag bar
SHOW_TEXT_FORMATTING = Show text formatting bar
HIDE_TEXT_FORMATTING = Hide text formatting bar
@@ -122,6 +123,7 @@
VISUAL_SOURCE_EDITORS_SPLITTING=Visual/Source editors splitting
VISUAL_SOURCE_EDITORS_WEIGHTS=Size of the Visual Editor pane (0-100%)
VISUAL_APPEARANCE_GROUP_TITLE=Visual appearance
+VISUAL_EDITOR_TOOLBAR_BEHAVIOR=Visual Editor Toolbar Behavior
CONFIRMATION_GROUP_TITLE=Confirmation and details
TABS_GROUP_TITLE=Default tab, splitting and editor's weights to start VPE with