Remove unused Files

icsharpcode · Jun 5, 2012 · ad6fe17 · ad6fe17
1 parent 97a012d
commit ad6fe17
Show file tree

Hide file tree

Showing 10 changed files with 659 additions and 100 deletions.
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -80,13 +80,14 @@
 		<OptionPanel id    = "ReferencePaths"
 		             label = "${res:Dialog.ProjectOptions.ReferencePaths}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
+
 		<OptionPanel id    = "Signing"
 		             label = "${res:Dialog.ProjectOptions.Signing}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
 
-		<OptionPanel id    = "Signing1"
+		<!--<OptionPanel id    = "Signing1"
 		             label = "${res:Dialog.ProjectOptions.Signing}"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SigningXaml"/>
+		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SigningXaml"/>-->
 
 
 		<OptionPanel id    = "BuildEvents"

diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -274,8 +274,8 @@
       <DependentUpon>ApplicationSettings.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\CreateKeyXaml.xaml.cs">
-      <DependentUpon>CreateKeyXaml.xaml</DependentUpon>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\CreateKey.xaml.cs">
+      <DependentUpon>CreateKey.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.xaml.cs">
@@ -289,8 +289,8 @@
       <DependentUpon>ReferencePaths.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\SigningXaml.xaml.cs">
-      <DependentUpon>SigningXaml.xaml</DependentUpon>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\Signing.xaml.cs">
+      <DependentUpon>Signing.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\StorageLocationConverter.cs" />
@@ -756,7 +756,7 @@
     <EmbeddedResource Include="Resources\ProjectOptions\Publish.xfrm" />
     <EmbeddedResource Include="Resources\ProjectOptions\Signing.xfrm" />
     <EmbeddedResource Include="Resources\ProjectOptions\DebugOptions.xfrm" />
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\Signing.cs">
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\old_Signing.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\old_Publish.cs">
@@ -788,7 +788,7 @@
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\AbstractXmlFormsProjectOptionPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\CreateKey.cs">
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\old_CreateKey.cs">
       <SubType>Form</SubType>
     </Compile>
     <EmbeddedResource Include="Resources\ProjectOptions\CreateKey.xfrm" />
@@ -912,13 +912,13 @@
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettings.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.xaml" />
-    <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\CreateKeyXaml.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\CreateKey.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ProjectOptionPanel.xaml">
       <DependentUpon>ProjectOptionPanel.cs</DependentUpon>
     </Page>
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ReferencePaths.xaml" />
-    <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\SigningXaml.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\Signing.xaml" />
     <Page Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReference\AddServiceReferenceDialog.xaml" />
     <Page Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReference\AdvancedServiceDialog.xaml" />
     <Page Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReference\ServiceReferenceOptionsPanel..xaml" />

diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.xaml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Window
+	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.CreateKey" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:core="http://icsharpcode.net/sharpdevelop/core" xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
+	Title="{core:Localize Dialog.ProjectOptions.Signing.CreateKey.Title}"
+	Height="300"
+	Width="450">
+	<Window.Resources>
+		<GridLength
+			x:Key="VerticalSpacing"> 25</GridLength>
+	</Window.Resources>
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition
+				Height="20"></RowDefinition>
+			<RowDefinition
+				Height="{StaticResource VerticalSpacing}"></RowDefinition>
+			<RowDefinition
+				Height="{StaticResource VerticalSpacing}"></RowDefinition>
+			<RowDefinition
+				Height="{StaticResource VerticalSpacing}"></RowDefinition>
+			<RowDefinition
+				Height="{StaticResource VerticalSpacing}"></RowDefinition>
+			<RowDefinition
+				Height="{StaticResource VerticalSpacing}"></RowDefinition>
+			<RowDefinition
+				Height="{StaticResource VerticalSpacing}"></RowDefinition>
+			<RowDefinition
+				Height="{StaticResource VerticalSpacing}"></RowDefinition>
+			<RowDefinition
+				Height="10"></RowDefinition>
+			<RowDefinition
+				Height="35"></RowDefinition>
+			<RowDefinition
+				Height="10"></RowDefinition>
+		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition
+				Width="10"></ColumnDefinition>
+			<ColumnDefinition></ColumnDefinition>
+			<ColumnDefinition
+				Width="10"></ColumnDefinition>
+		</Grid.ColumnDefinitions>
+		<Label
+			Grid.Row="1"
+			Grid.Column="1"
+			Content="{core:Localize Dialog.ProjectOptions.Signing.CreateKey.KeyName}"></Label>
+		<TextBox
+			Grid.Row="2"
+			Grid.Column="1"
+			Text="{Binding Path=KeyFile}"></TextBox>
+		<CheckBox
+			Grid.Row="3"
+			Grid.Column="1"
+			IsChecked="{Binding Path=CheckBoxChecked, Mode=OneWayToSource}"
+			Content="{core:Localize Dialog.ProjectOptions.Signing.CreateKey.UsePassword}"></CheckBox>
+		<Label
+			Grid.Row="4"
+			Grid.Column="1"
+			Content="{core:Localize Dialog.ProjectOptions.Signing.CreateKey.EnterPassword}"></Label>
+		<TextBox
+			x:Name="passwordTextBox"
+			Grid.Row="5"
+			Grid.Column="1"
+			IsEnabled="{Binding Path=CheckBoxChecked}"></TextBox>
+		<Label
+			Grid.Row="6"
+			Grid.Column="1"
+			Content="{core:Localize Dialog.ProjectOptions.Signing.CreateKey.ConfirmPassword}"></Label>
+		<TextBox
+			x:Name="confirmPasswordTextBox"
+			Grid.Row="7"
+			Grid.Column="1"
+			IsEnabled="{Binding Path=CheckBoxChecked}"></TextBox>
+		<widgets:StackPanelWithSpacing
+			Orientation="Horizontal"
+			Grid.Row="9"
+			Grid.Column="1"
+			SpaceBetweenItems="5"
+			HorizontalAlignment="Right">
+			<Button
+				Content="{core:Localize Global.OKButtonText}"
+				IsDefault="True"
+				Click="okButtonClick"
+				Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
+			<Button
+				Content="{core:Localize Global.CancelButtonText}"
+				IsCancel="True"
+				Click="cancelButtonClick"
+				Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
+		</widgets:StackPanelWithSpacing>
+	</Grid>
+</Window>
diff --git a/...nels/ProjectOptions/CreateKeyXaml.xaml.cs → ...onPanels/ProjectOptions/CreateKey.xaml.cs b/...nels/ProjectOptions/CreateKeyXaml.xaml.cs → ...onPanels/ProjectOptions/CreateKey.xaml.cs
@@ -25,20 +25,20 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 	/// <summary>
 	/// Interaction logic for CreateKeyXaml.xaml
 	/// </summary>
-	public partial class CreateKeyXaml : Window,INotifyPropertyChanged
+	public partial class CreateKey : Window,INotifyPropertyChanged
 	{
 
 		private bool checkBoxChecked;
 		private string keyFile;
 		private string baseDirectory;
 
-		public CreateKeyXaml()
+		public CreateKey()
 		{
 			InitializeComponent();
 			DataContext = this;
 		}
 
-		public CreateKeyXaml (string baseDirectory):this()
+		public CreateKey (string baseDirectory):this()
 		{
 			this.baseDirectory = baseDirectory;
 		}
@@ -96,7 +96,7 @@ void okButtonClick(object sender, RoutedEventArgs e)
 			}
 			if (!KeyFile.EndsWith(".snk") && !KeyFile.EndsWith(".pfx"))
 				KeyFile += ".snk";
