Browse Source

Standard option dialogs

pull/30/head
PeterForstmeier 13 years ago
parent
commit
efc78ce461
  1. 2
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml.cs
  2. 6
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
  3. 23
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs

2
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml.cs

@ -38,7 +38,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -38,7 +38,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
protected override void Load(MSBuildBasedProject project, string configuration, string platform)
{
base.Load(project, configuration, platform);
string prop = GetProperty("ReferencePath", "", TextBoxEditMode.EditRawProperty).Value.ToString();
string prop = GetProperty("ReferencePath", "", TextBoxEditMode.EditRawProperty).Value;
string[] values = prop.Split(';');
if (values.Length == 1 && values[0].Length == 0) {

6
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml

@ -6,7 +6,11 @@ @@ -6,7 +6,11 @@
xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
xmlns:core="http://icsharpcode.net/sharpdevelop/core">
<optionpanels:ProjectOptionPanel.Resources>
<optionpanels:StorageLocationConverter x:Key="locationConverter" />
</optionpanels:ProjectOptionPanel.Resources>
<ScrollViewer VerticalScrollBarVisibility="Auto">
<StackPanel
Orientation="Vertical">

23
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml.cs

@ -30,9 +30,9 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -30,9 +30,9 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
InitializeComponent();
}
private void Initialize()
protected override void Initialize()
{
base.Initialize();
FindKeys(base.BaseDirectory);
SelectedKey = AssemblyOriginatorKeyFile.Value.Trim();
if (SelectedKey.Length > 0) {
@ -47,6 +47,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -47,6 +47,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
IsDirty = false;
}
public ProjectProperty<bool> SignAssembly {
get { return GetProperty("SignAssembly", false); }
}
@ -67,22 +68,14 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -67,22 +68,14 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
}
#region overrides
protected override void Load(MSBuildBasedProject project, string configuration, string platform)
{
base.Load(project, configuration, platform);
Initialize();
}
//
// protected override void Load(MSBuildBasedProject project, string configuration, string platform)
// {
// base.Load(project, configuration, platform);
// }
protected override bool Save(MSBuildBasedProject project, string configuration, string platform)
{
/*
helper.Saved += delegate {
if (Get<CheckBox>("signAssembly").Checked) {
helper.SetProperty("AssemblyOriginatorKeyMode", "File", true, signAssemblyBinding.Location);
}
};
*/
if (signAssemblyCheckBox.IsChecked == true) {
this.AssemblyOriginatorKeyFile.Value = "File";
}

Loading…
Cancel
Save