diff --git a/src/AddIns/VersionControl/SubversionAddIn/Resources/SubversionOptionsPanel.xfrm b/src/AddIns/VersionControl/SubversionAddIn/Resources/SubversionOptionsPanel.xfrm deleted file mode 100644 index 20e445582d..0000000000 --- a/src/AddIns/VersionControl/SubversionAddIn/Resources/SubversionOptionsPanel.xfrm +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.cs b/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.cs deleted file mode 100644 index 593edc7dff..0000000000 --- a/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -using ICSharpCode.SharpDevelop.Gui.OptionPanels; -using System; -using System.Windows.Forms; -using ICSharpCode.SharpDevelop.Gui; - -namespace ICSharpCode.Svn.Gui -{ - // TODO: rewrite without XMLForms - #pragma warning disable 618 - /// - /// The Output Window options panel. - /// - public class SubversionOptionsPanel : XmlFormsOptionPanel - { - public SubversionOptionsPanel() - { - } - - public override void LoadPanelContents() - { - SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.Svn.Resources.SubversionOptionsPanel.xfrm")); - ((CheckBox)ControlDictionary["autoAddFilesCheckBox"]).Checked = AddInOptions.AutomaticallyAddFiles; - ((CheckBox)ControlDictionary["autoDeleteFilesCheckBox"]).Checked = AddInOptions.AutomaticallyDeleteFiles; - ((CheckBox)ControlDictionary["autoRenameFilesCheckBox"]).Checked = AddInOptions.AutomaticallyRenameFiles; - ((CheckBox)ControlDictionary["autoReloadProjectCheckBox"]).Checked = AddInOptions.AutomaticallyReloadProject; - ((CheckBox)ControlDictionary["useHistoryDisplayBindingCheckBox"]).Checked = AddInOptions.UseHistoryDisplayBinding; - } - - public override bool StorePanelContents() - { - AddInOptions.AutomaticallyAddFiles = ((CheckBox)ControlDictionary["autoAddFilesCheckBox"]).Checked; - AddInOptions.AutomaticallyDeleteFiles = ((CheckBox)ControlDictionary["autoDeleteFilesCheckBox"]).Checked; - AddInOptions.AutomaticallyRenameFiles = ((CheckBox)ControlDictionary["autoRenameFilesCheckBox"]).Checked; - AddInOptions.AutomaticallyReloadProject = ((CheckBox)ControlDictionary["autoReloadProjectCheckBox"]).Checked; - AddInOptions.UseHistoryDisplayBinding = ((CheckBox)ControlDictionary["useHistoryDisplayBindingCheckBox"]).Checked; - - return true; - } - } -} diff --git a/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.xaml b/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.xaml new file mode 100644 index 0000000000..3a36527888 --- /dev/null +++ b/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.xaml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.xaml.cs b/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.xaml.cs new file mode 100644 index 0000000000..5e52f3da01 --- /dev/null +++ b/src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.xaml.cs @@ -0,0 +1,34 @@ +// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this +// software and associated documentation files (the "Software"), to deal in the Software +// without restriction, including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or +// substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +using System; +using ICSharpCode.SharpDevelop.Gui; + +namespace ICSharpCode.Svn.Gui +{ + /// + /// Interaction logic for SubversionOptionsPanel.xaml + /// + public partial class SubversionOptionsPanel : OptionPanel + { + public SubversionOptionsPanel() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj index 1f314e73eb..1a1c4e26cb 100644 --- a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj +++ b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj @@ -45,6 +45,8 @@ 4096 + + ..\..\..\Libraries\SharpSvn\SharpSvn.dll @@ -56,12 +58,20 @@ + + 4.0 + + Configuration\GlobalAssemblyInfo.cs + + SubversionOptionsPanel.xaml + Code + Always @@ -73,7 +83,6 @@ - @@ -81,9 +90,6 @@ Component - - UserControl - @@ -107,11 +113,22 @@ ICSharpCode.Core False + + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} + ICSharpCode.Core.Presentation + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} ICSharpCode.Core.WinForms False + + {8035765F-D51F-4A0C-A746-2FD100E19419} + ICSharpCode.SharpDevelop.Widgets + + + + \ No newline at end of file diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs index 61b245fe35..1e7116541f 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs @@ -31,7 +31,7 @@ namespace ICSharpCode.SharpDevelop.Gui /// /// Simple implementation of IOptionPanel with support for OptionBinding markup extensions. /// - public class OptionPanel : UserControl, IOptionPanel, IOptionBindingContainer,INotifyPropertyChanged + public class OptionPanel : UserControl, IOptionPanel, IOptionBindingContainer, INotifyPropertyChanged { public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;