-			if (CreateKey(Path.Combine(baseDirectory, KeyFile))) {
+			if (CreateKeyInternal(Path.Combine(baseDirectory, KeyFile))) {
 				this.DialogResult = true;
 				Close();
 			}
@@ -107,7 +107,7 @@ void okButtonClick(object sender, RoutedEventArgs e)
         /// </summary>
         /// <param name="keyPath">The path of the key to create.</param>
         /// <returns>True if the key was created correctly.</returns>
-		private static bool CreateKey(string keyPath)
+		private static bool CreateKeyInternal(string keyPath)
 		{
 			if (File.Exists(keyPath)) {
 				string question = "${res:ICSharpCode.SharpDevelop.Internal.Templates.ProjectDescriptor.OverwriteQuestion}";

diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKeyXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKeyXaml.xaml
diff --git a/...ionPanels/ProjectOptions/SigningXaml.xaml → .../OptionPanels/ProjectOptions/Signing.xaml b/...ionPanels/ProjectOptions/SigningXaml.xaml → .../OptionPanels/ProjectOptions/Signing.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <optionpanels:ProjectOptionPanel
-	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.SigningXaml"
+	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"

diff --git a/...Panels/ProjectOptions/SigningXaml.xaml.cs → ...tionPanels/ProjectOptions/Signing.xaml.cs b/...Panels/ProjectOptions/SigningXaml.xaml.cs → ...tionPanels/ProjectOptions/Signing.xaml.cs
@@ -27,14 +27,14 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 	/// <summary>
 	/// Interaction logic for SigningXaml.xaml
 	/// </summary>
-	public partial class SigningXaml : ProjectOptionPanel
+	public partial class Signing : ProjectOptionPanel
 	{
 		private const string KeyFileExtensions = "*.snk;*.pfx;*.key";
 		private List<string> keyFile = new List<string>();
 		private MSBuildBasedProject project;
 
 
-		public SigningXaml()
+		public Signing()
 		{
 			InitializeComponent();
 		}
@@ -157,8 +157,8 @@ void BrowseKeyFile()
 
 		private void CreateKeyFile()
 		{
-			if (File.Exists(CreateKeyXaml.StrongNameTool)) {
-				CreateKeyXaml createKey = new CreateKeyXaml(base.BaseDirectory);
+			if (File.Exists(CreateKey.StrongNameTool)) {
+				CreateKey createKey = new CreateKey(base.BaseDirectory);
 				createKey.KeyFile = project.Name;
 				createKey.ShowDialog();
 				if (createKey.DialogResult.HasValue && createKey.DialogResult.Value)

diff --git a/.../OptionPanels/ProjectOptions/CreateKey.cs → ...ionPanels/ProjectOptions/old_CreateKey.cs b/.../OptionPanels/ProjectOptions/CreateKey.cs → ...ionPanels/ProjectOptions/old_CreateKey.cs
@@ -14,7 +14,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
     /// <summary>
     /// A form that creates keys for assembly signing.
     /// </summary>
-	public class CreateKeyForm : BaseSharpDevelopForm
+	public class old_CreateKeyForm : BaseSharpDevelopForm
 	{
 		string baseDirectory;
 
@@ -23,7 +23,7 @@ public class CreateKeyForm : BaseSharpDevelopForm
 		/// location specified.
 		/// </summary>
 		/// <param name="baseDirectory">The folder for placing the key.</param>
-		public CreateKeyForm(string baseDirectory)
+		public old_CreateKeyForm(string baseDirectory)
 		{
 			this.baseDirectory = baseDirectory;
 			SetupFromXmlResource("ProjectOptions.CreateKey.xfrm");

diff --git a/...gs/OptionPanels/ProjectOptions/Signing.cs → ...ptionPanels/ProjectOptions/old_Signing.cs b/...gs/OptionPanels/ProjectOptions/Signing.cs → ...ptionPanels/ProjectOptions/old_Signing.cs
@@ -10,7 +10,7 @@
 
 namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 {
-	public class Signing : AbstractXmlFormsProjectOptionPanel
+	public class old_Signing : AbstractXmlFormsProjectOptionPanel
 	{
 		ComboBox keyFile;
 		ConfigurationGuiBinding signAssemblyBinding;
@@ -97,8 +97,8 @@ void BrowseKeyFile()
 
 		void CreateKeyFile()
 		{
-			if (File.Exists(CreateKeyForm.StrongNameTool)) {
-				using (CreateKeyForm createKey = new CreateKeyForm(baseDirectory)) {
+			if (File.Exists(old_CreateKeyForm.StrongNameTool)) {
+				using (old_CreateKeyForm createKey = new old_CreateKeyForm(baseDirectory)) {
 					createKey.KeyFile = project.Name;
 					if (createKey.ShowDialog(WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
 						keyFile.Text = MSBuildInternals.Escape(createKey.KeyFile);