[jbosstools-commits] JBoss Tools SVN: r17813 - in trunk: vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons and 6 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Wed Sep 30 07:41:38 EDT 2009


Author: dmaliarevich
Date: 2009-09-30 07:41:36 -0400 (Wed, 30 Sep 2009)
New Revision: 17813

Added:
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-hide.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-show.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-hide.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-show.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-hide.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-show.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-hide.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-show.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_left.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_top.gif
Removed:
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_bottom.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_right.gif
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/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_left.gif
   trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_top.gif
   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/bundle/BundleMap.java
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.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/editor/toolbar/IVpeToolBarManager.java
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.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/jira/browse/JBIDE-4914, VPE toolbar icons were created instead of drop down menu.

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	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -15,6 +15,7 @@
 	static final String SHOW_BORDER_FOR_UNKNOWN_TAGS = "Show Border for Unknown Tags"; //$NON-NLS-1$
 	static final String SHOW_NON_VISUAL_TAGS = "Show non-visual tags"; //$NON-NLS-1$
 	static final String SHOW_SELECTION_TAG_BAR = "Show Selection Tag Bar"; //$NON-NLS-1$
+	static final String SHOW_TEXT_FORMATTING = "Show Text Formatting bar"; //$NON-NLS-1$
 	static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL = "Show Resource Bundles Usage as EL Expressions"; //$NON-NLS-1$
 	static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT = "Ask for tag attributes during tag insert"; //$NON-NLS-1$
 	static final String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR = "Ask for confirmation when closing Selection Bar"; //$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	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -24,7 +24,8 @@
 		
 		defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, false);
 		defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, false);
-		defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, false);
+		defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, true);
+		defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING, true);
 		defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, false);
 		defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, true);
 		defaultPreferences.putBoolean(IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, true);

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-hide.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-hide.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-show.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el-show.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-hide.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-hide.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-show.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags-show.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-hide.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-hide.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-show.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar-show.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_bottom.gif
===================================================================
(Binary files differ)

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_left.gif
===================================================================
(Binary files differ)

Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_right.gif
===================================================================
(Binary files differ)

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/source_top.gif
===================================================================
(Binary files differ)

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-hide.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-hide.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-show.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting-show.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_left.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_left.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_top.gif
===================================================================
(Binary files differ)


Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/visual_top.gif
___________________________________________________________________
Name: svn:mime-type
   + image/gif

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	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -898,7 +898,6 @@
 						VpeEditorPart.this));
 				selectionBar.setVpeController(visualEditor.getController());
 				visualEditor.getController().setSelectionBarController(selectionBar);
-				createShowSelectionBarMenuItem();
 				visualEditor.getController().init(sourceEditor, visualEditor);
 			}
 		});
@@ -907,36 +906,6 @@
 			visualEditor.createPartControl(visualContent);
 	}
 
