pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Some debugger strings made translatable 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1807 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 20 years ago
parent
b1b229dedd
commit
b2634a3a87
8 changed files with 37 additions and 34 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. 6
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 4
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
  3. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs
  4. 14
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs
  5. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
  6. 8
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs
  7. 35
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
  8. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

6
AddIns/ICSharpCode.SharpDevelop.addin
Unescape View File

@ -901,11 +901,11 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/> class = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/>
<ToolbarItem id = "Step into" <ToolbarItem id = "Step into"
icon = "Icons.16x16.Debug.StepInto" icon = "Icons.16x16.Debug.StepInto"
tooltip = "${res:XML.MainMenu.DebugMenu.StepInto}" tooltip = "${res:XML.MainMenu.DebugMenu.StepInto.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.StepIntoDebuggingCommand"/> class = "ICSharpCode.SharpDevelop.Project.Commands.StepIntoDebuggingCommand"/>
<ToolbarItem id = "Step out" <ToolbarItem id = "Step out"
icon = "Icons.16x16.Debug.StepOut" icon = "Icons.16x16.Debug.StepOut"
tooltip = "${res:XML.MainMenu.DebugMenu.StepOut}" tooltip = "${res:XML.MainMenu.DebugMenu.StepOut.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand"/> class = "ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand"/>
</Condition> </Condition>
</Condition> </Condition>
@ -1470,7 +1470,7 @@
<Condition name="IsProcessRunning" isprocessrunning = "False" isdebugging = "True" action = "Disable"> <Condition name="IsProcessRunning" isprocessrunning = "False" isdebugging = "True" action = "Disable">
<MenuItem id = "BeforeSteppingSeparator" type = "Separator" /> <MenuItem id = "BeforeSteppingSeparator" type = "Separator" />
<MenuItem id = "Step over" <MenuItem id = "Step over"
label = "${res:XML.MainMenu.DebugMenu.Step}" label = "${res:XML.MainMenu.DebugMenu.StepOver}"
icon = "Icons.16x16.Debug.StepOver" icon = "Icons.16x16.Debug.StepOver"
shortcut = "F10" shortcut = "F10"
class = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/> class = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/>

4
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
Unescape View File

@ -136,7 +136,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
name += argValue; name += argValue;
} }
if (parameterName == null && argValue == null) { if (parameterName == null && argValue == null) {
name += "n/a"; name += ResourceService.GetString("Global.NA");
} }
if (i < f.ArgumentCount - 1) { if (i < f.ArgumentCount - 1) {
name += ", "; name += ", ";
@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
if (lastItemIsExternalMethod) { if (lastItemIsExternalMethod) {
continue; continue;
} else { } else {
item = new ListViewItem(new string[] { "[External methods]", "" }); item = new ListViewItem(new string[] { ResourceService.GetString("MainWindow.Windows.Debug.CallStack.ExternalMethods"), "" });
lastItemIsExternalMethod = true; lastItemIsExternalMethod = true;
} }
} }

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs
Unescape View File

@ -111,7 +111,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
if (exception.Location != null) { if (exception.Location != null) {
location = exception.Location.SourceFilename + ":" + exception.Location.StartLine; location = exception.Location.SourceFilename + ":" + exception.Location.StartLine;
} else { } else {
location = "n/a"; location = ResourceService.GetString("Global.NA");
} }
location += " (type=" + exception.ExceptionType.ToString() + ")"; location += " (type=" + exception.ExceptionType.ToString() + ")";
ListViewItem item = new ListViewItem(new string[] {exception.CreationTime.ToLongTimeString() , exception.Type + " - " + exception.Message, location}); ListViewItem item = new ListViewItem(new string[] {exception.CreationTime.ToLongTimeString() , exception.Type + " - " + exception.Message, location});

14
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs
Unescape View File

