diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index 7af88ae50c..d73c849d86 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -33,7 +33,6 @@
-
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm
deleted file mode 100644
index ecc4feaf68..0000000000
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm
index 243d8737d9..3fdb8d9013 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm
@@ -1,189 +1,298 @@
-
-
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
+
+
-
+
-
-
+
-
-
-
-
+
+
+
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
+
-
-
-
+
+
-
+
+
-
+
+
-
-
-
-
+
+
+
+
-
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs
index 7eccb33a85..f010318e12 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs
@@ -1,180 +1,50 @@
//
// 2002-2005 AlphaSierraPapa
// GNU General Public License
-//
+//
// $Revision$
//
using System;
+using System.Collections.Generic;
using System.Windows.Forms;
-using ICSharpCode.SharpDevelop.Internal.ExternalTool;
+using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
+
+using StringPair = System.Collections.Generic.KeyValuePair;
namespace CSharpBinding.OptionPanels
{
- public class BuildOptions : AbstractOptionPanel
+ public class BuildOptions : AbstractBuildOptions
{
- CSharpProject project;
-
- public BuildOptions()
- {
- }
-
- void ShowAdvancedOptions(object sender, EventArgs e)
- {
- using (AdvancedBuildOptionsDialog advancedBuildOptionsDialog = new AdvancedBuildOptionsDialog(project)) {
- advancedBuildOptionsDialog.ShowDialog(WorkbenchSingleton.MainForm);
- }
- }
- string Config = "Debug";
- string Platform = "AnyCPU";
-
public override void LoadPanelContents()
{
- SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.BuildOptions.xfrm"));
- this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
-
- ConnectBrowseFolder("outputPathBrowseButton", "outputPathTextBox", "${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}");
- Get
-
diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
index 1b8e0e75e7..560c6ad9d1 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
@@ -248,6 +248,14 @@ namespace ICSharpCode.FormDesigner
UpdateSelectableObjects();
}
+ public override void Dispose()
+ {
+ if (IsFormDesignerVisible) {
+ Deselected();
+ }
+ base.Dispose();
+ }
+
public override void Deselected()
{
LoggingService.Info("Deselected form designer, unloading...");
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 720bab0363..209c535adb 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -187,7 +187,6 @@
Form
-
UserControl
@@ -465,10 +464,8 @@
-
-
@@ -613,7 +610,7 @@
-
+
UserControl
@@ -686,6 +683,12 @@
+
+
+
+
+
+
diff --git a/src/Main/Base/Project/Resources/CompileFileProjectOptions.xfrm b/src/Main/Base/Project/Resources/CompileFileProjectOptions.xfrm
deleted file mode 100644
index 717ac7ed9d..0000000000
--- a/src/Main/Base/Project/Resources/CompileFileProjectOptions.xfrm
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Main/Base/Project/Resources/DeployFileOptions.xfrm b/src/Main/Base/Project/Resources/DeployFileOptions.xfrm
deleted file mode 100644
index faaf737fa7..0000000000
--- a/src/Main/Base/Project/Resources/DeployFileOptions.xfrm
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Main/Base/Project/Resources/ProjectOptions/CreateKey.xfrm b/src/Main/Base/Project/Resources/ProjectOptions/CreateKey.xfrm
new file mode 100644
index 0000000000..bce4e5eb40
--- /dev/null
+++ b/src/Main/Base/Project/Resources/ProjectOptions/CreateKey.xfrm
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Main/Base/Project/Resources/ProjectOptions/Publish.xfrm b/src/Main/Base/Project/Resources/ProjectOptions/Publish.xfrm
index d32a0042f6..5dee14a5da 100644
--- a/src/Main/Base/Project/Resources/ProjectOptions/Publish.xfrm
+++ b/src/Main/Base/Project/Resources/ProjectOptions/Publish.xfrm
@@ -1,250 +1,234 @@
-
-
+
-
-
+
+
+
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
-
-
-
-
-
-
-
+
-
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
-
-
+
+
+
-
+
+
+
-
-
-
+
+
-
-
+
+
+
-
+
+
-
-
-
+
+
+
-
+
-
+
+
+
-
-
+
-
-
+
+
-
-
+
-
-
+
+
-
-
+
-
-
+
+
-
-
+
-
-
+
-
\ No newline at end of file
+
diff --git a/src/Main/Base/Project/Resources/ProjectOptions/Signing.xfrm b/src/Main/Base/Project/Resources/ProjectOptions/Signing.xfrm
index a7a77ded2a..fd856684f0 100644
--- a/src/Main/Base/Project/Resources/ProjectOptions/Signing.xfrm
+++ b/src/Main/Base/Project/Resources/ProjectOptions/Signing.xfrm
@@ -1,104 +1,95 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/src/Main/Base/Project/Src/Dom/XmlDoc.cs b/src/Main/Base/Project/Src/Dom/XmlDoc.cs
index b060a9c338..2decfaa575 100644
--- a/src/Main/Base/Project/Src/Dom/XmlDoc.cs
+++ b/src/Main/Base/Project/Src/Dom/XmlDoc.cs
@@ -117,25 +117,39 @@ namespace ICSharpCode.SharpDevelop.Dom
fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
int len = (int)fs.Length;
loader = new BinaryReader(fs);
- if (loader.ReadInt64() != magic) {
- LoggingService.Warn("Cannot load XmlDoc: wrong magic");
- return false;
- }
- if (loader.ReadInt16() != version) {
- LoggingService.Warn("Cannot load XmlDoc: wrong version");
- return false;
- }
- if (loader.ReadInt64() != fileDate.Ticks) {
- LoggingService.Info("Not loading XmlDoc: file changed since cache was created");
+ try {
+ if (loader.ReadInt64() != magic) {
+ LoggingService.Warn("Cannot load XmlDoc: wrong magic");
+ return false;
+ }
+ if (loader.ReadInt16() != version) {
+ LoggingService.Warn("Cannot load XmlDoc: wrong version");
+ return false;
+ }
+ if (loader.ReadInt64() != fileDate.Ticks) {
+ LoggingService.Info("Not loading XmlDoc: file changed since cache was created");
+ return false;
+ }
+ int indexStartPosition = loader.ReadInt32(); // go to start of index
+ if (indexStartPosition >= len) {
+ LoggingService.Error("XmlDoc: Cannot find index, cache invalid!");
+ return false;
+ }
+ fs.Position = indexStartPosition;
+ while (fs.Position < len) {
+ string key = loader.ReadString();
+ int pos = loader.ReadInt32();
+ indexDictionary.Add(key, pos);
+ }
+ if (fs.Position > len) {
+ LoggingService.Error("XmlDoc: Jumped over end of file, cache invalid!");
+ return false;
+ }
+ return true;
+ } catch (Exception ex) {
+ LoggingService.Error("Cannot load from cache", ex);
return false;
}
- fs.Position = loader.ReadInt32(); // go to start of index
- while (fs.Position < len) {
- string key = loader.ReadString();
- int pos = loader.ReadInt32();
- indexDictionary.Add(key, pos);
- }
- return true;
}
string LoadDocumentation(string key)
@@ -216,7 +230,12 @@ namespace ICSharpCode.SharpDevelop.Dom
if (doc.xmlDescription.Count > cacheLength * 2) {
LoggingService.Debug("XmlDoc: Creating cache");
DateTime date = File.GetLastWriteTimeUtc(fileName);
- doc.Save(cacheName, date);
+ try {
+ doc.Save(cacheName, date);
+ } catch (Exception ex) {
+ LoggingService.Error("Cannot write to cache file", ex);
+ return doc;
+ }
doc.Dispose();
doc = new XmlDoc();
doc.LoadFromBinary(cacheName, date);
diff --git a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
index 216e374a05..dd47575de8 100644
--- a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
+++ b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
@@ -61,6 +61,14 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
+ public override void Dispose()
+ {
+ foreach (ISecondaryViewContent svc in secondaryViewContents) {
+ svc.Dispose();
+ }
+ base.Dispose();
+ }
+
public AbstractViewContent()
{
}
diff --git a/src/Main/Base/Project/Src/Gui/ContentInterfaces/ICanBeDirty.cs b/src/Main/Base/Project/Src/Gui/ContentInterfaces/ICanBeDirty.cs
new file mode 100644
index 0000000000..7e4f1e6c43
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/ContentInterfaces/ICanBeDirty.cs
@@ -0,0 +1,32 @@
+/*
+ * Created by SharpDevelop.
+ * User: Daniel Grunwald
+ * Date: 19.08.2005
+ * Time: 18:25
+ */
+
+using System;
+
+namespace ICSharpCode.SharpDevelop.Gui
+{
+ ///
+ /// Description of ICanBeDirty.
+ ///
+ public interface ICanBeDirty
+ {
+ ///
+ /// If this property returns true the content has changed since
+ /// the last load/save operation.
+ ///
+ bool IsDirty {
+ get;
+ set;
+ }
+
+ ///
+ /// Is called when the content is changed after a save/load operation
+ /// and this signals that changes could be saved.
+ ///
+ event EventHandler DirtyChanged;
+ }
+}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
index 51f8fa6907..87db54ccb7 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
@@ -92,6 +92,8 @@ namespace ICSharpCode.SharpDevelop.Gui
return true;
}
+ protected string baseDirectory;
+
protected void ConnectBrowseButton(string browseButton, string target)
{
ConnectBrowseButton(browseButton, target, "${res:SharpDevelop.FileFilter.AllFiles}|*.*");
@@ -113,7 +115,7 @@ namespace ICSharpCode.SharpDevelop.Gui
protected void ConnectBrowseFolder(string browseButton, string target)
{
- // TODO: Translation:
+ // TODO: Translation:
ConnectBrowseFolder(browseButton, target, "Select folder");
}
protected void ConnectBrowseFolder(string browseButton, string target, string description)
@@ -130,7 +132,7 @@ namespace ICSharpCode.SharpDevelop.Gui
ControlDictionary[browseButton].Click += new EventHandler(new BrowseFolderEvent(this, target, description).Event);
}
- class BrowseButtonEvent
+ protected class BrowseButtonEvent
{
AbstractOptionPanel panel;
string target;
@@ -150,7 +152,11 @@ namespace ICSharpCode.SharpDevelop.Gui
fdiag.Multiselect = false;
if(fdiag.ShowDialog() == DialogResult.OK) {
- panel.ControlDictionary[target].Text = fdiag.FileName;
+ string file = fdiag.FileName;
+ if (panel.baseDirectory != null) {
+ file = FileUtility.GetRelativePath(panel.baseDirectory, file);
+ }
+ panel.ControlDictionary[target].Text = file;
}
}
}
@@ -171,9 +177,15 @@ namespace ICSharpCode.SharpDevelop.Gui
public void Event(object sender, EventArgs e)
{
- FolderDialog fdiag = new FolderDialog();
+ FolderDialog fdiag = new FolderDialog();
if (fdiag.DisplayDialog(description) == DialogResult.OK) {
- panel.ControlDictionary[target].Text = fdiag.Path;
+ string path = fdiag.Path;
+ if (panel.baseDirectory != null) {
+ path = FileUtility.GetRelativePath(panel.baseDirectory, path);
+ }
+ if (!path.EndsWith("\\") && !path.EndsWith("/"))
+ path += "\\";
+ panel.ControlDictionary[target].Text = path;
}
}
}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/FolderDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/FolderDialog.cs
index 52463351bf..b70e26e746 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/FolderDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/FolderDialog.cs
@@ -26,24 +26,17 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
- public FolderDialog()
- {
- }
-
- public DialogResult DisplayDialog()
- {
- return DisplayDialog("Select the directory in which the project will be created.");
- }
-
// Alain VIZZINI reminded me to try out the .NET folder browser, because
// the my documents bug seemed to have gone away ...
public DialogResult DisplayDialog(string description)
{
using (FolderBrowser folderBrowser = new FolderBrowser()) {
-
folderBrowser.Description = StringParser.Parse(description);
DialogResult result = folderBrowser.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
path = folderBrowser.DirectoryPath;
+ LoggingService.Info("FolderDialog: user has choosen path " + path);
+ if (path == null || path.Length == 0)
+ return DialogResult.Cancel;
return result;
}
}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
index 792d20a932..1e70823995 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
@@ -348,7 +348,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
{
// Changes Shankar
FolderDialog fd = new FolderDialog();
- if (fd.DisplayDialog() == DialogResult.OK) {
+ if (fd.DisplayDialog("Select the directory in which the project will be created.") == DialogResult.OK) {
((TextBox)ControlDictionary["locationTextBox"]).Text = fd.Path;
}
// End
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs
new file mode 100644
index 0000000000..a776ecd8df
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs
@@ -0,0 +1,149 @@
+//
+// 2002-2005 AlphaSierraPapa
+// GNU General Public License
+//
+// $Revision$
+//
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.XmlForms;
+
+using StringPair = System.Collections.Generic.KeyValuePair;
+
+namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
+{
+ public class AbstractBuildOptions : AbstractProjectOptionPanel
+ {
+ protected void InitOutputPath()
+ {
+ helper.BindString("outputPathTextBox", "OutputPath");
+ ConnectBrowseFolder("outputPathBrowseButton", "outputPathTextBox", "${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}");
+ }
+
+ protected void InitXmlDoc()
+ {
+ helper.BindString("xmlDocumentationTextBox", "DocumentationFile");
+ Get("xmlDocumentation").Checked = Get("xmlDocumentation").Text.Length > 0;
+ Get("xmlDocumentation").CheckedChanged += new EventHandler(UpdateXmlEnabled);
+ Get("xmlDocumentation").Enabled = Get("xmlDocumentation").Checked;
+ }
+
+ void UpdateXmlEnabled(object sender, EventArgs e)
+ {
+ Get("xmlDocumentation").Enabled = Get("xmlDocumentation").Checked;
+ if (Get("xmlDocumentation").Checked && Get("xmlDocumentation").Text.Length == 0) {
+ Get("xmlDocumentation").Text = FileUtility.GetRelativePath(baseDirectory, project.OutputAssemblyFullPath) + ".xml";
+ } else {
+ Get("xmlDocumentation").Text = "";
+ }
+ }
+
+ protected void InitWarnings()
+ {
+ helper.BindStringEnum("warningLevelComboBox", "WarningLevel",
+ "4",
+ new StringPair("0", "0"),
+ new StringPair("1", "1"),
+ new StringPair("2", "2"),
+ new StringPair("3", "3"),
+ new StringPair("4", "4"));
+ helper.BindString("suppressWarningsTextBox", "NoWarn");
+
+ helper.AddBinding("TreatWarningsAsErrors", new WarningsAsErrorsBinding(this));
+ helper.BindString("specificWarningsTextBox", "WarningsAsErrors"); // must be saved AFTER TreatWarningsAsErrors
+
+ Get("specificWarnings").CheckedChanged += new EventHandler(UpdateWarningChecked);
+
+ UpdateWarningChecked(this, EventArgs.Empty);
+ }
+
+ void UpdateWarningChecked(object sender, EventArgs e)
+ {
+ Get("specificWarnings").Enabled = Get("specificWarnings").Checked;
+ }
+
+ protected class WarningsAsErrorsBinding : ConfigurationGuiBinding
+ {
+ RadioButton none, specific, all;
+ Control specificWarningsTextBox;
+
+ public WarningsAsErrorsBinding(AbstractProjectOptionPanel panel)
+ {
+ this.none = panel.Get("none");
+ this.specific = panel.Get("specificWarnings");
+ this.all = panel.Get("all");
+ specificWarningsTextBox = panel.ControlDictionary["specificWarningsTextBox"];
+ }
+
+ public override void Load()
+ {
+ if (bool.Parse(Get("false"))) {
+ all.Checked = true;
+ } else {
+ if (this.Helper.GetProperty("WarningsAsErrors", "").Length > 0) {
+ specific.Checked = true;
+ } else {
+ none.Checked = true;
+ }
+ }
+ }
+
+ public override bool Save()
+ {
+ if (none.Checked) {
+ specificWarningsTextBox.Text = "";
+ }
+ if (all.Checked) {
+ Set("true");
+ } else {
+ Set("false");
+ }
+ return true;
+ }
+ }
+
+ protected void InitAdvanced()
+ {
+ helper.BindEnum("debugInfoComboBox", "DebugType");
+ helper.BindBoolean("registerCOMInteropCheckBox", "RegisterForComInterop", false);
+ helper.BindStringEnum("generateSerializationAssemblyComboBox", "GenerateSerializationAssemblies",
+ "Auto",
+ new StringPair("Off", "Off"),
+ new StringPair("On", "On"),
+ new StringPair("Auto", "Auto"));
+ helper.BindStringEnum("generateSerializationAssemblyComboBox", "GenerateSerializationAssemblies",
+ "Auto",
+ new StringPair("Off", "Off"),
+ new StringPair("On", "On"),
+ new StringPair("Auto", "Auto"));
+ helper.BindHexadecimal(Get("dllBaseAddress"), "BaseAddress", 0x400000);
+ helper.BindStringEnum("targetCpuComboBox", "PlatformTarget",
+ "AnyCPU",
+ new StringPair("AnyCPU", "${res:Dialog.ProjectOptions.Build.TargetCPU.Any}"),
+ new StringPair("x86", "${res:Dialog.ProjectOptions.Build.TargetCPU.x86}"),
+ new StringPair("x64", "${res:Dialog.ProjectOptions.Build.TargetCPU.x64}"),
+ new StringPair("Itanium", "${res:Dialog.ProjectOptions.Build.TargetCPU.Itanium}"));
+ }
+
+ public override bool StorePanelContents()
+ {
+ if (base.StorePanelContents()) {
+ if ((DebugSymbolType)Get("debugInfo").SelectedIndex == DebugSymbolType.Full) {
+ helper.SetProperty("DebugSymbols", "true");
+ } else {
+ helper.SetProperty("DebugSymbols", "false");
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractProjectOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractProjectOptionPanel.cs
new file mode 100644
index 0000000000..cba98212a6
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractProjectOptionPanel.cs
@@ -0,0 +1,48 @@
+//
+// 2002-2005 AlphaSierraPapa
+// GNU General Public License
+//
+// $Revision$
+//
+
+using System;
+using System.Windows.Forms;
+
+using ICSharpCode.SharpDevelop.Internal.ExternalTool;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Project;
+
+namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
+{
+ ///
+ /// Base class for project option panels that are using the .
+ ///
+ public abstract class AbstractProjectOptionPanel : AbstractOptionPanel, ICanBeDirty
+ {
+ protected ConfigurationGuiHelper helper;
+ protected MSBuildProject project;
+
+ protected void InitializeHelper()
+ {
+ project = (MSBuildProject)((Properties)CustomizationObject).Get("Project");
+ baseDirectory = project.Directory;
+ helper = new ConfigurationGuiHelper(project, this.ControlDictionary);
+ }
+
+ public bool IsDirty {
+ get { return helper.IsDirty; }
+ set { helper.IsDirty = value; }
+ }
+
+ public event EventHandler DirtyChanged {
+ add { helper.DirtyChanged += value; }
+ remove { helper.DirtyChanged -= value; }
+ }
+
+ public override bool StorePanelContents()
+ {
+ return helper.Save();
+ }
+ }
+}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
index 5f6ed5af19..cf92649e46 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
@@ -6,6 +6,7 @@
//
using System;
+using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
@@ -14,78 +15,46 @@ using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
-
+
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
- public class ApplicationSettings : AbstractOptionPanel
+ public class ApplicationSettings : AbstractProjectOptionPanel
{
- AdvancedMSBuildProject project;
-
- public ApplicationSettings()
- {
- }
-
public override void LoadPanelContents()
{
- SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.ApplicationSettings.xfrm"));
- this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
+ SetupFromXmlResource("ProjectOptions.ApplicationSettings.xfrm");
+
+ InitializeHelper();
ConnectBrowseButton("applicationIconBrowseButton", "applicationIconComboBox", "${res:SharpDevelop.FileFilter.Icons}|*.ico|${res:SharpDevelop.FileFilter.AllFiles}|*.*");
// TODO: Suitable file filter.
ConnectBrowseButton("win32ResourceFileBrowseButton", "win32ResourceFileComboBox");
- Get("assemblyName").Text = project.AssemblyName;
+ helper.BindString("assemblyNameTextBox", "AssemblyName");
Get("assemblyName").TextChanged += new EventHandler(RefreshOutputNameTextBox);
- Get("assemblyName").TextChanged += new EventHandler(Save);
-
- Get("rootNamespace").Text = project.RootNamespace;
- Get("rootNamespace").TextChanged += new EventHandler(Save);
- Get("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Exe}"));
- Get("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.WinExe}"));
- Get("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Library}"));
- Get("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Module}"));
+ helper.BindString("rootNamespaceTextBox", "RootNamespace");
- Get("outputType").SelectedIndex = (int)project.OutputType;
+ helper.BindEnum("outputTypeComboBox", "OutputType");
Get("outputType").SelectedIndexChanged += new EventHandler(RefreshOutputNameTextBox);
- Get("outputType").SelectedIndexChanged += new EventHandler(Save);
- Get("startupObject").Text = project.StartupObject;
- Get("startupObject").SelectedIndexChanged += new EventHandler(Save);
+ helper.BindString("startupObjectComboBox", "StartupObject");
- Get("applicationIcon").Text = project.ApplicationIcon;
+ helper.BindString("applicationIconComboBox", "ApplicationIcon");
Get("applicationIcon").TextChanged += new EventHandler(ApplicationIconComboBoxTextChanged);
- Get("applicationIcon").TextChanged += new EventHandler(Save);
- Get("win32ResourceFile").Text = project.Win32Resource;
- Get("win32ResourceFile").TextChanged += new EventHandler(Save);
+ helper.BindString("win32ResourceFileComboBox", "Win32Resource");
Get("projectFolder").Text = project.Directory;
Get("projectFile").Text = Path.GetFileName(project.FileName);
- Get("projectFile").TextChanged += new EventHandler(Save);
+
+ // maybe make this writable again? Needs special care when saving!
+ Get("projectFile").ReadOnly = true;
RefreshOutputNameTextBox(null, EventArgs.Empty);
}
- void Save(object sender, EventArgs e)
- {
- StorePanelContents();
- }
-
- public override bool StorePanelContents()
- {
- project.AssemblyName = Get("assemblyName").Text;
- project.RootNamespace = Get("rootNamespace").Text;
- project.OutputType = (OutputType)Get("outputType").SelectedIndex;
- project.StartupObject = Get("startupObject").Text;
- project.ApplicationIcon = Get("applicationIcon").Text;
- project.Win32Resource = Get("win32ResourceFile").Text;
- project.Name = Path.GetFileNameWithoutExtension(Get("projectFile").Text);
- project.Save();
- return true;
- }
-
void RefreshOutputNameTextBox(object sender, EventArgs e)
{
Get("outputName").Text = Get("assemblyName").Text + MSBuildProject.GetExtension((OutputType)Get("outputType").SelectedIndex);
@@ -93,9 +62,11 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
void ApplicationIconComboBoxTextChanged(object sender, EventArgs e)
{
- string applicationIcon = Get("applicationIcon").Text;
+ string applicationIcon = Path.Combine(baseDirectory, Get("applicationIcon").Text);
if (File.Exists(applicationIcon)) {
- Get("applicationIcon").Image = Image.FromFile(applicationIcon);
+ Get("applicationIcon").Image = Image.FromFile(applicationIcon);
+ } else {
+ Get("applicationIcon").Image = null;
}
}
}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.cs
index d924c9af20..bcb4b9e319 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.cs
@@ -15,13 +15,14 @@ using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
- public class BuildEvents : AbstractOptionPanel
+ public class BuildEvents : AbstractProjectOptionPanel
{
- AdvancedMSBuildProject project;
-
public override void LoadPanelContents()
{
- SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.BuildEvents.xfrm"));
+ SetupFromXmlResource("ProjectOptions.BuildEvents.xfrm");
+
+ InitializeHelper();
+
ConnectBrowseButton("preBuildEventBrowseButton",
"preBuildEventTextBox",
"${res:SharpDevelop.FileFilter.AllFiles}|*.*");
@@ -29,35 +30,9 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
"postBuildEventTextBox",
"${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
-
- Get("preBuildEvent").Text = project.PreBuildEvent;
- Get("preBuildEvent").TextChanged += new EventHandler(Save);
-
- Get("postBuildEvent").Text = project.PostBuildEvent;
- Get("postBuildEvent").TextChanged += new EventHandler(Save);
-
- Get("runPostBuildEvent").Items.Add("Always");
- Get("runPostBuildEvent").Items.Add("On successful build");
- Get("runPostBuildEvent").Items.Add("When the build updates the project output");
-
- Get("runPostBuildEvent").SelectedIndex = (int)project.RunPostBuildEvent;
- Get("runPostBuildEvent").SelectedIndexChanged += new EventHandler(Save);
-
- }
-
- void Save(object sender, EventArgs e)
- {
- StorePanelContents();
- }
-
- public override bool StorePanelContents()
- {
- project.PreBuildEvent = Get("preBuildEvent").Text;
- project.PostBuildEvent = Get("postBuildEvent").Text;
- project.RunPostBuildEvent = (RunPostBuildEvent)Get("runPostBuildEvent").SelectedIndex;
- project.Save();
- return true;
+ helper.BindString("preBuildEventTextBox", "PreBuildEvent");
+ helper.BindString("postBuildEventTextBox", "PostBuildEvent");
+ helper.BindEnum("runPostBuildEventComboBox", "RunPostBuildEvent");
}
}
}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs
new file mode 100644
index 0000000000..9cff219e6d
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs
@@ -0,0 +1,106 @@
+/*
+ * Created by SharpDevelop.
+ * User: Daniel Grunwald
+ * Date: 20.08.2005
+ * Time: 10:47
+ */
+
+using System;
+using System.Drawing;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Forms;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui.XmlForms;
+
+namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
+{
+ public class CreateKeyForm : BaseSharpDevelopForm
+ {
+ string baseDirectory;
+
+ public CreateKeyForm(string baseDirectory)
+ {
+ this.baseDirectory = baseDirectory;
+ SetupFromXmlResource("ProjectOptions.CreateKey.xfrm");
+ Get("usePassword").CheckedChanged += delegate {
+ ControlDictionary["passwordPanel"].Enabled = Get("usePassword").Checked;
+ };
+ ControlDictionary["okButton"].Click += OkButtonClick;
+ }
+
+ void OkButtonClick(object sender, EventArgs e)
+ {
+ KeyFile = KeyFile.Trim();
+ if (KeyFile.Length == 0) {
+ MessageService.ShowMessage("${res:Dialog.ProjectOptions.Signing.EnterKeyName}");
+ return;
+ }
+ bool usePassword = Get("usePassword").Checked;
+ if (usePassword) {
+ if (!CheckPassword(ControlDictionary["passwordTextBox"],
+ ControlDictionary["confirmPasswordTextBox"]))
+ {
+ return;
+ }
+ MessageService.ShowMessage("Creating a key file with a password is currently not supported.");
+ return;
+ }
+ if (!KeyFile.EndsWith(".snk") && !KeyFile.EndsWith(".pfx"))
+ KeyFile += ".snk";
+ if (CreateKey(Path.Combine(baseDirectory, KeyFile))) {
+ this.DialogResult = DialogResult.OK;
+ Close();
+ }
+ }
+
+ public static bool CreateKey(string keyPath)
+ {
+ if (File.Exists(keyPath)) {
+ string question = "${res:ICSharpCode.SharpDevelop.Internal.Templates.ProjectDescriptor.OverwriteQuestion}";
+ question = StringParser.Parse(question, new string[,] {{"fileName", keyPath}});
+ if (!MessageService.AskQuestion(question, "${res:ICSharpCode.SharpDevelop.Internal.Templates.ProjectDescriptor.OverwriteQuestion.InfoName}")) {
+ return false;
+ }
+ }
+ Process p = Process.Start(StrongNameTool, "-k \"" + keyPath + "\"");
+ p.WaitForExit();
+ if (p.ExitCode != 0) {
+ MessageService.ShowMessage("${res:Dialog.ProjectOptions.Signing.ErrorCreatingKey}");
+ return false;
+ }
+ return true;
+ }
+
+ public string KeyFile {
+ get {
+ return ControlDictionary["keyFileTextBox"].Text;
+ }
+ set {
+ ControlDictionary["keyFileTextBox"].Text = value;
+ }
+ }
+
+ public static bool CheckPassword(Control password, Control confirm)
+ {
+ password.Text = password.Text.Trim();
+ confirm.Text = confirm.Text.Trim();
+ if (password.Text.Length < 6) {
+ MessageService.ShowMessage("${res:Dialog.ProjectOptions.Signing.PasswordTooShort}");
+ password.Focus();
+ return false;
+ }
+ if (password.Text != confirm.Text) {
+ MessageService.ShowMessage("${res:Dialog.ProjectOptions.Signing.PasswordsDontMatch}");
+ return false;
+ }
+ return true;
+ }
+
+ public static string StrongNameTool {
+ get {
+ return FileUtility.NetSdkInstallRoot + "bin\\sn.exe";
+ }
+ }
+ }
+}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.cs
index 4d34a6819a..64e4478b3a 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.cs
@@ -13,83 +13,40 @@ using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
+using RadioBinding = System.Collections.Generic.KeyValuePair;
+
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
- public class DebugOptions : AbstractOptionPanel
+ public class DebugOptions : AbstractProjectOptionPanel
{
- AdvancedMSBuildProject project;
-
- string Config = "Debug";
- string Platform = "AnyCPU";
-
- public DebugOptions()
- {
- }
-
public override void LoadPanelContents()
{
- SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.DebugOptions.xfrm"));
+ SetupFromXmlResource("ProjectOptions.DebugOptions.xfrm");
ConnectBrowseButton("startExternalProgramBrowseButton", "startExternalProgramTextBox", "${res:SharpDevelop.FileFilter.AllFiles}|*.*");
ConnectBrowseFolder("workingDirectoryBrowseButton", "workingDirectoryTextBox");
- this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
-
- StartAction startAction = project.GetStartAction(Config, Platform);
-
- Get("startProject").Checked = startAction == StartAction.Project;
- Get("startProject").CheckedChanged += new EventHandler(UpdateEnabledStates);
- Get("startProject").CheckedChanged += new EventHandler(Save);
-
- Get("startExternalProgram").Checked = startAction == StartAction.Program;
- Get("startExternalProgram").CheckedChanged += new EventHandler(UpdateEnabledStates);
- Get("startExternalProgram").CheckedChanged += new EventHandler(Save);
- Get("startBrowserInURL").Checked = startAction == StartAction.StartURL;
- Get("startBrowserInURL").CheckedChanged += new EventHandler(UpdateEnabledStates);
- Get("startBrowserInURL").CheckedChanged += new EventHandler(Save);
+ InitializeHelper();
- Get("startExternalProgram").Text = project.GetStartProgram(Config, Platform);
- Get("startExternalProgram").TextChanged += new EventHandler(Save);
+ helper.BindRadioEnum("StartAction",
+ new RadioBinding(StartAction.Project, Get("startProject")),
+ new RadioBinding(StartAction.Program, Get("startExternalProgram")),
+ new RadioBinding(StartAction.StartURL, Get("startBrowserInURL")));
- Get("startBrowserInURL").Text = project.GetStartURL(Config, Platform);
- Get("startBrowserInURL").TextChanged += new EventHandler(Save);
+ Get("startExternalProgram").CheckedChanged += UpdateEnabledStates;
+ Get("startBrowserInURL").CheckedChanged += UpdateEnabledStates;
- Get("commandLineArguments").Text = project.GetStartArguments(Config, Platform);
- Get("commandLineArguments").TextChanged += new EventHandler(Save);
-
- Get("workingDirectory").Text = project.GetStartWorkingDirectory(Config, Platform);
- Get("workingDirectory").TextChanged += new EventHandler(Save);
+ helper.BindString("startExternalProgramTextBox", "StartProgram");
+ helper.BindString("startBrowserInURLTextBox", "StartURL");
+ helper.BindString("commandLineArgumentsTextBox", "StartArguments");
+ helper.BindString("workingDirectoryTextBox", "StartWorkingDirectory");
UpdateEnabledStates(this, EventArgs.Empty);
}
- void Save(object sender, EventArgs e)
- {
- StorePanelContents();
- }
-
void UpdateEnabledStates(object sender, EventArgs e)
{
Get("startExternalProgram").Enabled = Get