-	/**
-	 * Creates new MenuItem in VPE drop-down menu. This menu item provides 
-	 * option to show/hide selection bar.
-	 */
-	private void createShowSelectionBarMenuItem() {
-		final MenuItem selectionBarVisibilityMenuItem = 
-				new MenuItem(visualEditor.getDropDownMenu().getDropDownMenu(), SWT.PUSH);
-
-		selectionBarVisibilityMenuItem.setText(selectionBar.isVisible() 
-				? VpeUIMessages.HIDE_SELECTION_BAR
-				: VpeUIMessages.SHOW_SELECTION_BAR);
-
-		// add menu item listener
-		selectionBarVisibilityMenuItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selectionBarVisible = !selectionBar.isVisible();
-				selectionBar.setAlwaysVisibleOption(selectionBarVisible);
-				selectionBar.setVisible(selectionBarVisible);
-			}
-		});
-		// add selection bar listener
-		selectionBar.addVisibilityListener(new VisibilityListener() {
-			public void visibilityChanged(VisibilityEvent event) {
-				selectionBarVisibilityMenuItem.setText(event.getSource().isVisible() 
-						? VpeUIMessages.HIDE_SELECTION_BAR
-						: VpeUIMessages.SHOW_SELECTION_BAR);	
-			}
-		});
-	}
-
 	public void createPreviewBrowser() {
 		previewWebBrowser = new MozillaPreview(this, sourceEditor);
 		try {
@@ -1190,6 +1159,10 @@
 	 * has been pressed.
 	 */
 	public void updatePartAccordingToPreferences() {
+		/*
+		 * Update MozillaEditor's toolbar items
+		 */
+		visualEditor.setDefaultToolBarItems();
 		 /*
 		  * When switching from Source view to Visual/Source
 		  * controller could be null.
@@ -1204,4 +1177,13 @@
 		}
 	}
 	
+	public void updateSelectionBar(boolean isSelectionBarVisible) {
+		if (selectionBar != null) {
+			selectionBar.setAlwaysVisibleOption(isSelectionBarVisible);
+			selectionBar.setVisible(isSelectionBarVisible);
+		} else {
+			VpePlugin.getDefault().logError("VPE Selection Bar is not initialized.");
+		}
+	}
+	
 }

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -358,7 +358,9 @@
 	}
 	
 	public String getBundleValue(String name){
-		if(isShowBundleUsageAsEL) return name;
+		if(isShowBundleUsageAsEL) {
+			return name;
+		}
 		List<ELInstance> is = parseJSFExpression(name);
 		if(is == null) return null;
 		StringBuffer sb = new StringBuffer();
@@ -463,14 +465,16 @@
 		}
 	}
 	
-	public void updateShowBundleUsageAsEL() {
-		boolean b = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
-				IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL);
-		if(isShowBundleUsageAsEL != b) {
-			isShowBundleUsageAsEL = b;
+	public void updateShowBundleUsageAsEL(boolean showBundlesAsEL) {
+		if(isShowBundleUsageAsEL != showBundlesAsEL) {
+			isShowBundleUsageAsEL = showBundlesAsEL;
 			refresh();
 		}	
 	}
+	public void updateShowBundleUsageAsEL() {
+		updateShowBundleUsageAsEL(JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+				IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL));
+	}
 	
 	static class Expression {
 		public String prefix;

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -32,16 +32,11 @@
 import org.eclipse.swt.browser.ProgressEvent;
 import org.eclipse.swt.browser.ProgressListener;
 import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -50,8 +45,6 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.IEditorInput;
@@ -74,12 +67,10 @@
 import org.jboss.tools.vpe.editor.toolbar.VpeToolBarManager;
 import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
 import org.jboss.tools.vpe.editor.toolbar.format.TextFormattingToolBar;
-import org.jboss.tools.vpe.editor.util.Constants;
 import org.jboss.tools.vpe.editor.util.DocTypeUtil;
 import org.jboss.tools.vpe.editor.util.FileUtil;
 import org.jboss.tools.vpe.editor.util.HTML;
 import org.jboss.tools.vpe.messages.VpeUIMessages;
-import org.jboss.tools.vpe.resref.core.ReferenceWizard;
 import org.jboss.tools.vpe.resref.core.VpeResourcesDialog;
 import org.jboss.tools.vpe.xulrunner.XPCOM;
 import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
@@ -111,9 +102,17 @@
 	public static final String ICON_PAGE_DESIGN_OPTIONS_DISABLED = "icons/point_to_css_disabled.gif"; //$NON-NLS-1$
 	public static final String ICON_ORIENTATION_SOURCE_LEFT = "icons/source_left.gif"; //$NON-NLS-1$
 	public static final String ICON_ORIENTATION_SOURCE_TOP = "icons/source_top.gif"; //$NON-NLS-1$
-	public static final String ICON_ORIENTATION_SOURCE_RIGHT = "icons/source_right.gif"; //$NON-NLS-1$
-	public static final String ICON_ORIENTATION_SOURCE_BOTTOM = "icons/source_bottom.gif"; //$NON-NLS-1$
+	public static final String ICON_ORIENTATION_VISUAL_LEFT = "icons/visual_left.gif"; //$NON-NLS-1$
+	public static final String ICON_ORIENTATION_VISUAI_TOP = "icons/visual_top.gif"; //$NON-NLS-1$
 	public static final String ICON_ORIENTATION_SOURCE_LEFT_DISABLED = "icons/source_left_disabled.gif"; //$NON-NLS-1$
+	public static final String ICON_NON_VISUAL_TAGS_SHOW = "icons/non-visusal-tags-show.gif"; //$NON-NLS-1$
+	public static final String ICON_NON_VISUAL_TAGS_HIDE = "icons/non-visusal-tags-hide.gif"; //$NON-NLS-1$
+	public static final String ICON_SELECTION_BAR_SHOW = "icons/selbar-show.gif"; //$NON-NLS-1$
+	public static final String ICON_SELECTION_BAR_HIDE = "icons/selbar-hide.gif"; //$NON-NLS-1$
+	public static final String ICON_TEXT_FORMATTING_SHOW = "icons/text-formatting-show.gif"; //$NON-NLS-1$
+	public static final String ICON_TEXT_FORMATTING_HIDE = "icons/text-formatting-hide.gif"; //$NON-NLS-1$
+	public static final String ICON_BUNDLE_AS_EL_SHOW = "icons/bundle-as-el-show.gif"; //$NON-NLS-1$
+	public static final String ICON_BUNDLE_AS_EL_HIDE = "icons/bundle-as-el-hide.gif"; //$NON-NLS-1$
 
 	static String SELECT_BAR = "SELECT_LBAR"; //$NON-NLS-1$
 	private XulRunnerEditor xulRunnerEditor;
@@ -135,12 +134,27 @@
 	private static Map<String, String> layoutNames;
 	private static List<String> layoutValues;
 	private int currentOrientationIndex = 1;
+	private ToolItem rotateEditorsItem;
+	private ToolItem showNonVisualTagsItem;
+	private ToolItem showSelectionBarItem;
+	private ToolItem showBundlesAsELItem;
+	private ToolItem showTextFormattingItem;
+	private boolean showNonVisualTags = false;
+	private boolean showSelectionBar = true;
+	private boolean showTextFormatting = true;
+	private boolean showBundlesAsEL = false;
+	
 	static {
+		/*
+		 * Values from <code>layoutValues</code> should correspond to the order
+		 * when increasing the index of the array will cause 
+		 * the source editor rotation 
+		 */
 	    layoutIcons = new HashMap<String, String>();
 	    layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE, ICON_ORIENTATION_SOURCE_LEFT);
 	    layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE, ICON_ORIENTATION_SOURCE_TOP);
-	    layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE, ICON_ORIENTATION_SOURCE_RIGHT);
-	    layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, ICON_ORIENTATION_SOURCE_BOTTOM);
+	    layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE, ICON_ORIENTATION_VISUAL_LEFT);
+	    layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, ICON_ORIENTATION_VISUAI_TOP);
 	    
 	    layoutNames = new HashMap<String, String>();
 	    layoutNames.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE, VpeUIMessages.SPLITTING_HORIZ_LEFT_SOURCE);
