pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
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 21 years ago
parent
937991a230
commit
b691598427
6 changed files with 30 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

29
src/Main/Base/Project/Src/Commands/ClassMemberMenuBuilder.cs
Unescape View File

@ -36,22 +36,22 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
List<ToolStripItem> list = new List<ToolStripItem>(); List<ToolStripItem> list = new List<ToolStripItem>();
if (method == null || !method.IsConstructor) { if (method == null || !method.IsConstructor) {
cmd = new MenuCommand("&Rename", Rename); cmd = new MenuCommand("${res:SharpDevelop.Refactoring.RenameCommand}", Rename);
cmd.Tag = member; cmd.Tag = member;
list.Add(cmd); list.Add(cmd);
} }
if (member.IsOverride) { if (member.IsOverride) {
cmd = new MenuCommand("Go to &base class", GoToBase); cmd = new MenuCommand("${res:SharpDevelop.Refactoring.GoToBaseClassCommand}", GoToBase);
cmd.Tag = member; cmd.Tag = member;
list.Add(cmd); list.Add(cmd);
} }
if (member.IsVirtual || member.IsAbstract || (member.IsOverride && !member.DeclaringType.IsSealed)) { 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; cmd.Tag = member;
list.Add(cmd); list.Add(cmd);
} }
cmd = new MenuCommand("&Find references", FindReferences); cmd = new MenuCommand("${res:SharpDevelop.Refactoring.FindReferencesCommand}", FindReferences);
cmd.Tag = member; cmd.Tag = member;
list.Add(cmd); list.Add(cmd);
@ -66,14 +66,14 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
} }
} }
if (foundProperty != null) { if (foundProperty != null) {
cmd = new MenuCommand("Go to &property", GotoProperty); cmd = new MenuCommand("${res:SharpDevelop.Refactoring.GoToProperty}", GotoProperty);
cmd.Tag = member; cmd.Tag = foundProperty;
list.Add(cmd); list.Add(cmd);
} else { } else {
cmd = new MenuCommand("Create &getter", CreateGetter); cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateGetter}", CreateGetter);
cmd.Tag = member; cmd.Tag = member;
list.Add(cmd); list.Add(cmd);
cmd = new MenuCommand("Create &property", CreateProperty); cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateProperty}", CreateProperty);
cmd.Tag = member; cmd.Tag = member;
list.Add(cmd); list.Add(cmd);
} }
@ -116,16 +116,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
void GotoProperty(object sender, EventArgs e) void GotoProperty(object sender, EventArgs e)
{ {
MenuCommand item = (MenuCommand)sender; JumpToDefinition((IMember)(sender as MenuCommand).Tag);
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;
}
}
} }
void GoToBase(object sender, EventArgs e) void GoToBase(object sender, EventArgs e)
@ -142,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{ {
MenuCommand item = (MenuCommand)sender; MenuCommand item = (MenuCommand)sender;
IMember member = (IMember)item.Tag; 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; if (!CheckName(newName)) return;
List<Reference> list = RefactoringService.FindReferences(member, null); List<Reference> list = RefactoringService.FindReferences(member, null);

4
src/Main/Base/Project/Src/Services/RefactoringService/RefactoringService.cs
Unescape View File

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

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

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

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

@ -79,12 +79,12 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
if (name == null || name.Length == 0) if (name == null || name.Length == 0)
return false; return false;
if (!char.IsLetter(name, 0) && name[0] != '_') { 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; return false;
} }
for (int i = 1; i < name.Length; i++) { for (int i = 1; i < name.Length; i++) {
if (!char.IsLetterOrDigit(name, i) && name[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; return false;
} }
} }

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

Binary file not shown.
Write Preview
Loading…
Cancel
Save