[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] fix for 70221
|
Here's a patch to externalize "matches"
in the Search Results view.
Thanks,
Tanya
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.520
diff -u -r1.520 ChangeLog
--- ChangeLog 15 Jul 2004 18:27:15 -0000 1.520
+++ ChangeLog 16 Jul 2004 15:34:41 -0000
@@ -1,3 +1,18 @@
+2004-07-16 Tanya Wolff
+
+ Fix for 70221: unexternalized strings
+ * org.eclipse.cdt.internal.ui/search/CountLabelProvider.java
+ * org.eclipse.cdt.internal.ui/search/CSearchMessages.properties
+
+2004-07-15 Tanya Wolff
+
+ Fix for 70124: unexternalized strings
+ * org.eclipse.cdt.ui.wizards.conversion/ConvertProjectWizardPage.java
+ * org.eclipse.cdt.internal.ui/CUIMessages.properties
+ Fix for 70143: duplicate mnemonics in binary parser options
+ * org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage.java
+ * org.eclipse.cdt.ui.dialogs.GnuElfBinaryParserPage.java
+ * org.eclipse.cdt.internal.ui/CUIMessages.properties
2004-07-15 Chris Wiebe
Initial draft for the type hierarchy view.
Index: src/org/eclipse/cdt/internal/ui/CUIMessages.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties,v
retrieving revision 1.9
diff -u -r1.9 CUIMessages.properties
--- src/org/eclipse/cdt/internal/ui/CUIMessages.properties 21 Jun 2004 17:56:28 -0000 1.9
+++ src/org/eclipse/cdt/internal/ui/CUIMessages.properties 16 Jul 2004 15:34:41 -0000
@@ -35,13 +35,17 @@
BinaryParserPage.task.savingAttributes=Saving Attributes
BinaryParserPage.label.addr2lineCommand=addr2line Command:
BinaryParserPage.label.browse=&Browse...
+BinaryParserPage.label.browse1=B&rowse...
+BinaryParserPage.label.browse2=Br&owse...
BinaryParserPage.label.cppfiltCommand=c++filt Command:
BinaryParserPage.label.cygpathCommand=cygpath Command:
AbstractErrorParserBlock.task.setErrorParser=Setting Error Parsers...
ConvertProjectWizardPage.convertTo=Convert to C or C++
+ConvertProjectWizardPage.SelectAll=Select All
ConvertProjectWizardPage.CProject=C Project
ConvertProjectWizardPage.CppProject=C++ Project
+ConvertProjectWizardPage.DeselectAll=Deselect All
AbstractErrorParserBlock.label.up=Up
AbstractErrorParserBlock.label.down=Down
AbstractErrorParserBlock.label.selectAll=Select All
Index: src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties,v
retrieving revision 1.19
diff -u -r1.19 CSearchMessages.properties
--- src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties 24 Jun 2004 19:29:33 -0000 1.19
+++ src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties 16 Jul 2004 15:34:42 -0000
@@ -17,8 +17,9 @@
Search.Error.search.title=Search Error
Search.Error.search.message=An error occurred during the search operation
-CSearchResultCollector.match= 1 match
-CSearchResultCollector.matches= {0} matches
+# Examples of the display for the following value are
+# "(1 match)", where {0} is 1 and "(5 matches)", where {0} is 2 or more.
+CSearchResultCollector.matches= ({0} {0, choice, 1\#match|2\#matches})
CSearchResultCollector.done= Search done: {0}.
CSearchResultCollector.searching= Searching...
Index: src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CountLabelProvider.java
--- src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java 24 Jun 2004 19:29:33 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java 16 Jul 2004 15:34:42 -0000
@@ -46,13 +46,13 @@
}
public String getText(Object element) {
- int matchCount= fPage.getInput().getMatchCount(element);
+ int c = fPage.getInput().getMatchCount(element);
+
String text= fLabelProvider.getText(element);
- if (matchCount == 0)
+ if (c == 0)
return text;
- if (matchCount == 1)
- return fLabelProvider.getText(element)+ " (" + 1 + " match)"; //$NON-NLS-1$ //$NON-NLS-2$
- return text + " (" + matchCount + " matches)"; //$NON-NLS-1$ //$NON-NLS-2$
+ Integer matchCount= new Integer(c);
+ return fLabelProvider.getText(element) + " "+ CSearchMessages.getFormattedString("CSearchResultCollector.matches", matchCount); //$NON-NLS-1$ //$NON-NLS-2$
}
public void dispose() {
Index: src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java,v
retrieving revision 1.8
diff -u -r1.8 CygwinPEBinaryParserPage.java
--- src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java 24 Jun 2004 19:59:28 -0000 1.8
+++ src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java 16 Jul 2004 15:34:42 -0000
@@ -203,7 +203,7 @@
//updateLaunchConfigurationDialog();
}
});
- button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse")); //$NON-NLS-1$
+ button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse1")); //$NON-NLS-1$
button.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
@@ -241,7 +241,7 @@
//updateLaunchConfigurationDialog();
}
});
- button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse")); //$NON-NLS-1$
+ button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse2")); //$NON-NLS-1$
button.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
Index: src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java,v
retrieving revision 1.9
diff -u -r1.9 GNUElfBinaryParserPage.java
--- src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java 24 Jun 2004 19:59:28 -0000 1.9
+++ src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java 16 Jul 2004 15:34:42 -0000
@@ -199,7 +199,7 @@
//updateLaunchConfigurationDialog();
}
});
- button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse")); //$NON-NLS-1$
+ button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse1")); //$NON-NLS-1$
button.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
Index: src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java,v
retrieving revision 1.17
diff -u -r1.17 ConvertProjectWizardPage.java
--- src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java 25 Jun 2004 14:56:35 -0000 1.17
+++ src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java 16 Jul 2004 15:34:42 -0000
@@ -262,7 +262,7 @@
selectAllButton= new Button(buttons, SWT.PUSH);
selectAllButton.setLayoutData(getButtonGridData(selectAllButton));
- selectAllButton.setText("Select All"); //$NON-NLS-1$
+ selectAllButton.setText(CUIMessages.getString("ConvertProjectWizardPage.SelectAll")); //$NON-NLS-1$
selectAllButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
ConvertProjectWizardPage.this.tableViewer.setAllChecked(true);
@@ -274,7 +274,7 @@
deselectAllButton= new Button(buttons, SWT.PUSH);
deselectAllButton.setLayoutData(getButtonGridData(deselectAllButton));
- deselectAllButton.setText("Deselect All"); //$NON-NLS-1$
+ deselectAllButton.setText(CUIMessages.getString("ConvertProjectWizardPage.DeselectAll")); //$NON-NLS-1$
deselectAllButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
ConvertProjectWizardPage.this.tableViewer.setAllChecked(false);