@@ -263,46 +277,25 @@
 		});
 
 		/*
-		 * https://jira.jboss.org/jira/browse/JBIDE-4152
-		 * Compute initial icon state and add it to the tool bar.
+		 * Create ROTATE EDITORS tool bar icon
 		 */
-		currentOrientationIndex = layoutValues.indexOf(JspEditorPlugin
-				.getDefault().getPreferenceStore().getString(
-						IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING));
-		int newIndx = currentOrientationIndex+1;
-		if (newIndx == layoutValues.size()) {
-		    newIndx = newIndx % layoutValues.size();
-		}
-		String newOrientation = layoutValues.get(newIndx);
-
-		final ToolItem rotateEditorsItem = createToolItem(verBar, SWT.BUTTON1,
-				layoutIcons.get(newOrientation),
-				ICON_ORIENTATION_SOURCE_LEFT_DISABLED, 
-				layoutNames.get(newOrientation), true);
+		createRotateEditorsItem(verBar);
 		
-		rotateEditorsItem.addListener(SWT.Selection, new Listener() {
-		    public void handleEvent(Event event) {
-				/*
-				 * Rotate editors orientation clockwise. Store this new
-				 * orientation to the preferences.
-				 */
-		    	currentOrientationIndex++;
-				if (currentOrientationIndex == layoutValues.size()) {
-					currentOrientationIndex = currentOrientationIndex % layoutValues.size();
-				}
-				String newOrientation = layoutValues.get(currentOrientationIndex);
-				rotateEditorsItem.setImage(ImageDescriptor.createFromFile(
-						MozillaEditor.class, layoutIcons.get(newOrientation))
-						.createImage());
-				rotateEditorsItem.setToolTipText(layoutNames.get(newOrientation));
-				/*
-				 * Call <code>filContainer()</code> from VpeEditorPart
-				 * to redraw CustomSashForm with new layout.
-				 */
-				getController().getPageContext().getEditPart().fillContainer(true, newOrientation);
-		    }
-		});
+		/*
+		 * Create SHOW INVISIBLE TAGS tool bar icon
+		 */
+		createShowNonVisualTagsItem(verBar);
 		