@ -66,13 +66,13 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
public override void RedrawContent() public override void RedrawContent()
{ {
name.Text = StringParser.Parse("${res:Global.Name}"); name.Text = StringParser.Parse("${res:Global.Name}");
address.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.AddressColumn}"); address.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.AddressColumn}");
path.Text = StringParser.Parse("${res:Global.Path}"); path.Text = StringParser.Parse("${res:Global.Path}");
order.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.OrderColumn}"); order.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.OrderColumn}");
version.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.VersionColumn}"); version.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.VersionColumn}");
program.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.ProgramColumn}"); program.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.ProgramColumn}");
timestamp.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.TimestampColumn}"); timestamp.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.TimestampColumn}");
information.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.InformationColumn}"); information.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.SymbolsColumn}");
} }
@ -119,7 +119,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
"", "",
"", "",
"", "",
StringParser.Parse(module.SymbolsLoaded ? "${res:MainWindow.Windows.Debug.HasSymbols}" : "${res:MainWindow.Windows.Debug.HasNoSymbols}") StringParser.Parse(module.SymbolsLoaded ? "${res:MainWindow.Windows.Debug.Modules.HasSymbols}" : "${res:MainWindow.Windows.Debug.Modules.HasNoSymbols}")
}); });
newItem.Tag = module; newItem.Tag = module;
loadedModulesList.Items.Add(newItem); loadedModulesList.Items.Add(newItem);

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
Unescape View File

