Browse Source

Fixed SD2-1058: Some string resources not parsed.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1818 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 20 years ago
parent
commit
aad7945bc0
  1. 2
      src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/ContextEntry.boo
  2. 6
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs
  3. 12
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
  4. 6
      src/AddIns/Misc/Debugger/Debugger.BooInterpreter/Project/Src/DebugeeInterpreterContext.cs

2
src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/ContextEntry.boo

@ -32,7 +32,7 @@ class ContextEntry:
_ctl.Dock = DockStyle.Fill _ctl.Dock = DockStyle.Fill
_item = ToolStripButton(StringParser.Parse(context.Title), context.Image) _item = ToolStripButton(StringParser.Parse(context.Title), context.Image)
_item.ToolTipText = context.ToolTipText _item.ToolTipText = StringParser.Parse(context.ToolTipText)
_item.Visible = context.Visible _item.Visible = context.Visible
_item.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText _item.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText

6
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs

@ -125,12 +125,12 @@ namespace ICSharpCode.SharpDevelop.Services
} catch (NotSupportedException) { } catch (NotSupportedException) {
string format = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.CannotSetValue.BadFormat"); string format = ResourceService.GetString("MainWindow.Windows.Debug.LocalVariables.CannotSetValue.BadFormat");
string msg = String.Format(format, newValue, val.ManagedType.ToString()); string msg = String.Format(format, newValue, val.ManagedType.ToString());
MessageService.ShowMessage(msg ,"${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}"); MessageService.ShowMessage(msg ,"${res:MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}");
} catch (COMException) { } catch (COMException) {
// COMException (0x80131330): Cannot perfrom SetValue on non-leaf frames. // COMException (0x80131330): Cannot perfrom SetValue on non-leaf frames.
// Happens if trying to set value after exception is breaked // Happens if trying to set value after exception is breaked
MessageService.ShowMessage("${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.UnknownError}", MessageService.ShowMessage("${res:MainWindow.Windows.Debug.LocalVariables.CannotSetValue.UnknownError}",
"${MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}"); "${res:MainWindow.Windows.Debug.LocalVariables.CannotSetValue.Title}");
} }
} }

12
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs

@ -81,10 +81,10 @@ namespace ICSharpCode.SharpDevelop.Services
#region IDebugger Members #region IDebugger Members
string errorDebugging = "${XML.MainMenu.DebugMenu.Error.Debugging}"; string errorDebugging = "${res:XML.MainMenu.DebugMenu.Error.Debugging}";
string errorNotDebugging = "${XML.MainMenu.DebugMenu.Error.NotDebugging}"; string errorNotDebugging = "${res:XML.MainMenu.DebugMenu.Error.NotDebugging}";
string errorProcessRunning = "${XML.MainMenu.DebugMenu.Error.ProcessRunning}"; string errorProcessRunning = "${res:XML.MainMenu.DebugMenu.Error.ProcessRunning}";
string errorProcessPaused = "${XML.MainMenu.DebugMenu.Error.ProcessPaused}"; string errorProcessPaused = "${res:XML.MainMenu.DebugMenu.Error.ProcessPaused}";
string errorCannotStepNoActiveFunction = "${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}"; string errorCannotStepNoActiveFunction = "${res:MainWindow.Windows.Debug.Threads.CannotStepNoActiveFunction}";
public bool IsDebugging { public bool IsDebugging {
@ -115,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")) {
MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.Net10NotSupported}"); MessageService.ShowMessage("${res:XML.MainMenu.DebugMenu.Error.Net10NotSupported}");
} else if (version == null || version.Length == 0) { } else if (version == null || version.Length == 0) {
MessageService.ShowMessage("${XML.MainMenu.DebugMenu.Error.BadAssembly}"); MessageService.ShowMessage("${res: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,

6
src/AddIns/Misc/Debugger/Debugger.BooInterpreter/Project/Src/DebugeeInterpreterContext.cs

@ -42,16 +42,16 @@ namespace Debugger
bool InjectInterpreter() bool InjectInterpreter()
{ {
if (!DebuggerService.IsDebuggerLoaded) { if (!DebuggerService.IsDebuggerLoaded) {
PrintLine("${res:ICSharpCode.BooInterpreter.Debuggee.ErrorDebuggerNotLoaded}"); PrintLine(ResourceService.GetString("ICSharpCode.BooInterpreter.Debuggee.ErrorDebuggerNotLoaded"));
return false; return false;
} }
WindowsDebugger winDebugger = DebuggerService.CurrentDebugger as WindowsDebugger; WindowsDebugger winDebugger = DebuggerService.CurrentDebugger as WindowsDebugger;
if (winDebugger == null) { if (winDebugger == null) {
PrintLine("${res:ICSharpCode.BooInterpreter.Debuggee.ErrorIncompatibleDebugger}"); PrintLine(ResourceService.GetString("ICSharpCode.BooInterpreter.Debuggee.ErrorIncompatibleDebugger"));
return false; return false;
} }
if (winDebugger.DebuggedProcess == null) { if (winDebugger.DebuggedProcess == null) {
PrintLine("${res:ICSharpCode.BooInterpreter.Debuggee.ErrorNoProgramDebugged}"); PrintLine(ResourceService.GetString("ICSharpCode.BooInterpreter.Debuggee.ErrorNoProgramDebugged"));
return false; return false;
} }
process = winDebugger.DebuggedProcess; process = winDebugger.DebuggedProcess;

Loading…
Cancel
Save