+		/*
+		 * Create SHOW SELECTION BAR tool bar icon
+		 */
+		createShowSelectionBarItem(verBar);
+		
+		/*
+		 * Create SHOW BUNDLE'S MESSAGES AS EL tool bar icon
+		 */
+		createShowBundlesAsELItem(verBar);
+		
 		verBar.pack();
 		return verBar;
 	}
@@ -352,53 +345,19 @@
 		 *  and only after that MozillaEditor should be created itself. 
 		 */
 		if (null != verBar) {
-			dropDownMenu = new VpeDropDownMenu(verBar, VpeUIMessages.MENU); 
-			// add Invisible tags support to menu
-			// create menu item
-			MenuItem menuItem = new MenuItem(dropDownMenu.getDropDownMenu(), SWT.PUSH);
-			// get default value of flag
-			boolean showInvisibleTags = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
-					IVpePreferencesPage.SHOW_NON_VISUAL_TAGS);
-			
-			// set text
-			menuItem.setText(showInvisibleTags ? VpeUIMessages.HIDE_NON_VISUAL_TAGS
-					: VpeUIMessages.SHOW_NON_VISUAL_TAGS);
-			
-			// add listener
-			menuItem.addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					MenuItem selectedItem = (MenuItem) e.widget;
-					
-					// get current value of flag
-					boolean showInvisibleTags = !controller.getVisualBuilder()
-					.isShowInvisibleTags();
-					
-					// change text
-					selectedItem
-					.setText((showInvisibleTags ? VpeUIMessages.HIDE
-							: VpeUIMessages.SHOW)
-							+ Constants.WHITE_SPACE
-							+ VpeUIMessages.NON_VISUAL_TAGS);
-					
-					// change flag
-					controller.getVisualBuilder().setShowInvisibleTags(
-							showInvisibleTags);
-					// update vpe
-					controller.visualRefresh();
-				}
-			});
 			// Use vpeToolBarManager to create a horizontal toolbar.
-			vpeToolBarManager = new VpeToolBarManager(dropDownMenu
-					.getDropDownMenu());
+			vpeToolBarManager = new VpeToolBarManager();
 			if (vpeToolBarManager != null) {
 				vpeToolBarManager.createToolBarComposite(cmpEdTl);
 				vpeToolBarManager.addToolBar(new TextFormattingToolBar(formatControllerManager));
+				
+				/*
+				 * Create SHOW TEXT FORMATTING tool bar icon
+				 */
+				createShowTextFormattingItem(verBar);
 			}
 		}
 
-		
-		
 		//Create a composite to the Editor
 		Composite cmpEd = new Composite (cmpEdTl, SWT.NATIVE);
 		GridLayout layoutEd = new GridLayout(1, false);
@@ -987,4 +946,228 @@
 	public VpeDropDownMenu getDropDownMenu() {
 		return dropDownMenu;
 	}
