diff options
7 files changed, 87 insertions, 13 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
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/adapters/GeneralSearchable.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/adapters/GeneralSearchable.java index 18a41984e..20c6cd6ed 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/adapters/GeneralSearchable.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/adapters/GeneralSearchable.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;
@@ -99,14 +100,14 @@ public class GeneralSearchable extends AbstractSearchable { // Case sensitive
fBtnCase = new Button(group, SWT.CHECK);
fBtnCase.setText(Messages.GeneralSearchable_CaseSensitive);
- GridData data = new GridData();
+ GridData data = new GridData(GridData.FILL_HORIZONTAL);
fBtnCase.setLayoutData(data);
fBtnCase.addSelectionListener(l);
// Matching precisely
fBtnMatch = new Button(group, SWT.CHECK);
fBtnMatch.setText(Messages.GeneralSearchable_PreciseMatching);
- data = new GridData();
+ data = new GridData(GridData.FILL_HORIZONTAL);
fBtnMatch.setLayoutData(data);
fBtnMatch.addSelectionListener(l);
}
@@ -192,5 +193,13 @@ public class GeneralSearchable extends AbstractSearchable { public ISearchMatcher getMatcher() {
return new ProcessNodeGeneralMatcher(fCaseSensitive, fMatchPrecise, fTargetName);
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.ui.utils.AbstractSearchable#getPreferredSize()
+ */
+ @Override
+ public Point getPreferredSize() {
+ return new Point(360, 130);
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/ISearchable.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/ISearchable.java index 85c677109..c9009350e 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/ISearchable.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/ISearchable.java @@ -10,6 +10,7 @@ package org.eclipse.tcf.te.ui.interfaces;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.tcf.te.ui.utils.AbstractSearchable;
@@ -108,4 +109,11 @@ public interface ISearchable { * @param settings The dialog settings.
*/
public void persistValues(IDialogSettings settings);
+
+ /**
+ * Get the preferred size of the part.
+ *
+ * @return The preferred size or null.
+ */
+ public Point getPreferredSize();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/internal/utils/TreeViewerSearchDialog.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/internal/utils/TreeViewerSearchDialog.java index ee4559047..06bdd202a 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/internal/utils/TreeViewerSearchDialog.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/internal/utils/TreeViewerSearchDialog.java @@ -23,6 +23,7 @@ import org.eclipse.swt.SWT; 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; @@ -45,6 +46,8 @@ public class TreeViewerSearchDialog extends CustomTitleAreaDialog implements ISe private static final String SEARCH_HELP_ID = "org.eclipse.tcf.te.ui.utils.TreeViewerSearchDialog.help"; //$NON-NLS-1$ // A new search button's ID. private static final int SEARCH_ID = 31; + private static final int DEFAULT_WIDTH_TRIM = 20; + private static final int DEFAULT_HEIGHT_TRIM = 160; // The dropdown combo box to select an algorithm private Combo fCmbAlg; @@ -345,6 +348,20 @@ public class TreeViewerSearchDialog extends CustomTitleAreaDialog implements ISe } } + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.TitleAreaDialog#getInitialSize() + */ + @Override + protected Point getInitialSize() { + Point size = fSearchable.getPreferredSize(); + if(size != null) { + int width = size.x + DEFAULT_WIDTH_TRIM; + int height = size.y + DEFAULT_HEIGHT_TRIM; + return new Point(width, height); + } + return super.getInitialSize(); + } + /* * (non-Javadoc) * @see org.eclipse.tcf.te.ui.interfaces.IOptionListener#optionChanged(java.util.EventObject) diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/AbstractSearchable.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/AbstractSearchable.java index 52b87e627..38e4620e0 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/AbstractSearchable.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/AbstractSearchable.java @@ -11,6 +11,7 @@ package org.eclipse.tcf.te.ui.utils; import org.eclipse.core.commands.common.EventManager;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.tcf.te.ui.interfaces.IOptionListener;
import org.eclipse.tcf.te.ui.interfaces.ISearchable;
@@ -116,4 +117,12 @@ public abstract class AbstractSearchable extends EventManager implements ISearch public String getElementText(Object element) {
return null;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.ui.interfaces.ISearchable#getPreferredSize()
+ */
+ @Override
+ public Point getPreferredSize() {
+ return null;
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/CompositeSearchable.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/CompositeSearchable.java index b55f32b64..0280059b5 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/CompositeSearchable.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/utils/CompositeSearchable.java @@ -192,4 +192,22 @@ public abstract class CompositeSearchable implements ISearchable { searchable.removeOptionListener(listener);
}
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.ui.interfaces.ISearchable#getPreferredSize()
+ */
+ @Override
+ public Point getPreferredSize() {
+ Point size = null;
+ for(ISearchable searchable : searchables) {
+ Point prefSize = searchable.getPreferredSize();
+ if(prefSize != null) {
+ if(size == null)
+ size = new Point(0, 0);
+ size.x = Math.max(size.x, prefSize.x);
+ size.y = size.y + prefSize.y;
+ }
+ }
+ return size;
+ }
}
|