Target Explorer: Set a more preferable size of the search dialog.

2 files changed, 24 insertions, 11 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSGeneralSearchable.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSGeneralSearchable.java
index 65a12cb8a..766414f4e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSGeneralSearchable.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/internal/adapters/FSGeneralSearchable.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Button;

@@ -121,12 +122,11 @@ public class FSGeneralSearchable extends AbstractSearchable {
 		

 		Group group = new Group(parent, SWT.NONE);

 		group.setText(Messages.FSGeneralSearchable_GeneralOptionText);

-		group.setLayout(new GridLayout(2, true));

+		group.setLayout(new GridLayout());

 		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

 		

 		Composite cmpType = new Composite(group, SWT.NONE);

 		GridData data = new GridData(GridData.FILL_HORIZONTAL);

-		data.horizontalSpan = 2;

 		cmpType.setLayoutData(data);

 		cmpType.setLayout(new GridLayout(2, false));

 		

@@ -138,32 +138,37 @@ public class FSGeneralSearchable extends AbstractSearchable {
 		fCmbTypes.setItems(new String[]{Messages.FSTreeNodeSearchable_FilesAndFolders, Messages.FSTreeNodeSearchable_FilesOnly, Messages.FSTreeNodeSearchable_FoldersOnly});

 		fCmbTypes.setLayoutData(new GridData());

 		fCmbTypes.addSelectionListener(l);

+

+		Composite compOptions = new Composite(group, SWT.NONE);

+		data = new GridData(GridData.FILL_HORIZONTAL);

+		compOptions.setLayoutData(data);

+		compOptions.setLayout(new GridLayout(2, true));

 		

 		// Case sensitive

-		fBtnCase = new Button(group, SWT.CHECK);

+		fBtnCase = new Button(compOptions, SWT.CHECK);

 		fBtnCase.setText(Messages.TreeViewerSearchDialog_BtnCaseText);

-		data = new GridData();

+		data = new GridData(GridData.FILL_HORIZONTAL);

 		fBtnCase.setLayoutData(data);

 		fBtnCase.addSelectionListener(l);

 

 		// Matching precisely

-		fBtnMatch = new Button(group, SWT.CHECK);

+		fBtnMatch = new Button(compOptions, SWT.CHECK);

 		fBtnMatch.setText(Messages.TreeViewerSearchDialog_BtnPreciseText);

-		data = new GridData();

+		data = new GridData(GridData.FILL_HORIZONTAL);

 		fBtnMatch.setLayoutData(data);

 		fBtnMatch.addSelectionListener(l);

 		

 		// If the target is Windows platform, then add system/hidden options.

 		if(rootNode.isWindowsNode()) {

-			fBtnSystem = new Button(group, SWT.CHECK);

+			fBtnSystem = new Button(compOptions, SWT.CHECK);

 			fBtnSystem.setText(Messages.FSGeneralSearchable_SearchSystemFiles);

-			data = new GridData();

+			data = new GridData(GridData.FILL_HORIZONTAL);

 			fBtnSystem.setLayoutData(data);

 			fBtnSystem.addSelectionListener(l);

 			

-			fBtnHidden = new Button(group, SWT.CHECK);

+			fBtnHidden = new Button(compOptions, SWT.CHECK);

 			fBtnHidden.setText(Messages.FSGeneralSearchable_SearchHiddenFiles);

-			data = new GridData();

+			data = new GridData(GridData.FILL_HORIZONTAL);

 			fBtnHidden.setLayoutData(data);

 			fBtnHidden.addSelectionListener(l);

 		}

@@ -284,4 +289,12 @@ public class FSGeneralSearchable extends AbstractSearchable {
 	public boolean isInputValid() {

 		return fSearchField.isValid();

 	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tcf.te.ui.utils.AbstractSearchable#getPreferredSize()

+	 */

+	@Override

+    public Point getPreferredSize() {

+	    return new Point(400, rootNode.isWindowsNode() ? 200 : 180);

+    }

 }

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties
index 87c51b6ec..1ed28fe9d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/src/org/eclipse/tcf/te/tcf/filesystem/ui/nls/Messages.properties
@@ -45,7 +45,7 @@ FSDropTargetListener_ConfirmMoveTitle=Confirm Move
 FSDropTargetListener_MovingWarningMultiple=This operation will delete the files after moving. You can copy them without deletion by CTRL + dragging. \n\nAre you sure you want to move these {0} files/folders?

 FSDropTargetListener_MovingWarningSingle=This operation will delete the file after moving. You can copy it without deletion by CTRL + dragging. \n\nAre you sure you want to move ''{0}''?

 FSExplorerEditorPage_PageTitle=File System Explorer

-FSGeneralSearchable_FileType=Type of file

+FSGeneralSearchable_FileType=Select type of file

 FSGeneralSearchable_Find=Find:

 FSGeneralSearchable_GeneralOptionText=General search options

 FSGeneralSearchable_SearchHiddenFiles=Search hidden files/folders