diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin index 04fa265a34..773e38c7df 100644 --- a/AddIns/ICSharpCode.SharpDevelop.addin +++ b/AddIns/ICSharpCode.SharpDevelop.addin @@ -977,6 +977,9 @@ + diff --git a/data/resources/StringResources.cz.resources b/data/resources/StringResources.cz.resources index 6d26686167..18fc13547a 100644 Binary files a/data/resources/StringResources.cz.resources and b/data/resources/StringResources.cz.resources differ diff --git a/data/resources/StringResources.de.resources b/data/resources/StringResources.de.resources index d022d44d74..ffba791988 100644 Binary files a/data/resources/StringResources.de.resources and b/data/resources/StringResources.de.resources differ diff --git a/data/resources/StringResources.hu.resources b/data/resources/StringResources.hu.resources index 7d85ae9a2a..e14d4ef9e0 100644 Binary files a/data/resources/StringResources.hu.resources and b/data/resources/StringResources.hu.resources differ diff --git a/data/resources/StringResources.it.resources b/data/resources/StringResources.it.resources index ceda57ef8d..f6a94fb11b 100644 Binary files a/data/resources/StringResources.it.resources and b/data/resources/StringResources.it.resources differ diff --git a/data/resources/StringResources.kr.resources b/data/resources/StringResources.kr.resources index 5b1844e6f0..cd5f97dc27 100644 Binary files a/data/resources/StringResources.kr.resources and b/data/resources/StringResources.kr.resources differ diff --git a/data/resources/StringResources.no.resources b/data/resources/StringResources.no.resources index aeab39ae05..1b49c8cbc3 100644 Binary files a/data/resources/StringResources.no.resources and b/data/resources/StringResources.no.resources differ diff --git a/data/resources/StringResources.pl.resources b/data/resources/StringResources.pl.resources index 57a3df244f..6eff96779e 100644 Binary files a/data/resources/StringResources.pl.resources and b/data/resources/StringResources.pl.resources differ diff --git a/data/resources/StringResources.pt-br.resources b/data/resources/StringResources.pt-br.resources index eb14768ba9..29350d352e 100644 Binary files a/data/resources/StringResources.pt-br.resources and b/data/resources/StringResources.pt-br.resources differ diff --git a/data/resources/StringResources.se.resources b/data/resources/StringResources.se.resources index 5890863492..c2e6da8d80 100644 Binary files a/data/resources/StringResources.se.resources and b/data/resources/StringResources.se.resources differ diff --git a/data/resources/StringResources.tr.resources b/data/resources/StringResources.tr.resources index 4717ce92dd..e256edcd62 100644 Binary files a/data/resources/StringResources.tr.resources and b/data/resources/StringResources.tr.resources differ diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs index ee3652d7ed..e69ced0b9d 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs @@ -657,15 +657,9 @@ namespace ICSharpCode.XmlEditor Category.AppendText(String.Concat(message, Environment.NewLine)); } - bool ShowErrorListAfterBuild { - get { - return PropertyService.Get("SharpDevelop.ShowErrorListAfterBuild", true); - } - } - void ShowErrorList() { - if (ShowErrorListAfterBuild && TaskService.SomethingWentWrong) { + if (ErrorListPad.ShowAfterBuild && TaskService.SomethingWentWrong) { WorkbenchSingleton.Workbench.GetPad(typeof(ErrorListPad)).BringPadToFront(); } } diff --git a/src/AddIns/Misc/CodeCoverage/Project/Src/RunTestWithCodeCoverageCommand.cs b/src/AddIns/Misc/CodeCoverage/Project/Src/RunTestWithCodeCoverageCommand.cs index 39a58ed280..09106a7c32 100644 --- a/src/AddIns/Misc/CodeCoverage/Project/Src/RunTestWithCodeCoverageCommand.cs +++ b/src/AddIns/Misc/CodeCoverage/Project/Src/RunTestWithCodeCoverageCommand.cs @@ -150,7 +150,7 @@ namespace ICSharpCode.CodeCoverage UnitTestApplicationStartHelper.DisplayResults(unitTestResultsFileName); DisplayCoverageResults(runner.CoverageResultsFileName); - if (TaskService.SomethingWentWrong) { + if (TaskService.SomethingWentWrong && ErrorListPad.ShowAfterBuild) { ShowErrorList(); } } diff --git a/src/AddIns/Misc/NAntAddIn/Project/Src/Commands/AbstractRunNAntCommand.cs b/src/AddIns/Misc/NAntAddIn/Project/Src/Commands/AbstractRunNAntCommand.cs index 3de1c32b03..750ea13850 100644 --- a/src/AddIns/Misc/NAntAddIn/Project/Src/Commands/AbstractRunNAntCommand.cs +++ b/src/AddIns/Misc/NAntAddIn/Project/Src/Commands/AbstractRunNAntCommand.cs @@ -290,14 +290,12 @@ namespace ICSharpCode.NAntAddIn.Commands } // Bring task list to front. - if (tasks.Count > 0) { - //if ((bool)PropertyService.Get("SharpDevelop.ShowTaskListAfterBuild", true)) { - IWorkbench workbench = ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.Workbench; - PadDescriptor padDescriptor = workbench.GetPad(typeof(ErrorListPad)); - if (padDescriptor != null) { - WorkbenchSingleton.SafeThreadAsyncCall(padDescriptor, "BringPadToFront"); - } - //} + if (tasks.Count > 0 && ErrorListPad.ShowAfterBuild) { + IWorkbench workbench = ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.Workbench; + PadDescriptor padDescriptor = workbench.GetPad(typeof(ErrorListPad)); + if (padDescriptor != null) { + WorkbenchSingleton.SafeThreadAsyncCall(padDescriptor, "BringPadToFront"); + } } } diff --git a/src/AddIns/Misc/UnitTesting/Src/PadContent.cs b/src/AddIns/Misc/UnitTesting/Src/PadContent.cs index 6aff7d93f8..c7706c8a37 100644 --- a/src/AddIns/Misc/UnitTesting/Src/PadContent.cs +++ b/src/AddIns/Misc/UnitTesting/Src/PadContent.cs @@ -202,7 +202,7 @@ namespace ICSharpCode.UnitTesting void ShowErrorList() { - if (TaskService.SomethingWentWrong) { + if (TaskService.SomethingWentWrong && ErrorListPad.ShowAfterBuild) { WorkbenchSingleton.Workbench.GetPad(typeof(ErrorListPad)).BringPadToFront(); } } diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 029db00a32..e200faa0d7 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -755,6 +755,8 @@ Configuration\GlobalAssemblyInfo.cs + + diff --git a/src/Main/Base/Project/Resources/ProjectAndSolutionOptionsPanel.xfrm b/src/Main/Base/Project/Resources/ProjectAndSolutionOptionsPanel.xfrm new file mode 100644 index 0000000000..158d2977b8 --- /dev/null +++ b/src/Main/Base/Project/Resources/ProjectAndSolutionOptionsPanel.xfrm @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndSolutionOptionsPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndSolutionOptionsPanel.cs new file mode 100644 index 0000000000..28e184b60e --- /dev/null +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndSolutionOptionsPanel.cs @@ -0,0 +1,63 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.IO; +using System.Drawing; +using System.Collections; +using System.Windows.Forms; + +using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.Core; + +namespace ICSharpCode.SharpDevelop.Gui.OptionPanels +{ + public class ProjectAndSolutionOptionsPanel : AbstractOptionPanel + { + public override void LoadPanelContents() + { + SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectAndSolutionOptionsPanel.xfrm")); + + // read properties + ControlDictionary["projectLocationTextBox"].Text = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", + Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), + "SharpDevelop Projects")).ToString(); + + ((CheckBox)ControlDictionary["loadPrevProjectCheckBox"]).Checked = PropertyService.Get("SharpDevelop.LoadPrevProjectOnStartup", false); + ((CheckBox)ControlDictionary["showErrorListCheckBox"]).Checked = ErrorListPad.ShowAfterBuild; + + ((Button)ControlDictionary["selectProjectLocationButton"]).Click += new EventHandler(SelectProjectLocationButtonClicked); + } + + public override bool StorePanelContents() + { + // check for correct settings + string projectPath = ControlDictionary["projectLocationTextBox"].Text; + if (projectPath.Length > 0) { + if (!FileUtility.IsValidFileName(projectPath)) { + MessageService.ShowError(StringParser.Parse("${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.InvalidProjectPathSpecified}")); + return false; + } + } + + // set properties + PropertyService.Set("ICSharpCode.SharpDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", projectPath); + PropertyService.Set("SharpDevelop.LoadPrevProjectOnStartup", ((CheckBox)ControlDictionary["loadPrevProjectCheckBox"]).Checked); + ErrorListPad.ShowAfterBuild = ((CheckBox)ControlDictionary["showErrorListCheckBox"]).Checked; + + return true; + } + + void SelectProjectLocationButtonClicked(object sender, EventArgs e) + { + FolderDialog fdiag = new FolderDialog(); + if (fdiag.DisplayDialog(StringParser.Parse("${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.SelectDefaultProjectLocationDialog.Title}")) == DialogResult.OK) { + ControlDictionary["projectLocationTextBox"].Text = fdiag.Path; + } + } + } +} diff --git a/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs b/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs index a7fe9f2d4a..2448372304 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs @@ -65,6 +65,15 @@ namespace ICSharpCode.SharpDevelop.Gui } } + public static bool ShowAfterBuild { + get { + return PropertyService.Get("SharpDevelop.ShowErrorListAfterBuild", true); + } + set { + PropertyService.Set("SharpDevelop.ShowErrorListAfterBuild", value); + } + } + public override Control Control { get { return contentPanel; @@ -124,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.Gui void ProjectServiceEndBuild(object sender, EventArgs e) { - if (TaskService.TaskCount > 0) { + if (TaskService.TaskCount > 0 && ShowAfterBuild) { WorkbenchSingleton.Workbench.WorkbenchLayout.ActivatePad(this.GetType().FullName); } UpdateToolstripStatus(); diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs index a45bf18c3c..eaf5e64c7f 100644 --- a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs @@ -64,7 +64,7 @@ namespace ICSharpCode.SharpDevelop.Project LastErrorCount++; } TaskService.InUpdate = false; - if (results.Errors.Count > 0) { + if (results.Errors.Count > 0 && ErrorListPad.ShowAfterBuild) { WorkbenchSingleton.Workbench.GetPad(typeof(ErrorListPad)).BringPadToFront(); } } diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources index 21de743980..5cbdc181a0 100644 Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