+	
+	private void createShowNonVisualTagsItem(ToolBar parent) {
+		showNonVisualTags = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+				IVpePreferencesPage.SHOW_NON_VISUAL_TAGS);
+		 showNonVisualTagsItem = createToolItem(parent, SWT.BUTTON1,
+				showNonVisualTags ? ICON_NON_VISUAL_TAGS_SHOW
+						: ICON_NON_VISUAL_TAGS_HIDE, "", //$NON-NLS-1$
+				showNonVisualTags ? VpeUIMessages.SHOW_NON_VISUAL_TAGS
+						: VpeUIMessages.HIDE_NON_VISUAL_TAGS, true);
+		showNonVisualTagsItem.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event event) {
+				/*
+				 * Switch the value
+				 */
+				showNonVisualTags = !showNonVisualTags;
+				
+				/*
+				 * Update icon and tooltip
+				 */
+				updateShowNonVisualTagsItem(showNonVisualTags);
+				/*
+				 * Change flag
+				 */
+				controller.getVisualBuilder().setShowInvisibleTags(
+						showNonVisualTags);
+				/*
+				 * Update VPE
+				 */
+				controller.visualRefresh();
+			}
+		});
+	}
+	
+	private void updateShowNonVisualTagsItem(boolean showInvisibleTags) {
+		showNonVisualTagsItem.setImage(ImageDescriptor.createFromFile(
+				MozillaEditor.class,
+				showInvisibleTags ? ICON_NON_VISUAL_TAGS_SHOW
+						: ICON_NON_VISUAL_TAGS_HIDE).createImage());
+		showNonVisualTagsItem.setToolTipText(showInvisibleTags ? VpeUIMessages.SHOW_NON_VISUAL_TAGS
+				: VpeUIMessages.HIDE_NON_VISUAL_TAGS);
+	}
+	
+	private void createShowSelectionBarItem(ToolBar parent) {
+		showSelectionBar = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+				IVpePreferencesPage.SHOW_SELECTION_TAG_BAR);
+		showSelectionBarItem = createToolItem(parent, SWT.BUTTON1, 
+				showSelectionBar ? ICON_SELECTION_BAR_SHOW
+						: ICON_SELECTION_BAR_HIDE, "", //$NON-NLS-1$
+				showSelectionBar ? VpeUIMessages.SHOW_SELECTION_BAR
+						: VpeUIMessages.HIDE_SELECTION_BAR, true);
+		showSelectionBarItem.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event event) {
+				/*
+				 * Switch the value
+				 */
+				showSelectionBar = !showSelectionBar;
+				/*
+				 * Update icon and tooltip
+				 */
+				updateShowSelectionBarItem(showSelectionBar);
+				
+				/*
+				 * Update Selection Bar 
+				 */
+				controller.getPageContext().getEditPart().updateSelectionBar(showSelectionBar);
+			}
+		});
+	}
+	
+	private void updateShowSelectionBarItem(boolean showSelectionBar) {
+		showSelectionBarItem.setImage(ImageDescriptor.createFromFile(
+				MozillaEditor.class,
+				showSelectionBar ? ICON_SELECTION_BAR_SHOW
+						: ICON_SELECTION_BAR_HIDE).createImage());
+		showSelectionBarItem
+				.setToolTipText(showSelectionBar ? VpeUIMessages.SHOW_SELECTION_BAR
+						: VpeUIMessages.HIDE_SELECTION_BAR);
+	}
+	
+	private void createShowBundlesAsELItem(ToolBar parent) {
+		showBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+				IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL);
+		showBundlesAsELItem = createToolItem(parent, SWT.BUTTON1,
+				showBundlesAsEL ? ICON_BUNDLE_AS_EL_SHOW
+						: ICON_BUNDLE_AS_EL_HIDE, "", //$NON-NLS-1$
+				showBundlesAsEL ? VpeUIMessages.SHOW_BUNDLES_AS_EL
+						: VpeUIMessages.SHOW_BUNDLES_AS_MESSAGES, true);
+		showBundlesAsELItem.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event event) {
+				/*
+				 * Switch the value
+				 */
+				showBundlesAsEL = !showBundlesAsEL;
+				/*
+				 * Update icon and tooltip
+				 */
+				updateShowBundlesAsELItem(showBundlesAsEL);
+				
+				/*
+				 * Update bundle messages. 
+				 */
+				controller.getPageContext().getBundle().updateShowBundleUsageAsEL(showBundlesAsEL);
+				controller.visualRefresh();
+			}
+		});
+	}
+	
+	private void updateShowBundlesAsELItem(boolean showBundlesAsEL) {
+		showBundlesAsELItem.setImage(ImageDescriptor.createFromFile(
+				MozillaEditor.class,
+				showBundlesAsEL ? ICON_BUNDLE_AS_EL_SHOW
+						: ICON_BUNDLE_AS_EL_HIDE).createImage());
+		showBundlesAsELItem
+				.setToolTipText(showBundlesAsEL ? VpeUIMessages.SHOW_BUNDLES_AS_EL
+						: VpeUIMessages.SHOW_BUNDLES_AS_MESSAGES);
+	}
+	
+	private void createShowTextFormattingItem(ToolBar parent) {
+		showTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+				IVpePreferencesPage.SHOW_TEXT_FORMATTING);
+		showTextFormattingItem = createToolItem(parent,
+				SWT.BUTTON1,
+				showTextFormatting ? ICON_TEXT_FORMATTING_SHOW
+						: ICON_TEXT_FORMATTING_HIDE, "", //$NON-NLS-1$
+						showTextFormatting ? VpeUIMessages.SHOW_TEXT_FORMATTING
+								: VpeUIMessages.HIDE_TEXT_FORMATTING, true);
+		showTextFormattingItem.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event event) {
+				/*
+				 * Switch the value
+				 */
+				showTextFormatting = !showTextFormatting;
+				
+				/*
+				 * Update icon and tooltip
+				 */
+				updateShowTextFormattingItem(showTextFormatting);
+				
+				/*
+				 * Update Text Formatting Bar 
+				 */
+				vpeToolBarManager.setToolbarVisibility(showTextFormatting);
+			}
+		});
+	}
+	
+	private void updateShowTextFormattingItem(boolean showTextFormatting) {
+		showTextFormattingItem.setImage(ImageDescriptor.createFromFile(
+				MozillaEditor.class,
+				showTextFormatting ? ICON_TEXT_FORMATTING_SHOW
+						: ICON_TEXT_FORMATTING_HIDE).createImage());
+		showTextFormattingItem
+				.setToolTipText(showTextFormatting ? VpeUIMessages.SHOW_TEXT_FORMATTING
+						: VpeUIMessages.HIDE_TEXT_FORMATTING);
+	}
+	
+	private void createRotateEditorsItem(ToolBar parent) {
+		/*
+		 * https://jira.jboss.org/jira/browse/JBIDE-4152
+		 * Compute initial icon state and add it to the tool bar.
+		 */
+		String newOrientation = JspEditorPlugin
+		.getDefault().getPreferenceStore().getString(
+				IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING);
+		currentOrientationIndex = layoutValues.indexOf(newOrientation);
+		rotateEditorsItem = createToolItem(parent, SWT.BUTTON1,
+				layoutIcons.get(newOrientation),
+				ICON_ORIENTATION_SOURCE_LEFT_DISABLED, 
+				layoutNames.get(newOrientation), true);
+		
+		rotateEditorsItem.addListener(SWT.Selection, new Listener() {
+		    public void handleEvent(Event event) {
+				/*
+				 * Rotate editors orientation clockwise.
+				 */
+		    	currentOrientationIndex++;
+				if (currentOrientationIndex >= layoutValues.size()) {
+					currentOrientationIndex = currentOrientationIndex % layoutValues.size();
+				}
+				String newOrientation = layoutValues.get(currentOrientationIndex);
+				/*
+				 * Update icon and tooltip
+				 */
+				updateRotateEditorsItem(newOrientation);
+				/*
+				 * Call <code>filContainer()</code> from VpeEditorPart
+				 * to redraw CustomSashForm with new layout.
+				 */
+				getController().getPageContext().getEditPart().fillContainer(true, newOrientation);
+		    }
+		});
+	}
+	
+	private void updateRotateEditorsItem(String newOrientation) {
+		rotateEditorsItem.setImage(ImageDescriptor.createFromFile(
+				MozillaEditor.class, layoutIcons.get(newOrientation))
+				.createImage());
+		rotateEditorsItem.setToolTipText(layoutNames.get(newOrientation));
+	}
+
+	public void setDefaultToolBarItems() {
+		String newOrientation = JspEditorPlugin
+		.getDefault().getPreferenceStore().getString(
+				IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING);
+		currentOrientationIndex = layoutValues.indexOf(newOrientation);
+		updateRotateEditorsItem(newOrientation);
+		
+		showNonVisualTags = JspEditorPlugin.getDefault().getPreferenceStore()
+				.getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS);
+		updateShowNonVisualTagsItem(showNonVisualTags);
+		
+		showSelectionBar = JspEditorPlugin.getDefault().getPreferenceStore()
+				.getBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR);
+		updateShowSelectionBarItem(showSelectionBar);
+		
+		showBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore()
+				.getBoolean(
+						IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL);
+		updateShowBundlesAsELItem(showBundlesAsEL);
+		
+		showTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore()
+				.getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING);
+		updateShowTextFormattingItem(showTextFormatting);
+	}
 }

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	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -136,6 +136,8 @@
 				VpeUIMessages.SHOW_NON_VISUAL_TAGS, visualAppearanceGroup));
 		addField(new BooleanFieldEditor(SHOW_SELECTION_TAG_BAR,
 				VpeUIMessages.SHOW_SELECTION_TAG_BAR, visualAppearanceGroup));
