2:33 a.m.
Author: dmaliarevich
Date: 2009-04-21 03:33:28 -0400 (Tue, 21 Apr 2009)
New Revision: 14831
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/RadioArrayFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model-attrs.properties
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java
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/xpl/CustomSashForm.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4152, editors splitting option was added.
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model-attrs.properties
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model-attrs.properties 2009-04-20
18:51:36 UTC (rev 14830)
+++
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model-attrs.properties 2009-04-21
07:33:28 UTC (rev 14831)
@@ -48,6 +48,7 @@
Model.always_prompt_for_tag_attributes_during_tag_insert=Always Prompt for Tag Attributes
During Tag Insert
Model.show_selection_tag_bar=Show Selection Tag Bar
Model.always_hide_selection_bar_without_prompt=Always Hide Selection Bar Without Prompt
+Model.visual_source_editors_splitting=Visual/Source editors splitting
Model.Size_of_Visual_Editor_pane_0-100%=Size of Visual Editor Pane 0-100%
Model.interface=Interface
Model.class=Class
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties 2009-04-20
18:51:36 UTC (rev 14830)
+++
trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-model.properties 2009-04-21
07:33:28 UTC (rev 14831)
@@ -853,6 +853,7 @@
SharableNewProject.Register_Web_Context_in_server.xml=Register Web Context in server.xml
SharableVPEEditor.option_list=Default Editor Tab
+SharableVPEEditor.visual_source_editors_splitting=Visual/Source editors splitting
SharableVPEEditor.source_visual_editors_weights=Size of Visual Editor pane 0-100%
##### XBundle model #####
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2009-04-20
18:51:36 UTC (rev 14830)
+++
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2009-04-21
07:33:28 UTC (rev 14831)
@@ -1315,6 +1315,14 @@
</Constraint>
<Editor name="List"/>
</XModelAttribute>
+ <XModelAttribute default="Horizontal"
+ name="Visual/Source editors splitting"
xmlname="visual_source_editors_splitting">
+ <Constraint loader="List">
+ <value name="Horizontal"/>
+ <value name="Vertical"/>
+ </Constraint>
+ <Editor name="RadioArray"/>
+ </XModelAttribute>
<XModelAttribute default="500"
name="Size of Visual Editor pane 0-100%"
xmlname="source_visual_editors_weights">
<Editor name="Slider2"/>
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/RadioArrayFieldEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/RadioArrayFieldEditor.java 2009-04-20
18:51:36 UTC (rev 14830)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/RadioArrayFieldEditor.java 2009-04-21
07:33:28 UTC (rev 14831)
@@ -82,7 +82,13 @@
}
public Control[] getControls(Composite parent) {
- return new Control[] {new Label(parent,SWT.NONE), getPanelControl(parent)};
+ Control label = null;
+ if (makeGroup()) {
+ label = new Label(parent,SWT.NONE);
+ } else {
+ label = getLabelComposite(parent);
+ }
+ return new Control[] {label, getPanelControl(parent)};
}
public Composite getPanelControl(Composite parent) {
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java 2009-04-20
18:51:36 UTC (rev 14830)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java 2009-04-21
07:33:28 UTC (rev 14831)
@@ -21,6 +21,7 @@
public static String ATT_USE_ABSOLUTE_POSITION = "";
public static String ATT_ALWAYS_PROMPT_FOR_TAG_ATTRIBUTES_DURING_TAG_INSERT =
"always prompt for tag attributes during tag insert";
public static String ATT_OPTION_LIST = "option list";
+ public static String ATT_VISUAL_SOURCE_EDITORS_SPLITTING = "Visual/Source editors
splitting";
public static String ATT_SOURCE_VISUAL_EDITORS_WEIGHTS = "Size of Visual Editor
pane 0-100%";
public static String ATT_SHOW_SELECTION_TAG_BAR = "show selection tag bar";
public static String ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT="always hide
selection bar without prompt";
@@ -35,6 +36,7 @@
public static final Preference USE_ABSOLUTE_POSITION = new
VpePreference(VPE_EDITOR_PATH, ATT_USE_ABSOLUTE_POSITION);
public static final Preference ALWAYS_REQUEST_FOR_ATTRIBUTE = new
VpePreference(VPE_EDITOR_PATH, ATT_ALWAYS_PROMPT_FOR_TAG_ATTRIBUTES_DURING_TAG_INSERT);
public static final Preference EDITOR_VIEW_OPTION = new VpePreference(VPE_EDITOR_PATH,
ATT_OPTION_LIST);
+ public static final Preference VISUAL_SOURCE_EDITORS_SPLITTING= new
VpePreference(VPE_EDITOR_PATH, ATT_VISUAL_SOURCE_EDITORS_SPLITTING);
public static final Preference SOURCE_VISUAL_EDITORS_WEIGHTS= new
VpePreference(VPE_EDITOR_PATH, ATT_SOURCE_VISUAL_EDITORS_WEIGHTS);
public static final Preference SHOW_SELECTION_TAG_BAR = new
VpePreference(VPE_EDITOR_PATH,ATT_SHOW_SELECTION_TAG_BAR);
public static final Preference ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT = new
VpePreference(VPE_EDITOR_PATH,ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT);
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-04-20
18:51:36 UTC (rev 14830)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-04-21
07:33:28 UTC (rev 14831)
@@ -492,7 +492,9 @@
cmpEd.setLayoutData(new GridData(GridData.FILL_BOTH));
// /////////////////////////////////////////////////////////////////
//container = new SashForm(cmpEd, SWT.VERTICAL);
- container = new CustomSashForm(cmpEd, SWT.VERTICAL);
+ String editorsSplitting = VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING.getValue();
+ container = new CustomSashForm(cmpEd, (CustomSashForm.LAYOUT_HORIZONTAL
+ .equalsIgnoreCase(editorsSplitting) ? SWT.HORIZONTAL : SWT.VERTICAL));
if (editorSettings != null)
editorSettings.addSetting(new SashSetting(container));
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-04-20
18:51:36 UTC (rev 14830)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-04-21
07:33:28 UTC (rev 14831)
@@ -44,7 +44,8 @@
public class CustomSashForm extends SashForm {
public static final String copyright = "(c) Copyright IBM Corporation 2002.";
//$NON-NLS-1$
-
+ public static final String LAYOUT_HORIZONTAL = "Horizontal"; //$NON-NLS-1$
+ public static final String LAYOUT_VERTICAL = "VERTICAL"; //$NON-NLS-1$
/**
* Custom style bits. They set whether max to one side of the other
* is not permitted. For example, if NO_MAX_UP, then there will be only