Author: dmaliarevich Date: 2010-05-25 04:59:54 -0400 (Tue, 25 May 2010) New Revision: 22300 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.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-2795 , Dialogs' titles were changed, "File name:" label were added. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-25 05:48:18 UTC (rev 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-25 08:59:54 UTC (rev 22300) @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; @@ -78,7 +79,7 @@ * Two columns. */ Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout(2, false)); + composite.setLayout(new GridLayout(3, false)); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); composite.setFont(parent.getFont()); @@ -88,7 +89,7 @@ tagsTable = new Table(composite, SWT.BORDER); TableLayout layout = new TableLayout(); tagsTable.setLayout(layout); - tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); + tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); tagsTable.setHeaderVisible(true); tagsTable.setLinesVisible(true); @@ -108,20 +109,28 @@ VpeImportExportWizardsUtils.updateTagsTable(tagsTable, tagsList, true); /* - * Add path output and browse button + * Add label */ + Label fileNamaLabel = new Label(composite, SWT.NONE); + fileNamaLabel.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, false, false, 1, 1)); + fileNamaLabel.setText(VpeUIMessages.FILE_NAME_LABEL); + /* + * Add output path + */ final Text pathText = new Text(composite, SWT.BORDER); - pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); + pathText.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false, 1, 1)); pathText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { pathString = ((Text)e.getSource()).getText(); setPageComplete(isPageComplete()); } }); - + /* + * Add browse button + */ Button browseButton = new Button(composite, SWT.NONE); browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT); - browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false, 1, 1)); + browseButton.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, false, 1, 1)); browseButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(PlatformUI.getWorkbench() Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-25 05:48:18 UTC (rev 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-25 08:59:54 UTC (rev 22300) @@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; @@ -76,16 +77,22 @@ * Two columns. */ Composite composite = new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout(2, false)); + composite.setLayout(new GridLayout(3, false)); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); composite.setFont(parent.getFont()); /* - * Add path output and browse button + * Add label */ + Label fileNamaLabel = new Label(composite, SWT.NONE); + fileNamaLabel.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, false, false, 1, 1)); + fileNamaLabel.setText(VpeUIMessages.FILE_NAME_LABEL); + /* + * Add output path + */ final Text pathText = new Text(composite, SWT.BORDER); pathText.setEditable(true); - pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); + pathText.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false, 1, 1)); pathText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { pathString = ((Text)e.getSource()).getText(); @@ -119,10 +126,12 @@ setPageComplete(isPageComplete()); } }); - + /* + * Add browse button + */ Button browseButton = new Button(composite, SWT.NONE); browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT); - browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false, 1, 1)); + browseButton.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, false, 1, 1)); browseButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(PlatformUI.getWorkbench() @@ -145,7 +154,7 @@ tagsTable = new Table(composite, SWT.BORDER); TableLayout layout = new TableLayout(); tagsTable.setLayout(layout); - tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 2)); + tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); tagsTable.setHeaderVisible(true); tagsTable.setLinesVisible(true); 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-05-25 05:48:18 UTC (rev 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-05-25 08:59:54 UTC (rev 22300) @@ -152,6 +152,7 @@ public static String SELECT_ALL; public static String DESELECT_ALL; public static String BROWSE_BUTTON_TEXT; + public static String FILE_NAME_LABEL; public static String NONE_TEMPLATES_WERE_ADDED; public static String COULD_NOT_SET_TABLE_SELECTION; public static String CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT; 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-05-25 05:48:18 UTC (rev 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-05-25 08:59:54 UTC (rev 22300) @@ -135,10 +135,11 @@ SELECT_ALL=Select All DESELECT_ALL=Deselect All BROWSE_BUTTON_TEXT=Browse... -EXPORT_UNKNOWN_TAGS_PAGE_TITLE=Unknown tags templates -EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Export unknown tags templates to external file -IMPORT_UNKNOWN_TAGS_PAGE_TITLE=Unknown tags templates -IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Import unknown tags templates from external file +FILE_NAME_LABEL=File name: +EXPORT_UNKNOWN_TAGS_PAGE_TITLE=Export Unknown Tags Templates +EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Export unknown tags templates to the external file +IMPORT_UNKNOWN_TAGS_PAGE_TITLE=Import Unknown Tags Templates +IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Import unknown tags templates from the external file NONE_TEMPLATES_WERE_ADDED=None of the templates were added. COULD_NOT_SET_TABLE_SELECTION=Could not set table selection. LIST_IS_EMPTY=List is empty