[cdt-patch] Fix for 49883

[Tanya Wolff <twolff@xxxxxxxxxx>]

This changes duplicate mnemonics on
the editor page, fixes the "bold" mnemonic, and removes a couple
unneeded externalized strings.

Thanks,
Tanya

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.481
diff -u -r1.481 ChangeLog
--- ChangeLog	16 Jun 2004 05:47:36 -0000	1.481
+++ ChangeLog	16 Jun 2004 17:35:13 -0000
@@ -1,3 +1,11 @@
+2004-06-16 Tanya Wolff
+	Fix for Bug 49883:  duplicate mnemonics on editor preferences page.
+	Also flipped label/checkbox presentation for "bold" so the mnemonic would work. 
+	Removed unneeded keys.
+	
+	* src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
+	* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
+		
 2004-06-15 Bogdan Gheorghe
 	Fix for Bug 60490:  "Selected resource" option should only be enabled/disabled 
 	based on selections in the Navigator and C/C++ Projects views - search now
Index: src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java,v
retrieving revision 1.34
diff -u -r1.34 CEditorPreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java	8 Jun 2004 17:40:04 -0000	1.34
+++ src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java	16 Jun 2004 17:35:14 -0000
@@ -414,14 +414,10 @@
 		gd.horizontalAlignment = GridData.BEGINNING;
 		foregroundColorButton.setLayoutData(gd);
 
-		label = new Label(stylesComposite, SWT.LEFT);
-		label.setText(PreferencesMessages.getString("CEditorPreferencePage.colorPage.bold")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalAlignment = GridData.BEGINNING;
-		label.setLayoutData(gd);
-
 		fBoldCheckBox = new Button(stylesComposite, SWT.CHECK);
+		fBoldCheckBox.setText(PreferencesMessages.getString("CEditorPreferencePage.colorPage.bold"));
 		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=2;
 		gd.horizontalAlignment = GridData.BEGINNING;
 		fBoldCheckBox.setLayoutData(gd);
 
Index: src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties,v
retrieving revision 1.19
diff -u -r1.19 PreferencesMessages.properties
--- src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties	11 Jun 2004 18:38:39 -0000	1.19
+++ src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties	16 Jun 2004 17:35:14 -0000
@@ -70,9 +70,8 @@
 CEditorPreferencePage.empty_input=Empty input
 
 CEditorPreferencePage.ContentAssistPage.searchGroupTitle=Search scope for completion proposals:
-CEditorPreferencePage.ContentAssistPage.searchGroupCurrentFileOption=&Search current file and included files
+CEditorPreferencePage.ContentAssistPage.searchGroupCurrentFileOption=S&earch current file and included files
 CEditorPreferencePage.ContentAssistPage.searchGroupCurrentProjectOption=Search current &project
-CEditorPreferencePage.ContentAssistPage.searchGroupCurrentProjectAndDependenciesOption=Search current project and &dependent projects
 CEditorPreferencePage.ContentAssistPage.insertSingleProposalAutomatically=&Insert single proposals automatically
 CEditorPreferencePage.ContentAssistPage.showOnlyProposalsWithCorrectVisibility=Show only proposals visible in the invocation conte&xt
 CEditorPreferencePage.ContentAssistPage.showProposalsInAlphabeticalOrder=Present proposals in a&lphabetical order
@@ -102,15 +101,15 @@
 CEditorPreferencePage.colorPage.custom=C&ustom
 CEditorPreferencePage.colorPage.foreground=Fo&reground:
 CEditorPreferencePage.colorPage.color=C&olor:
-CEditorPreferencePage.colorPage.bold=&Bold:
+CEditorPreferencePage.colorPage.bold=&Bold
 CEditorPreferencePage.colorPage.preview=Preview:
 CEditorPreferencePage.behaviorPage.textFont=Text &font:
 CEditorPreferencePage.behaviorPage.tabWidth=Displayed &tab width:
-CEditorPreferencePage.behaviorPage.marginColumn=Print margin col&umn:
-CEditorPreferencePage.behaviorPage.tabSpace=Insert &space for tabs
+CEditorPreferencePage.behaviorPage.marginColumn=Print m&argin column:
+CEditorPreferencePage.behaviorPage.tabSpace=&Insert space for tabs
 CEditorPreferencePage.behaviorPage.matchingBrackets=Highlight &matching brackets
-CEditorPreferencePage.behaviorPage.highlightLine=Highlight &current line
-CEditorPreferencePage.behaviorPage.printMargin=Show print &margin
+CEditorPreferencePage.behaviorPage.highlightLine=&Highlight current line
+CEditorPreferencePage.behaviorPage.printMargin=Show &print margin
 CEditorPreferencePage.behaviorPage.showLineNumbers=Show &line numbers
 CEditorPreferencePage.behaviorPage.showOverviewRuler=Show &overview ruler
 CEditorPreferencePage.behaviorPage.appearanceColorOptions=Appearance color options
@@ -181,5 +180,5 @@
 #Editor Preferences
 CEditorPreferencePage.behaviourPage.EditorGroup=Editor
 CEditorPreferencePage.behaviourPage.EnableEditorProblemAnnotation=Enable editor problem annotation
-CEditorPreferencePage.behaviourPage.Annotations=Annotations
+