View | Details | Raw Unified | Return to bug 33710 | Differences between
and this patch

Collapse All | Expand All

(-)org.eclipse.platform.doc.user/reference/ref-search.htm (+10 lines)
Lines 45-50 preference page allows you to set preferences for searches. Link Here
45
    </TR>
45
    </TR>
46
    <TR> 
46
    <TR> 
47
      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
47
      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
48
          Focus on last used search page</P></TD>
49
      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
50
          If disabled the best fitting search page is calculated (depending on 
51
          open editor, selection, ...) and focussed on whenever you open the 
52
          search dialog. If this option is enabled always the last used search 
53
          page will be used if the search dialog is opened. </P></TD>
54
      <TD> Off</TD>
55
    </TR>
56
    <TR> 
57
      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
48
          Ignore potential matches</P></TD>
58
          Ignore potential matches</P></TD>
49
      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
59
      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
50
          Select this option if you only want to see exact matches.</P></TD>
60
          Select this option if you only want to see exact matches.</P></TD>
(-)org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java (+13 lines)
Lines 90-95 import org.eclipse.search.ui.ISearchPageScoreComputer; Link Here
90
90
91
public class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer, IPageChangeProvider {
91
public class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer, IPageChangeProvider {
92
92
93
	/**
94
	 * The id of the last search page that was opened in the search dialog
95
	 */
96
	public static final String PREVIOUS_SEARCH_PAGE = "org.eclipse.search.previousSearchPageId"; //$NON-NLS-1$
97
	
93
	private class TabFolderLayout extends Layout {
98
	private class TabFolderLayout extends Layout {
94
		protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
99
		protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
95
			if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
100
			if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
Lines 154-159 public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon Link Here
154
159
155
		fDescriptors= filterByActivities(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(pageId));
160
		fDescriptors= filterByActivities(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(pageId));
156
		fInitialPageId= pageId;
161
		fInitialPageId= pageId;
162
		boolean useLastUsedSearchPage= SearchPlugin.getDefault().getPreferenceStore().getBoolean(SearchPreferencePage.USE_LAST_USED_SEARCHPAGE);
163
		// if fInitialPageId != null then a specific search page shall be opened directly
164
		// In this case do not consider the preference at all
165
		if (fInitialPageId == null && useLastUsedSearchPage) {
166
			String lastPageId = SearchPlugin.getDefault().getPreferenceStore().getString(PREVIOUS_SEARCH_PAGE);
167
			fInitialPageId = lastPageId;
168
		}
169
		
157
		fPageChangeListeners= null;
170
		fPageChangeListeners= null;
158
		setUseEmbeddedProgressMonitorPart(false);
171
		setUseEmbeddedProgressMonitorPart(false);
159
	}
172
	}
(-)org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java (+1 lines)
Lines 185-190 public final class SearchMessages extends NLS { Link Here
185
	public static String SearchPreferencePage_defaultPerspective;
185
	public static String SearchPreferencePage_defaultPerspective;
186
	public static String SearchPreferencePage_defaultPerspective_none;
186
	public static String SearchPreferencePage_defaultPerspective_none;
187
	public static String SearchPreferencePage_ignorePotentialMatches;
187
	public static String SearchPreferencePage_ignorePotentialMatches;
188
	public static String SearchPreferencePage_useLastUsedSearchPage;
188
	public static String ReplaceAction_label_all;
189
	public static String ReplaceAction_label_all;
189
	public static String ReplaceAction_label_selected;
190
	public static String ReplaceAction_label_selected;
190
	public static String SelectAllAction_label;
191
	public static String SelectAllAction_label;
(-)org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties (+1 lines)
Lines 199-204 SearchPreferencePage_defaultPerspective= Default &perspective for the Search vie Link Here
199
SearchPreferencePage_textSearchEngine=Text Search Engine to be used:
199
SearchPreferencePage_textSearchEngine=Text Search Engine to be used:
200
SearchPreferencePage_defaultPerspective_none= None
200
SearchPreferencePage_defaultPerspective_none= None
201
SearchPreferencePage_ignorePotentialMatches= &Ignore potential matches
201
SearchPreferencePage_ignorePotentialMatches= &Ignore potential matches
202
SearchPreferencePage_useLastUsedSearchPage= &Focus on last used search page
202
203
203
ReplaceAction_label_all= Re&place All...
204
ReplaceAction_label_all= Re&place All...
204
ReplaceAction_title_all=Replace Text Matches
205
ReplaceAction_title_all=Replace Text Matches
(-)org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java (+7 lines)
Lines 53-58 public class SearchPreferencePage extends FieldEditorPreferencePage implements I Link Here
53
    public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$
53
    public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$
54
    public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$
54
    public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$
55
	public static final String LIMIT_HISTORY= "org.eclipse.search.limitHistory"; //$NON-NLS-1$
55
	public static final String LIMIT_HISTORY= "org.eclipse.search.limitHistory"; //$NON-NLS-1$
56
	/**
57
	 * Preference switch. If <code>true</code> then the last used search page is opened when the search dialog is opened 
58
	 * instead of the page that is calculated to fit best the current selection/editor/...
59
	 */
60
	public static final String USE_LAST_USED_SEARCHPAGE= "org.eclipse.search.useLastUsedSearchPage"; //$NON-NLS-1$
56
61
57
	private ColorFieldEditor fColorEditor;
62
	private ColorFieldEditor fColorEditor;
58
	private BooleanFieldEditor fEmphasizedCheckbox;
63
	private BooleanFieldEditor fEmphasizedCheckbox;
Lines 91-96 public class SearchPreferencePage extends FieldEditorPreferencePage implements I Link Here
91
		store.setDefault(TEXT_SEARCH_ENGINE, ""); //default search engine is empty string //$NON-NLS-1$
96
		store.setDefault(TEXT_SEARCH_ENGINE, ""); //default search engine is empty string //$NON-NLS-1$
92
		store.setDefault(TEXT_SEARCH_QUERY_PROVIDER, ""); // default query provider is empty string  //$NON-NLS-1$
97
		store.setDefault(TEXT_SEARCH_QUERY_PROVIDER, ""); // default query provider is empty string  //$NON-NLS-1$
93
		store.setDefault(LIMIT_HISTORY, 10);
98
		store.setDefault(LIMIT_HISTORY, 10);
99
		store.setDefault(USE_LAST_USED_SEARCHPAGE, false);
94
	}
100
	}
95
101
96
102
Lines 102-107 public class SearchPreferencePage extends FieldEditorPreferencePage implements I Link Here
102
	protected void createFieldEditors() {
108
	protected void createFieldEditors() {
103
		addField(new BooleanFieldEditor(REUSE_EDITOR, SearchMessages.SearchPreferencePage_reuseEditor, getFieldEditorParent()));
109
		addField(new BooleanFieldEditor(REUSE_EDITOR, SearchMessages.SearchPreferencePage_reuseEditor, getFieldEditorParent()));
104
		addField(new BooleanFieldEditor(BRING_VIEW_TO_FRONT, SearchMessages.SearchPreferencePage_bringToFront, getFieldEditorParent()));
110
		addField(new BooleanFieldEditor(BRING_VIEW_TO_FRONT, SearchMessages.SearchPreferencePage_bringToFront, getFieldEditorParent()));
111
		addField(new BooleanFieldEditor(USE_LAST_USED_SEARCHPAGE, SearchMessages.SearchPreferencePage_useLastUsedSearchPage, getFieldEditorParent()));
105
112
106
		fIgnorePotentialMatchesCheckbox= new BooleanFieldEditor(
113
		fIgnorePotentialMatchesCheckbox= new BooleanFieldEditor(
107
			IGNORE_POTENTIAL_MATCHES,
114
			IGNORE_POTENTIAL_MATCHES,

Return to bug 33710