Browse Source

Don't show output pad when building.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5004 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
c39c8ddc05
  1. 3
      src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
  2. 20
      src/Main/Base/Project/Src/Project/BuildEngine.cs
  3. 2
      src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml.cs
  4. 1
      src/Main/Base/Project/Src/Project/Converter/UpgradeViewContent.cs

3
src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs

@ -301,9 +301,6 @@ namespace ICSharpCode.SharpDevelop.Gui
break; break;
} }
} }
//if (!this.IsVisible) {
// ActivateThisPad();
//}
} }
void SelectCategory(string categoryName, string text) void SelectCategory(string categoryName, string text)

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

@ -43,6 +43,7 @@ namespace ICSharpCode.SharpDevelop.Project
WorkbenchSingleton.AssertMainThread(); WorkbenchSingleton.AssertMainThread();
if (guiBuildProgressMonitor != null) { if (guiBuildProgressMonitor != null) {
BuildResults results = new BuildResults(); BuildResults results = new BuildResults();
StatusBarService.ShowErrorMessage(Core.ResourceService.GetString("MainWindow.CompilerMessages.MSBuildAlreadyRunning"));
results.Add(new BuildError(null, Core.ResourceService.GetString("MainWindow.CompilerMessages.MSBuildAlreadyRunning"))); results.Add(new BuildError(null, Core.ResourceService.GetString("MainWindow.CompilerMessages.MSBuildAlreadyRunning")));
results.Result = BuildResultCode.MSBuildAlreadyRunning; results.Result = BuildResultCode.MSBuildAlreadyRunning;
if (options.Callback != null) { if (options.Callback != null) {
@ -51,7 +52,7 @@ namespace ICSharpCode.SharpDevelop.Project
} else { } else {
guiBuildProgressMonitor = new CancellableProgressMonitor(StatusBarService.CreateProgressMonitor()); guiBuildProgressMonitor = new CancellableProgressMonitor(StatusBarService.CreateProgressMonitor());
guiBuildTrackedFeature = AnalyticsMonitorService.TrackFeature("Build"); guiBuildTrackedFeature = AnalyticsMonitorService.TrackFeature("Build");
Gui.WorkbenchSingleton.Workbench.GetPad(typeof(Gui.CompilerMessageView)).BringPadToFront(); StatusBarService.SetMessage(StringParser.Parse("${res:MainWindow.CompilerMessages.BuildVerb}..."));
ProjectService.RaiseEventBuildStarted(new BuildEventArgs(project, options)); ProjectService.RaiseEventBuildStarted(new BuildEventArgs(project, options));
StartBuild(project, options, StartBuild(project, options,
new MessageViewSink(TaskService.BuildMessageViewCategory), new MessageViewSink(TaskService.BuildMessageViewCategory),
@ -120,6 +121,21 @@ namespace ICSharpCode.SharpDevelop.Project
guiBuildTrackedFeature.EndTracking(); guiBuildTrackedFeature.EndTracking();
guiBuildTrackedFeature = null; guiBuildTrackedFeature = null;
} }
string message;
if (results.Result == BuildResultCode.Cancelled) {
message = "${res:MainWindow.CompilerMessages.BuildCancelled}";
} else {
if (results.Result == BuildResultCode.Success)
message = "${res:MainWindow.CompilerMessages.BuildFinished}";
else
message = "${res:MainWindow.CompilerMessages.BuildFailed}";
if (results.ErrorCount > 0)
message += " " + results.ErrorCount + " error(s)";
if (results.WarningCount > 0)
message += " " + results.WarningCount + " warning(s)";
}
StatusBarService.SetMessage(StringParser.Parse(message));
ProjectService.RaiseEventBuildFinished(new BuildEventArgs(buildable, options, results)); ProjectService.RaiseEventBuildFinished(new BuildEventArgs(buildable, options, results));
}); });
} }
@ -594,7 +610,7 @@ namespace ICSharpCode.SharpDevelop.Project
return; return;
buildIsCancelled = true; buildIsCancelled = true;
} }
results.Add(new BuildError(null, "Build was cancelled.")); results.Add(new BuildError(null, StringParser.Parse("${res:MainWindow.CompilerMessages.BuildCancelled}")));
} }
#endregion #endregion

2
src/Main/Base/Project/Src/Project/Converter/UpgradeView.xaml.cs

@ -209,6 +209,8 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
void convertButton_Click(object sender, RoutedEventArgs e) void convertButton_Click(object sender, RoutedEventArgs e)
{ {
Core.AnalyticsMonitorService.TrackFeature("UpgradeView.convertButton_Click");
CompilerVersion selectedCompiler = newVersionComboBox.SelectedValue as CompilerVersion; CompilerVersion selectedCompiler = newVersionComboBox.SelectedValue as CompilerVersion;
TargetFramework selectedFramework = newFrameworkComboBox.SelectedValue as TargetFramework; TargetFramework selectedFramework = newFrameworkComboBox.SelectedValue as TargetFramework;
if (selectedCompiler is UnchangedCompilerVersion) if (selectedCompiler is UnchangedCompilerVersion)

1
src/Main/Base/Project/Src/Project/Converter/UpgradeViewContent.cs

@ -19,6 +19,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
public static void ShowIfRequired(Solution solution) public static void ShowIfRequired(Solution solution)
{ {
if (solution.Projects.OfType<IUpgradableProject>().Any(u => u.UpgradeDesired)) { if (solution.Projects.OfType<IUpgradableProject>().Any(u => u.UpgradeDesired)) {
Core.AnalyticsMonitorService.TrackFeature("UpgradeView opened automatically");
WorkbenchSingleton.Workbench.ShowView(new UpgradeViewContent(solution)); WorkbenchSingleton.Workbench.ShowView(new UpgradeViewContent(solution));
} }
} }

Loading…
Cancel
Save