Browse Source

Use translation database for code completion options panel and "refactoring bookmark".

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@304 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
b691598427
  1. 30
      src/Main/Base/Project/Resources/CodeCompletionOptionPanel.xfrm
  2. 29
      src/Main/Base/Project/Src/Commands/ClassMemberMenuBuilder.cs
  3. 4
      src/Main/Base/Project/Src/Services/RefactoringService/RefactoringService.cs
  4. 10
      src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
  5. 4
      src/Main/Base/Project/Src/TextEditor/Commands/ParserBookmarkMenuBuilderBase.cs
  6. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

30
src/Main/Base/Project/Resources/CodeCompletionOptionPanel.xfrm

@ -14,8 +14,7 @@ @@ -14,8 +14,7 @@
<System.Windows.Forms.CheckBox>
<Name value="refreshInsightOnCommaCheckBox" />
<Location value="{X=31,Y=186}" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<Text value="Re-open tooltip with better overload when pressing comma" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.RefreshInsightOnComma}" />
<TabIndex value="10" />
<Size value="{Width=332, Height=24}" />
<Anchor value="Top, Left, Right" />
@ -23,8 +22,7 @@ @@ -23,8 +22,7 @@
<System.Windows.Forms.CheckBox>
<Name value="useDebugTooltipsOnlyCheckBox" />
<Location value="{X=31,Y=85}" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<Text value="Only in debug mode" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.UseDebugTooltipsOnly}" />
<TabIndex value="6" />
<Size value="{Width=332, Height=24}" />
<Anchor value="Top, Left, Right" />
@ -32,9 +30,8 @@ @@ -32,9 +30,8 @@
<System.Windows.Forms.Button>
<Name value="clearDataUseCacheButton" />
<Location value="{X=225,Y=40}" />
<Text value="Clear cache" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.ClearCache}" />
<Size value="{Width=101, Height=23}" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<TabIndex value="4" />
</System.Windows.Forms.Button>
<System.Windows.Forms.CheckBox>
@ -42,8 +39,7 @@ @@ -42,8 +39,7 @@
<Location value="{X=12,Y=66}" />
<Checked value="True" />
<CheckState value="Checked" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<Text value="Show tooltip when moving mouse over expression" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.UseTooltips}" />
<TabIndex value="5" />
<Size value="{Width=351, Height=24}" />
<Anchor value="Top, Left, Right" />
@ -53,8 +49,7 @@ @@ -53,8 +49,7 @@
<Location value="{X=12,Y=167}" />
<Checked value="True" />
<CheckState value="Checked" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<Text value="Show tooltip when writing method calls" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.UseInsight}" />
<TabIndex value="9" />
<Size value="{Width=351, Height=24}" />
<Anchor value="Top, Left, Right" />
@ -62,7 +57,7 @@ @@ -62,7 +57,7 @@
<System.Windows.Forms.Label>
<Name value="label4" />
<Location value="{X=6,Y=112}" />
<Text value="The following options are language-dependend, some options are not available in some programming languages." />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.LanguageDependend}" />
<Size value="{Width=357, Height=31}" />
<TabIndex value="7" />
<Anchor value="Top, Left, Right" />
@ -70,8 +65,7 @@ @@ -70,8 +65,7 @@
<System.Windows.Forms.CheckBox>
<Name value="useKeywordCompletionCheckBox" />
<Location value="{X=12,Y=146}" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<Text value="Trigger code completion after keywords" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.UseKeywordCompletion}" />
<TabIndex value="8" />
<Size value="{Width=351, Height=24}" />
<Anchor value="Top, Left, Right" />
@ -79,7 +73,7 @@ @@ -79,7 +73,7 @@
<System.Windows.Forms.Label>
<Name value="dataUsageCacheLabel2" />
<Location value="{X=154,Y=42}" />
<Text value="items" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.SaveItemCountAfterNumber}" />
<TextAlign value="MiddleLeft" />
<Size value="{Width=65, Height=23}" />
<TabIndex value="3" />
@ -98,7 +92,7 @@ @@ -98,7 +92,7 @@
<System.Windows.Forms.Label>
<Name value="dataUsageCacheLabel1" />
<Location value="{X=18,Y=42}" />
<Text value="Save" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.SaveItemCountBeforeNumber}" />
<TextAlign value="MiddleRight" />
<Size value="{Width=56, Height=21}" />
<TabIndex value="1" />
@ -108,8 +102,7 @@ @@ -108,8 +102,7 @@
<Location value="{X=12,Y=20}" />
<Checked value="True" />
<CheckState value="Checked" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<Text value="Pre-select recently used members" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.UseDataUsageCache}" />
<TabIndex value="0" />
<Size value="{Width=351, Height=24}" />
<Anchor value="Top, Left, Right" />
@ -119,7 +112,7 @@ @@ -119,7 +112,7 @@
<System.Windows.Forms.Label>
<Name value="label1" />
<Location value="{X=8,Y=8}" />
<Text value="Use the following option to turn code completion completely off:" />
<Text value="${res:Dialog.Options.IDEOptions.CodeCompletion.MainOption}" />
<TextAlign value="MiddleLeft" />
<Size value="{Width=365, Height=22}" />
<TabIndex value="0" />
@ -128,7 +121,6 @@ @@ -128,7 +121,6 @@
<System.Windows.Forms.CheckBox>
<Name value="codeCompletionEnabledCheckBox" />
<Location value="{X=16,Y=25}" />
<FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
<Text value="${res:Dialog.Options.IDEOptions.TextEditor.General.CodeCompletionCheckBox}" />
<TabIndex value="1" />
<Size value="{Width=357, Height=24}" />

