Browse Source

Fixed NullReferenceException in MenuService.ConvertSubItems.

Add some strings to the translation database.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3289 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
eef3790770
  1. 2
      AddIns/ICSharpCode.SharpDevelop.addin
  2. BIN
      data/resources/StringResources.de.resources
  3. BIN
      data/resources/StringResources.es-mx.resources
  4. BIN
      data/resources/StringResources.es.resources
  5. BIN
      data/resources/StringResources.nl.resources
  6. 4
      src/Main/Base/Project/Resources/ProjectAndSolutionOptionsPanel.xfrm
  7. 4
      src/Main/Base/Project/Src/Project/BuildEngine.cs
  8. 14
      src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs
  9. 6
      src/Main/ICSharpCode.Core.WinForms/Menu/MenuService.cs
  10. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

2
AddIns/ICSharpCode.SharpDevelop.addin

@ -410,7 +410,7 @@
label = "${res:ProjectComponent.ContextMenu.ExcludeFileFromProject}" label = "${res:ProjectComponent.ContextMenu.ExcludeFileFromProject}"
class = "ICSharpCode.SharpDevelop.Project.Commands.ExcludeFileFromProject"/> class = "ICSharpCode.SharpDevelop.Project.Commands.ExcludeFileFromProject"/>
<MenuItem id = "ExecuteCustomTool" <MenuItem id = "ExecuteCustomTool"
label = "Execute custom tool" label = "${res:ProjectComponent.ContextMenu.ExecuteCustomTool}"
class = "ICSharpCode.SharpDevelop.Project.ExecuteCustomToolCommand"/> class = "ICSharpCode.SharpDevelop.Project.ExecuteCustomToolCommand"/>
</Condition> </Condition>

BIN
data/resources/StringResources.de.resources

Binary file not shown.

BIN
data/resources/StringResources.es-mx.resources

Binary file not shown.

BIN
data/resources/StringResources.es.resources

Binary file not shown.

BIN
data/resources/StringResources.nl.resources

Binary file not shown.

4
src/Main/Base/Project/Resources/ProjectAndSolutionOptionsPanel.xfrm

@ -65,7 +65,7 @@
<System.Windows.Forms.Label> <System.Windows.Forms.Label>
<Name value="label2" /> <Name value="label2" />
<Location value="9, 95" /> <Location value="9, 95" />
<Text value="When running:" /> <Text value="${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.WhenRunning}" />
<Size value="100, 23" /> <Size value="100, 23" />
<TabIndex value="14" /> <TabIndex value="14" />
</System.Windows.Forms.Label> </System.Windows.Forms.Label>
@ -81,7 +81,7 @@
<System.Windows.Forms.Label> <System.Windows.Forms.Label>
<Name value="label1" /> <Name value="label1" />
<Location value="9, 68" /> <Location value="9, 68" />
<Text value="Number of projects to build in parallel:" /> <Text value="${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.ParallelBuild}" />
<Size value="212, 23" /> <Size value="212, 23" />
<TextAlign value="TopRight" /> <TextAlign value="TopRight" />
<TabIndex value="12" /> <TabIndex value="12" />

4
src/Main/Base/Project/Src/Project/BuildEngine.cs

@ -505,7 +505,7 @@ namespace ICSharpCode.SharpDevelop.Project
if (buildIsCancelled) { if (buildIsCancelled) {
results.Result = BuildResultCode.Cancelled; results.Result = BuildResultCode.Cancelled;
ReportMessageInternal("Build was cancelled."); ReportMessageInternal("${res:MainWindow.CompilerMessages.BuildCancelled}");
} else if (rootNode.hasErrors) { } else if (rootNode.hasErrors) {
results.Result = BuildResultCode.Error; results.Result = BuildResultCode.Error;
@ -622,7 +622,7 @@ namespace ICSharpCode.SharpDevelop.Project
{ {
lock (this) { lock (this) {
if (progressMonitor != null) { if (progressMonitor != null) {
progressMonitor.TaskName = "Building " progressMonitor.TaskName = "${res:MainWindow.CompilerMessages.BuildVerb} "
+ projectsCurrentlyBuilding.Select(n => n.project.Name).Join(", ") + projectsCurrentlyBuilding.Select(n => n.project.Name).Join(", ")
+ "..."; + "...";
} }

14
src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs

@ -16,14 +16,13 @@ namespace ICSharpCode.SharpDevelop.Project
{ {
public enum BuildOnExecuteSetting public enum BuildOnExecuteSetting
{ {
// TODO: translate [Description("${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.WhenRunning.DoNotBuild}")]
[Description("Do not build")]
DoNotBuild, DoNotBuild,
[Description("Build modified projects only")] [Description("${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.WhenRunning.BuildOnlyModified}")]
BuildOnlyModified, BuildOnlyModified,
[Description("Build modified projects and projects depending on them")] [Description("${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.WhenRunning.BuildModifiedAndDependent}")]
BuildModifiedAndDependent, BuildModifiedAndDependent,
[Description("Build all projects")] [Description("${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.WhenRunning.RegularBuild}")]
RegularBuild RegularBuild
} }
@ -200,7 +199,10 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
if (isUnmodified) { if (isUnmodified) {
feedbackSink.ReportMessage("Skipped " + p.Name + " (no changes inside SharpDevelop)"); feedbackSink.ReportMessage(
StringParser.Parse("${res:MainWindow.CompilerMessages.SkipProjectNoChanges}",
new string[,] {{ "Name", p.Name }})
);
feedbackSink.Done(true); feedbackSink.Done(true);
} else { } else {
wasRecompiled = true; wasRecompiled = true;

6
src/Main/ICSharpCode.Core.WinForms/Menu/MenuService.cs

@ -61,8 +61,10 @@ namespace ICSharpCode.Core.WinForms
internal static ArrayList ConvertSubItems(IList items) internal static ArrayList ConvertSubItems(IList items)
{ {
ArrayList r = new ArrayList(); ArrayList r = new ArrayList();
foreach (MenuItemDescriptor descriptor in items) { if (items != null) {
r.Add(CreateMenuItemFromDescriptor(descriptor)); foreach (MenuItemDescriptor descriptor in items) {
r.Add(CreateMenuItemFromDescriptor(descriptor));
}
} }
return r; return r;
} }

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

Binary file not shown.
Loading…
Cancel
Save