mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-04 06:45:43 +02:00
Patch For Tanya Wolff: Work In Progress strings
This commit is contained in:
parent
8e45e1973c
commit
4a36ad5055
4 changed files with 24 additions and 24 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2004-06-09 Tanya Wolff
|
||||||
|
Externalized strings from Work In Progress
|
||||||
|
Part of PR 66016
|
||||||
|
|
||||||
|
* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
|
||||||
|
|
||||||
2004-06-09 Alain Magloire
|
2004-06-09 Alain Magloire
|
||||||
Disable extension Work In Progress
|
Disable extension Work In Progress
|
||||||
in plugin.xml. Part of PR 66016
|
in plugin.xml. Part of PR 66016
|
||||||
|
|
|
@ -165,5 +165,20 @@ CEditorHoverConfigurationBlock.insertDelimiterAndModifier= \ + {0}
|
||||||
|
|
||||||
CEditorHoverConfigurationBlock.showAffordance= &Show affordance in hover on how to make it sticky
|
CEditorHoverConfigurationBlock.showAffordance= &Show affordance in hover on how to make it sticky
|
||||||
|
|
||||||
|
#Search Preferences
|
||||||
|
CSearchPreferences.ExternalSearchLinks.ExternalSearchLinksGroup=External Search Links
|
||||||
|
CSearchPreferences.ExternalSearchLinks.EnableMarkerLinkType=Enable Marker Link Type
|
||||||
|
CSearchPreferences.ExternalSearchLinks.Visible=Visible
|
||||||
|
CSearchPreferences.ExternalSearchLinks.Invisible=Invisible
|
||||||
|
CSearchPreferences.IndexerTimeout.IndexerTimeoutGroup=Indexer Timeout
|
||||||
|
CSearchPreferences.IndexerTimeout.Timeout=Timeout (ms)
|
||||||
|
|
||||||
|
#Open Type Preferences
|
||||||
|
CEditorPreferencePage.Navigation.OpenType=Open Type
|
||||||
|
CEditorPreferencePage.Navigation.CacheTypesInBackground=Cache types in background
|
||||||
|
|
||||||
|
#Editor Preferences
|
||||||
|
CEditorPreferencePage.behaviourPage.EditorGroup=Editor
|
||||||
|
CEditorPreferencePage.behaviourPage.EnableEditorProblemAnnotation=Enable editor problem annotation
|
||||||
|
CEditorPreferencePage.behaviourPage.Annotations=Annotations
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,7 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
|
||||||
* @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer)
|
* @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer)
|
||||||
*/
|
*/
|
||||||
protected void configureTableViewer(TableViewer viewer) {
|
protected void configureTableViewer(TableViewer viewer) {
|
||||||
viewer.setLabelProvider(new CountLabelProvider(this, new CSearchResultLabelProvider(this)));
|
viewer.setLabelProvider(new CountLabelProvider(this, new CSearchResultLabelProvider()));
|
||||||
_contentProvider=new CSearchTableContentProvider(viewer);
|
_contentProvider=new CSearchTableContentProvider(viewer);
|
||||||
viewer.setContentProvider(_contentProvider);
|
viewer.setContentProvider(_contentProvider);
|
||||||
setSortOrder(_currentSortOrder);
|
setSortOrder(_currentSortOrder);
|
||||||
|
@ -248,8 +248,6 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
|
||||||
if (getLayout() != FLAG_LAYOUT_FLAT)
|
if (getLayout() != FLAG_LAYOUT_FLAT)
|
||||||
addGroupActions(tbm);
|
addGroupActions(tbm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,6 @@ import org.eclipse.core.runtime.CoreException;
|
||||||
import org.eclipse.jface.resource.ImageDescriptor;
|
import org.eclipse.jface.resource.ImageDescriptor;
|
||||||
import org.eclipse.jface.viewers.LabelProvider;
|
import org.eclipse.jface.viewers.LabelProvider;
|
||||||
import org.eclipse.search.ui.ISearchResultViewEntry;
|
import org.eclipse.search.ui.ISearchResultViewEntry;
|
||||||
import org.eclipse.search.ui.text.Match;
|
|
||||||
import org.eclipse.swt.graphics.Image;
|
import org.eclipse.swt.graphics.Image;
|
||||||
import org.eclipse.swt.graphics.Point;
|
import org.eclipse.swt.graphics.Point;
|
||||||
|
|
||||||
|
@ -44,8 +43,6 @@ public class CSearchResultLabelProvider extends LabelProvider {
|
||||||
|
|
||||||
public static final String POTENTIAL_MATCH = CSearchMessages.getString("CSearchResultLabelProvider.potentialMatch"); //$NON-NLS-1$
|
public static final String POTENTIAL_MATCH = CSearchMessages.getString("CSearchResultLabelProvider.potentialMatch"); //$NON-NLS-1$
|
||||||
|
|
||||||
private CSearchResultPage searchPage = null;
|
|
||||||
|
|
||||||
public CSearchResultLabelProvider(){
|
public CSearchResultLabelProvider(){
|
||||||
_sortOrder = SHOW_PATH;
|
_sortOrder = SHOW_PATH;
|
||||||
}
|
}
|
||||||
|
@ -54,7 +51,8 @@ public class CSearchResultLabelProvider extends LabelProvider {
|
||||||
* @param page
|
* @param page
|
||||||
*/
|
*/
|
||||||
public CSearchResultLabelProvider(CSearchResultPage page) {
|
public CSearchResultLabelProvider(CSearchResultPage page) {
|
||||||
searchPage = page;
|
|
||||||
|
// TODO Auto-generated constructor stub
|
||||||
}
|
}
|
||||||
|
|
||||||
public Image getImage( Object element ) {
|
public Image getImage( Object element ) {
|
||||||
|
@ -162,18 +160,6 @@ public class CSearchResultLabelProvider extends LabelProvider {
|
||||||
String result = ""; //$NON-NLS-1$
|
String result = ""; //$NON-NLS-1$
|
||||||
String path = (resource != null ) ? resource.getFullPath().toString() : ""; //$NON-NLS-1$
|
String path = (resource != null ) ? resource.getFullPath().toString() : ""; //$NON-NLS-1$
|
||||||
|
|
||||||
// Object key = computeGroupByKey(match);
|
|
||||||
|
|
||||||
if (searchPage != null){
|
|
||||||
int matchCount = searchPage.getDisplayedMatchCount(new Match(match,match.getStartOffset(),match.getEndOffset() - match.getStartOffset()));
|
|
||||||
if (matchCount < 2){
|
|
||||||
System.out.println("Singular");
|
|
||||||
}else{
|
|
||||||
System.out.println("Plural"); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
switch( getOrder() ){
|
switch( getOrder() ){
|
||||||
case SHOW_NAME_ONLY:
|
case SHOW_NAME_ONLY:
|
||||||
result = match.getName();
|
result = match.getName();
|
||||||
|
@ -216,11 +202,6 @@ public class CSearchResultLabelProvider extends LabelProvider {
|
||||||
_sortOrder = orderFlag;
|
_sortOrder = orderFlag;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object computeGroupByKey(IMatch match) {
|
|
||||||
|
|
||||||
return match.getParentName() + "::" + match.getName() + " - " + match.getLocation(); //$NON-NLS-1$ //$NON-NLS-2$
|
|
||||||
}
|
|
||||||
|
|
||||||
private int _sortOrder;
|
private int _sortOrder;
|
||||||
private int _textFlags;
|
private int _textFlags;
|
||||||
private int _imageFlags;
|
private int _imageFlags;
|
||||||
|
|
Loading…
Add table
Reference in a new issue