Author: dmaliarevich Date: 2010-11-17 13:02:16 -0500 (Wed, 17 Nov 2010) New Revision: 26683 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/messages/messages.properties Log: https://jira.jboss.org/browse/JBIDE-7475 , messages on the VPE preferences page were corrected. 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-17 17:10:04 UTC (rev 26682) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-11-17 18:02:16 UTC (rev 26683) @@ -86,45 +86,22 @@ pageContainer.setLayout(layout); pageContainer.setLayoutData(gd); - visualEditorToolbarGroup = createLayoutGroup(pageContainer, SWT.SHADOW_ETCHED_IN, VpeUIMessages.VISUAL_EDITOR_TOOLBAR_BEHAVIOR); + visualEditorToolbarGroup = createLayoutGroup(pageContainer, + SWT.SHADOW_ETCHED_IN, + VpeUIMessages.VISUAL_EDITOR_TOOLBAR_BEHAVIOR); + + visualAppearanceGroup = createLayoutGroup(pageContainer, + SWT.SHADOW_ETCHED_IN, + VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE); + + confirmationGroup = createLayoutGroup(pageContainer, + SWT.SHADOW_ETCHED_IN, + VpeUIMessages.CONFIRMATION_GROUP_TITLE); + + tabsGroup = createLayoutGroup(pageContainer, + SWT.SHADOW_ETCHED_IN, + VpeUIMessages.TABS_GROUP_TITLE); - 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 = createLayoutGroup(pageContainer, SWT.SHADOW_ETCHED_IN, VpeUIMessages.CONFIRMATION_GROUP_TITLE); - -// 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(); @@ -214,8 +191,7 @@ */ private static Group createLayoutGroup(final Composite parent,final int style, final String groupTitle){ Group prefGroup = new Group(parent, style); - prefGroup - .setText(groupTitle); + prefGroup.setText(groupTitle); GridLayout layout = new GridLayout(); layout.marginHeight = 10; layout.marginWidth = 10; 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-17 17:10:04 UTC (rev 26682) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-11-17 18:02:16 UTC (rev 26683) @@ -110,7 +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_VPE_TOOLBAR = Show toolbar within the editor (otherwise in Eclipse's toolbar) SHOW_SELECTION_TAG_BAR=Show selection tag bar SHOW_TEXT_FORMATTING = Show text formatting bar HIDE_TEXT_FORMATTING = Hide text formatting bar @@ -118,12 +118,12 @@ SHOW_BUNDLES_AS_EL=Show bundle's messages as EL expressions SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert -INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE=Inform when a project might not be configured properly for Visual Page Editor +INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE=Inform if the project is not configured properly to use Visual Page Editor DEFAULT_VPE_TAB=Select the default active editor's tab 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 +VISUAL_EDITOR_TOOLBAR_BEHAVIOR=Visual Page Editor toolbar behavior CONFIRMATION_GROUP_TITLE=Confirmation and details TABS_GROUP_TITLE=Default tab, splitting and editor's weights to start VPE with