29
src/Main/Base/Project/Src/Commands/ClassMemberMenuBuilder.cs

@ -36,22 +36,22 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -36,22 +36,22 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
List<ToolStripItem> list = new List<ToolStripItem>();
if (method == null || !method.IsConstructor) {
cmd = new MenuCommand("&Rename", Rename);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.RenameCommand}", Rename);
cmd.Tag = member;
list.Add(cmd);
}
if (member.IsOverride) {
cmd = new MenuCommand("Go to &base class", GoToBase);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.GoToBaseClassCommand}", GoToBase);
cmd.Tag = member;
list.Add(cmd);
}
if (member.IsVirtual || member.IsAbstract || (member.IsOverride && !member.DeclaringType.IsSealed)) {
cmd = new MenuCommand("Find &overrides", FindOverrides);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.FindOverridesCommand}", FindOverrides);
cmd.Tag = member;
list.Add(cmd);
}
cmd = new MenuCommand("&Find references", FindReferences);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.FindReferencesCommand}", FindReferences);
cmd.Tag = member;
list.Add(cmd);
@ -66,14 +66,14 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -66,14 +66,14 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
}
}
if (foundProperty != null) {
cmd = new MenuCommand("Go to &property", GotoProperty);
cmd.Tag = member;
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.GoToProperty}", GotoProperty);
cmd.Tag = foundProperty;
list.Add(cmd);
} else {
cmd = new MenuCommand("Create &getter", CreateGetter);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateGetter}", CreateGetter);
cmd.Tag = member;
list.Add(cmd);
cmd = new MenuCommand("Create &property", CreateProperty);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateProperty}", CreateProperty);
cmd.Tag = member;
list.Add(cmd);
}
@ -116,16 +116,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -116,16 +116,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
void GotoProperty(object sender, EventArgs e)
{
MenuCommand item = (MenuCommand)sender;
IMember member = (IMember)item.Tag;
string propertyName = AbstractPropertyCodeGenerator.GetPropertyName(member.Name);
LanguageProperties language = member.DeclaringType.ProjectContent.Language;
foreach (IProperty prop in member.DeclaringType.Properties) {
if (language.NameComparer.Equals(propertyName, prop.Name)) {
JumpToDefinition(prop);
break;
}
}
JumpToDefinition((IMember)(sender as MenuCommand).Tag);
}
void GoToBase(object sender, EventArgs e)
@ -142,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -142,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{
MenuCommand item = (MenuCommand)sender;
IMember member = (IMember)item.Tag;
string newName = MessageService.ShowInputBox("Rename", "Enter the new name of the member", member.Name);
string newName = MessageService.ShowInputBox("${res:SharpDevelop.Refactoring.Rename}", "${res:SharpDevelop.Refactoring.RenameMemberText}", member.Name);
if (!CheckName(newName)) return;
List<Reference> list = RefactoringService.FindReferences(member, null);

4
src/Main/Base/Project/Src/Services/RefactoringService/RefactoringService.cs

@ -85,7 +85,7 @@ namespace ICSharpCode.Core @@ -85,7 +85,7 @@ namespace ICSharpCode.Core
static List<Reference> RunFindReferences(IClass ownerClass, IMember member, IProgressMonitor progressMonitor)
{
if (ParserService.LoadSolutionProjectsThreadRunning) {
MessageService.ShowMessage("Find references cannot be executed until all files have been parsed.");
MessageService.ShowMessage("${res:SharpDevelop.Refactoring.LoadSolutionProjectsThreadRunning}");
return null;
}
ownerClass = FixClass(ownerClass);
@ -94,7 +94,7 @@ namespace ICSharpCode.Core @@ -94,7 +94,7 @@ namespace ICSharpCode.Core
List<Reference> references = new List<Reference>();
try {
if (progressMonitor != null) {
progressMonitor.BeginTask("Finding references...", files.Count);
progressMonitor.BeginTask("${res:SharpDevelop.Refactoring.FindingReferences}", files.Count);
}
while (enumerator.MoveNext()) {
if (progressMonitor != null) {

10
src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs

@ -34,22 +34,22 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -34,22 +34,22 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
IClass c = bookmark.Class;
List<ToolStripItem> list = new List<ToolStripItem>();
cmd = new MenuCommand("&Rename", Rename);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.RenameCommand}", Rename);
cmd.Tag = c;
list.Add(cmd);
if (c.BaseTypes.Count > 0) {
cmd = new MenuCommand("Go to &base class", GoToBase);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.GoToBaseCommand}", GoToBase);
cmd.Tag = c;
list.Add(cmd);
}
if (!c.IsSealed && !c.IsStatic) {
cmd = new MenuCommand("Find &derived classes", FindDerivedClasses);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.FindDerivedClassesCommand}", FindDerivedClasses);
cmd.Tag = c;
list.Add(cmd);
}
cmd = new MenuCommand("&Find references", FindReferences);
cmd = new MenuCommand("${res:SharpDevelop.Refactoring.FindReferencesCommand}", FindReferences);
cmd.Tag = c;
list.Add(cmd);
@ -75,7 +75,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -75,7 +75,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
MenuCommand item = (MenuCommand)sender;
IClass c = (IClass)item.Tag;
c = c.DefaultReturnType.GetUnderlyingClass(); // get compound class if class is partial
string newName = MessageService.ShowInputBox("Rename", "Enter the new name of the class", c.Name);
string newName = MessageService.ShowInputBox("${res:SharpDevelop.Refactoring.Rename}", "${res:SharpDevelop.Refactoring.RenameClassText}", c.Name);
if (!CheckName(newName)) return;
List<Reference> list = RefactoringService.FindReferences(c, null);

4
src/Main/Base/Project/Src/TextEditor/Commands/ParserBookmarkMenuBuilderBase.cs

@ -79,12 +79,12 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -79,12 +79,12 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
if (name == null || name.Length == 0)
return false;
if (!char.IsLetter(name, 0) && name[0] != '_') {
MessageService.ShowError("Names must start with a letter or underscore.");
MessageService.ShowError("${res:SharpDevelop.Refactoring.InvalidNameStart}");
return false;
}
for (int i = 1; i < name.Length; i++) {
if (!char.IsLetterOrDigit(name, i) && name[i] != '_') {
MessageService.ShowError("Names may only contain letters, digits or underscores.");
MessageService.ShowError("${res:SharpDevelop.Refactoring.InvalidName}");
return false;
}
}

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save