From a2393bddc7a9462c093f951717bdeb9f51e802cb Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Tue, 22 Jun 2004 18:54:29 +0000 Subject: [PATCH] Patch for Tanya --- core/org.eclipse.cdt.ui/ChangeLog | 9 +++++++++ .../ui/preferences/CEditorPreferencePage.java | 8 ++------ .../ui/preferences/PreferencesMessages.properties | 15 +++++++-------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 2d9e1b942ce..85c10eff688 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,12 @@ +2004-06-22 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-22 Bogdan Gheorghe Fix for 68028: Open Declaration into closed project causes PartInitException diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java index f07a4c035d9..79d0dda4952 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java @@ -414,14 +414,10 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP 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); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties index cee7ba617b7..0fdbd0dccc4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties @@ -70,9 +70,8 @@ CEditorPreferencePage.invalid_input=Invalid input. 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.systemDefault=S&ystem Default CEditorPreferencePage.colorPage.custom=C&ustom CEditorPreferencePage.colorPage.foreground=Fo®round: 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 ¤t 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 @@ CEditorPreferencePage.Navigation.CacheTypesInBackground=Cache types in backgroun #Editor Preferences CEditorPreferencePage.behaviourPage.EditorGroup=Editor CEditorPreferencePage.behaviourPage.EnableEditorProblemAnnotation=Enable editor problem annotation -CEditorPreferencePage.behaviourPage.Annotations=Annotations +