+		addField(new BooleanFieldEditor(SHOW_TEXT_FORMATTING,
+				VpeUIMessages.SHOW_TEXT_FORMATTING, visualAppearanceGroup));
 		addField(new BooleanFieldEditor(SHOW_RESOURCE_BUNDLES_USAGE_AS_EL,
 				VpeUIMessages.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, visualAppearanceGroup));
 		addField(new BooleanFieldEditor(ASK_TAG_ATTRIBUTES_ON_TAG_INSERT,

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/IVpeToolBarManager.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -35,5 +35,10 @@
 	 */
 	public void addToolBar(IVpeToolBar bar);
 
+	/*
+	 * Sets the toolbar visibility
+	 */
+	 void setToolbarVisibility(boolean isVisible);
+	
 	public void dispose();
 }
\ No newline at end of file

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -10,12 +10,9 @@
  ******************************************************************************/
 package org.jboss.tools.vpe.editor.toolbar;
 
-import java.text.MessageFormat;
 
 import org.eclipse.compare.Splitter;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
@@ -23,11 +20,9 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
+import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
 import org.jboss.tools.vpe.VpePlugin;
-import org.jboss.tools.vpe.messages.VpeUIMessages;
 
 /**
  * @author Erick Created on 14.07.2005
@@ -36,17 +31,10 @@
 public class VpeToolBarManager implements IVpeToolBarManager {
 
 	private Splitter splitter;
+	private Composite cmpToolBar;
 
-	private Menu dropDownMenu;
+	public VpeToolBarManager() { }
 
-	public static final String SHOW = "show"; //$NON-NLS-1$
-	public static final String HIDE = "hide"; //$NON-NLS-1$
-
-	public VpeToolBarManager(Menu dropDownMenu) {
-
-		this.dropDownMenu = dropDownMenu;
-	}
-
 	public Composite createToolBarComposite(Composite parent) {
 		splitter = new Splitter(parent, SWT.NONE) {
 
@@ -71,7 +59,7 @@
 
 	public void addToolBar(IVpeToolBar bar) {
 
-		Composite cmpToolBar = new Composite(splitter, SWT.NONE);
+		cmpToolBar = new Composite(splitter, SWT.NONE);
 		FormData data = new FormData();
 		data.left = new FormAttachment(0);
 		data.right = new FormAttachment(100);
@@ -93,43 +81,20 @@
 		ToolbarContainer toolbarContainer = new ToolbarContainer(cmpToolBar, bar);
 
 		// show or hide toolbar
-		setStateToolbar(cmpToolBar, isShowedToolbar(bar));
+		setStateToolbar(cmpToolBar, JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+				IVpePreferencesPage.SHOW_TEXT_FORMATTING));
 
-		// create item to manage show/hide toolbar
-		attachToMenu(dropDownMenu, toolbarContainer);
 	}
 
-	/**
-	 * create item to manage show/hide toolbar
-	 * 
-	 * @param menu
-	 * @param toolbarContainer
-	 */
-	public void attachToMenu(Menu menu, ToolbarContainer toolbarContainer) {
-		MenuItem menuItem = new MenuItem(dropDownMenu, SWT.PUSH);
-
-		boolean showToolbar = isShowedToolbar(toolbarContainer.getToolbar());
-
-		// set text to menu item
-		menuItem.setText(
-				MessageFormat.format((showToolbar ? VpeUIMessages.HIDE_TOOLBAR : VpeUIMessages.SHOW_TOOLBAR),
-						toolbarContainer.getToolbar().getName()));
-
-		// add listener
-		menuItem.addSelectionListener(
-				new ToolbarManagerSelectionListener(toolbarContainer, showToolbar));
+	public void setToolbarVisibility(boolean isVisible) {
+		if (cmpToolBar != null) {
+			setStateToolbar(cmpToolBar, isVisible);
+		} else {
+			VpePlugin.getDefault().logError("Toolbar control is not initialized.");
+		}
 	}
 
 	/**
-	 * 
-	 * @param bar
-	 * @return
-	 */
-	protected boolean isShowedToolbar(IVpeToolBar bar) {
-		return !HIDE.equalsIgnoreCase(getPreference(bar.getId()));
-	}
-
-	/**
 	 * show/hide toolbar
 	 * 
 	 * @param toolBar
@@ -145,73 +110,8 @@
 			splitter.dispose();
 			splitter = null;
 		}
-
-		for (MenuItem menuItem : dropDownMenu.getItems()) {
-			menuItem.dispose();
-		}
-
 	}
 
-	/**
-	 * get preference by key
-	 * 
-	 * @param key
-	 * @return
-	 */
-	private String getPreference(String key) {
-
-		return VpePlugin.getDefault().getPreferenceStore().getString(key);
-	}
-
-	/**
-	 * set preference
-	 * 
-	 * @param key
-	 * @param value
-	 */
-	private void setPreference(String key, String value) {
-
-		VpePlugin.getDefault().getPreferenceStore().setValue(key, value);
-	}
-
-	/**
-	 * selection listener to manage toolbars
-	 * 
-	 * @author Sergey Dzmitrovich
-	 * 
-	 */
-	private class ToolbarManagerSelectionListener extends SelectionAdapter {
-
-		private ToolbarContainer toolbarContainer;
-		private boolean showBar;
-
-		public ToolbarManagerSelectionListener(
-				ToolbarContainer toolbarContainer, boolean showBar) {
-			this.toolbarContainer = toolbarContainer;
-			this.showBar = showBar;
-		}
-
-		@Override
-		public void widgetSelected(SelectionEvent e) {
-			MenuItem selectedItem = (MenuItem) e.widget;
-
-			// change flag
-			showBar = !showBar;
-
-			// set new value of preference 
-			setPreference(toolbarContainer.getToolbar().getId(), 
-					showBar ? SHOW : HIDE);
-			// change text
-			selectedItem.setText(
-					MessageFormat.format(showBar ? VpeUIMessages.HIDE_TOOLBAR 
-												 : VpeUIMessages.SHOW_TOOLBAR,
-										 toolbarContainer.getToolbar().getName())
-								 );
-			// show or hide toolbar
-			setStateToolbar(toolbarContainer.getParent(), showBar);
-		}
-	}
-
 	/*
 	 * This class describe the container for toolbars
 	 */

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	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java	2009-09-30 11:41:36 UTC (rev 17813)
@@ -118,7 +118,11 @@
 	public static String VPE_PREFERENCES_PAGE_DESCRIPTION;
 	public static String SHOW_BORDER_FOR_UNKNOWN_TAGS;
 	public static String SHOW_SELECTION_TAG_BAR;
+	public static String SHOW_TEXT_FORMATTING;
+	public static String HIDE_TEXT_FORMATTING;
 	public static String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL;
+	public static String SHOW_BUNDLES_AS_EL;
+	public static String SHOW_BUNDLES_AS_MESSAGES;
 	public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT;
 	public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR;
 	public static String DEFAULT_VPE_TAB;

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	2009-09-30 10:09:05 UTC (rev 17812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties	2009-09-30 11:41:36 UTC (rev 17813)
@@ -98,7 +98,11 @@
 VPE_PREFERENCES_PAGE_DESCRIPTION=Visual Page Editor settings
 SHOW_BORDER_FOR_UNKNOWN_TAGS=Show border for unknown tags
 SHOW_SELECTION_TAG_BAR=Show selection tag bar
+SHOW_TEXT_FORMATTING = Show Text Formatting bar
+HIDE_TEXT_FORMATTING = Hide Text Formatting bar
 SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=Show resource bundles usage as EL expressions
+SHOW_BUNDLES_AS_EL=Show bundle's messages as EL
+SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly
 ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert
 ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=Ask for confirmation when closing Selection Bar
 DEFAULT_VPE_TAB=Select the default active editor's tab for files that haven't been previously opened in the VPE



More information about the jbosstools-commits mailing list