From 09c86e033a6724e7e8bf82d20751201a23fc2326 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 24 Jun 2004 12:28:27 +0000 Subject: [PATCH] patch from Tanya Wolff - Here's a patch that sets titles for "Open" FileDialog and "Browse For Folder" DirectoryDialog which aren't necessary for Windows OS since these dialogs come from the platform and have their own defaults, but for Linux, these dialogs don't have defaults. Tested on Windows and Linux --- core/org.eclipse.cdt.ui/ChangeLog | 7 +++++++ .../ui/dialogs/cpaths/CPathEntryMessages.properties | 1 + .../ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java | 1 + .../cdt/internal/ui/wizards/NewWizardMessages.properties | 3 +++ .../internal/ui/wizards/dialogfields/LinkToFileGroup.java | 2 ++ 5 files changed, 14 insertions(+) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 90f99c82198..e504e6d56e6 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,10 @@ +2004-06-23 Tanya Wolff + Fix for bugs 66134,66145 + * src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties + * src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java + * src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties + * src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java + 2004-06-23 Tanya Wolff Fix for Bug 66300 - i18n: File Types preferences buttons don't expand * src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferences.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties index 7341dd3043e..9bb99edb0ac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties @@ -82,6 +82,7 @@ IncludeSymbolEntryPage.fromWorkspaceDialog.edit.title=Edit Include Path from Wor IncludeSymbolEntryPage.fromWorkspaceDialog.edit.description=Select a folder as a include path from the workspace. IncludeSymbolEntryPage.newResource.title=Add File/Folder IncludeSymbolEntryPage.newResource.description=Select a file or folder to add to the include/symbol list to add/remove paths or symbols on. +IncludeSymbolEntryPage.browseForFolder=Browse For Folder # ------- CPathContainerEntryPage ------ ContainerEntryPage.title=Path Containers diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java index eadb3ac6c44..3fd9728efb6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java @@ -1045,6 +1045,7 @@ public class CPathIncludeSymbolEntryPage extends CPathBasePage { public void widgetSelected(SelectionEvent ev) { DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN); + dialog.setText(CPathEntryMessages.getString("IncludeSymbolEntryPage.browseForFolder")); //$NON-NLS-1$ String currentName = getText().getText(); if (currentName != null && currentName.trim().length() != 0) { dialog.setFilterPath(currentName); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties index 444ef42a3c6..b3f799ad64d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties @@ -155,6 +155,7 @@ NewClassWizardPage.files.linkFileButton=Link to file CreateLinkedResourceGroup.resolvedPathLabel=Resolved Location: CreateLinkedResourceGroup.browseButton=Browse... CreateLinkedResourceGroup.variablesButton=Variables... +CreateLinkedResourceGroup.open=Open NewClassWizardPage.error.EnterClassName=Class name is empty. NewClassWizardPage.error.ClassNameExists=Class already exists. @@ -413,3 +414,5 @@ OutputLocationDialog.ChooseOutputFolder.description=&Choose the folder for the b ClasspathContainerWizard.pagecreationerror.title= Library Wizard ClasspathContainerWizard.pagecreationerror.message=Wizard page creation failed. Check log for details. + + diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java index 5eb1def6c16..97a8f6bf55f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java @@ -254,6 +254,7 @@ public class LinkToFileGroup extends StringButtonDialogField { } if (type == IResource.FILE) { FileDialog dialog = new FileDialog(linkTargetField.getShell()); + dialog.setText(NewWizardMessages.getString("CreateLinkedResourceGroup.open")); //$NON-NLS-1$ if (file != null) { if (file.isFile()) dialog.setFileName(linkTargetName); @@ -264,6 +265,7 @@ public class LinkToFileGroup extends StringButtonDialogField { } else { DirectoryDialog dialog = new DirectoryDialog(linkTargetField.getShell()); + dialog.setText(NewWizardMessages.getString("CreateLinkedResourceGroup.open")); //$NON-NLS-1$ if (file != null) { if (file.isFile()) linkTargetName = file.getParent();