@ -153,7 +153,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
if (location != null) { if (location != null) {
item.SubItems.Add(location.Name); item.SubItems.Add(location.Name);
} else { } else {
item.SubItems.Add("N/A"); item.SubItems.Add(ResourceService.GetString("Global.NA"));
} }
switch (thread.Priority) { switch (thread.Priority) {
case System.Threading.ThreadPriority.Highest: case System.Threading.ThreadPriority.Highest:

8
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs
Unescape View File

@ -122,7 +122,9 @@ namespace ICSharpCode.SharpDevelop.Services
try { try {
val.Primitive = newValue; val.Primitive = newValue;
} catch (NotSupportedException) { } catch (NotSupportedException) {
MessageBox.Show(WorkbenchSingleton.MainForm, "Can not covert " + newValue + " to " + val.ManagedType.ToString(), "Can not set value"); string format = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.CannotSetValue");
string msg = String.Format(format, newValue, val.ManagedType.ToString());
MessageService.ShowMessage(msg ,"${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}");
} }
} }
@ -133,7 +135,7 @@ namespace ICSharpCode.SharpDevelop.Services
ToolStripMenuItem copyItem; ToolStripMenuItem copyItem;
copyItem = new ToolStripMenuItem(); copyItem = new ToolStripMenuItem();
copyItem.Text = "Copy value to clipboard"; copyItem.Text = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.CopyToClipboard");
copyItem.Checked = false; copyItem.Checked = false;
copyItem.Click += delegate { copyItem.Click += delegate {
ClipboardWrapper.SetText(((DynamicListItem)sender).Text); ClipboardWrapper.SetText(((DynamicListItem)sender).Text);
@ -141,7 +143,7 @@ namespace ICSharpCode.SharpDevelop.Services
ToolStripMenuItem hewView; ToolStripMenuItem hewView;
hewView = new ToolStripMenuItem(); hewView = new ToolStripMenuItem();
hewView.Text = "Show values in hexadecimal"; hewView.Text = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.ShowInHexadecimal");
hewView.Checked = ShowValuesInHexadecimal; hewView.Checked = ShowValuesInHexadecimal;
hewView.Click += delegate { hewView.Click += delegate {
ShowValuesInHexadecimal = !ShowValuesInHexadecimal; ShowValuesInHexadecimal = !ShowValuesInHexadecimal;

35
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
Unescape View File

@ -81,10 +81,11 @@ namespace ICSharpCode.SharpDevelop.Services
#region IDebugger Members #region IDebugger Members
string errorDebugging = "Can not preform action because some process is debugged."; string errorDebugging = "${XML.MainMenu.DebugMenu.Error.Debugging}";
string errorNotDebugging = "Can not preform action because no process is debugged."; string errorNotDebugging = "${XML.MainMenu.DebugMenu.Error.NotDebugging}";
string errorProcessRunning = "Can not preform action because process is running."; string errorProcessRunning = "${XML.MainMenu.DebugMenu.Error.ProcessRunning}";
string errorProcessPaused = "Can not preform action because process is paused."; string errorProcessPaused = "${XML.MainMenu.DebugMenu.Error.ProcessPaused}";
string errorCannotStepNoActiveFunction = "${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}";
public bool IsDebugging { public bool IsDebugging {
get { get {
@ -114,9 +115,9 @@ namespace ICSharpCode.SharpDevelop.Services
} }
string version = debugger.GetProgramVersion(processStartInfo.FileName); string version = debugger.GetProgramVersion(processStartInfo.FileName);
if (version.StartsWith("v1.0")) { if (version.StartsWith("v1.0")) {
MessageBox.Show("Debugging of .NET Framework 1.0 programs is not supported"); MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.Net10NotSupported}");
} else if (version == null || version.Length == 0) { } else if (version == null || version.Length == 0) {
MessageBox.Show("Can not get .NET Framework version of program. Check that the program is managed assembly."); MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.BadAssembly}");
} else { } else {
Debugger.Process process = debugger.Start(processStartInfo.FileName, Debugger.Process process = debugger.Start(processStartInfo.FileName,
processStartInfo.WorkingDirectory, processStartInfo.WorkingDirectory,
@ -133,7 +134,7 @@ namespace ICSharpCode.SharpDevelop.Services
public void Stop() public void Stop()
{ {
if (!IsDebugging) { if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging); MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.Stop}");
return; return;
} }
debuggedProcess.Terminate(); debuggedProcess.Terminate();
@ -144,11 +145,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void Break() public void Break()
{ {
if (!IsDebugging) { if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging); MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.Break}");
return; return;
} }
if (!IsProcessRunning) { if (!IsProcessRunning) {
MessageService.ShowMessage(errorProcessPaused); MessageService.ShowMessage(errorProcessPaused, "${res:XML.MainMenu.DebugMenu.Break}");
return; return;
} }
debuggedProcess.Break(); debuggedProcess.Break();
@ -157,11 +158,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void Continue() public void Continue()
{ {
if (!IsDebugging) { if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging); MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.Continue}");
return; return;
} }
if (IsProcessRunning) { if (IsProcessRunning) {
MessageService.ShowMessage(errorProcessRunning); MessageService.ShowMessage(errorProcessRunning, "${res:XML.MainMenu.DebugMenu.Continue}");
return; return;
} }
debuggedProcess.Continue(); debuggedProcess.Continue();
@ -172,11 +173,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void StepInto() public void StepInto()
{ {
if (!IsDebugging) { if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging); MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepInto}");
return; return;
} }
if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) { if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage("${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}", "${res:XML.MainMenu.DebugMenu.StepInto}"); MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepInto}");
} else { } else {
debuggedProcess.StepInto(); debuggedProcess.StepInto();
} }
@ -185,11 +186,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void StepOver() public void StepOver()
{ {
if (!IsDebugging) { if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging); MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepOver}");
return; return;
} }
if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) { if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage("${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}", "${res:XML.MainMenu.DebugMenu.StepOver.Description}"); MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepOver}");
} else { } else {
debuggedProcess.StepOver(); debuggedProcess.StepOver();
} }
@ -198,11 +199,11 @@ namespace ICSharpCode.SharpDevelop.Services
public void StepOut() public void StepOut()
{ {
if (!IsDebugging) { if (!IsDebugging) {
MessageService.ShowMessage(errorNotDebugging); MessageService.ShowMessage(errorNotDebugging, "${res:XML.MainMenu.DebugMenu.StepOut}");
return; return;
} }
if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) { if (debuggedProcess.SelectedFunction == null || debuggedProcess.IsRunning) {
MessageService.ShowMessage("${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}", "${res:XML.MainMenu.DebugMenu.StepOut}"); MessageService.ShowMessage(errorCannotStepNoActiveFunction, "${res:XML.MainMenu.DebugMenu.StepOut}");
} else { } else {
debuggedProcess.StepOut(); debuggedProcess.StepOut();
} }

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

Binary file not shown.
Write Preview
Loading…
Cancel
Save