Browse Source

Adjust VBNetBinding.addin, cleanup

pull/30/head
PeterForstmeier 13 years ago
parent
commit
3223b5fb5a
  1. 5
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs
  2. 2
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.xaml
  3. 8
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs
  4. 13
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
  5. 6
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj

5
src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs

@ -91,13 +91,10 @@ namespace CSharpBinding.OptionPanels @@ -91,13 +91,10 @@ namespace CSharpBinding.OptionPanels
this.treatErrorsAndWarnings.SetProjectOptions(this);
}
protected override void Load(MSBuildBasedProject project, string configuration, string platform)
{
base.Load(project, configuration, platform);
// buildOutput.SetProjectOptions(this);
// this.buildAdvanced.SetProjectOptions(this);
// this.errorsAndWarnings.SetProjectOptions(this);
// this.treatErrorsAndWarnings.SetProjectOptions(this);
IsDirty = false;
}

2
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml → src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.xaml

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<optionpanels:ProjectOptionPanel
x:Class="ICSharpCode.VBNetBinding.OptionPanels.BuildOptionsXaml"
x:Class="ICSharpCode.VBNetBinding.OptionPanels.BuildOptions"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"

8
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs → src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs

@ -15,9 +15,9 @@ namespace ICSharpCode.VBNetBinding.OptionPanels @@ -15,9 +15,9 @@ namespace ICSharpCode.VBNetBinding.OptionPanels
/// <summary>
/// Interaction logic for BuildOptionsXaml.xaml
/// </summary>
public partial class BuildOptionsXaml : ProjectOptionPanel
public partial class BuildOptions : ProjectOptionPanel
{
public BuildOptionsXaml()
public BuildOptions()
{
InitializeComponent();
DataContext = this;
@ -135,10 +135,6 @@ namespace ICSharpCode.VBNetBinding.OptionPanels @@ -135,10 +135,6 @@ namespace ICSharpCode.VBNetBinding.OptionPanels
protected override void Load(MSBuildBasedProject project, string configuration, string platform)
{
base.Load(project, configuration, platform);
// buildOutput.SetProjectOptions(this);
// this.buildAdvanced.SetProjectOptions(this);
// this.errorsAndWarnings.SetProjectOptions(this);
// this.treatErrorsAndWarnings.SetProjectOptions(this);
IsDirty = false;
}

13
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@ -72,30 +72,27 @@ @@ -72,30 +72,27 @@
<OptionPanel id = "Application"
label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
<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 = "BuildEvents"
label = "${res:Dialog.ProjectOptions.BuildEvents}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
<!--<OptionPanel id = "BuildOptions"
label = "${res:Dialog.ProjectOptions.BuildOptions}"
class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptions"/>-->
<OptionPanel id = "BuildOptions"
label = "${res:Dialog.ProjectOptions.BuildOptions}"
class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptionsXaml"/>
class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptions"/>
<OptionPanel id = "DebugOptions"
label = "${res:Dialog.ProjectOptions.DebugOptions}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
<!--<OptionPanel id = "ProjectImports"
label = "${res:Dialog.ProjectOptions.ProjectImports}"
class = "ICSharpCode.VBNetBinding.OptionPanels.ProjectImports"/>-->
<OptionPanel id = "ProjectImports1"
label = "${res:Dialog.ProjectOptions.ProjectImports}"
class = "ICSharpCode.VBNetBinding.OptionPanels.ProjectImports"/>

6
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj

@ -65,8 +65,8 @@ @@ -65,8 +65,8 @@
<Compile Include="Src\Extensions.cs" />
<Compile Include="Src\FormattingStrategy\VBStatement.cs" />
<Compile Include="Src\LanguageUtils.cs" />
<Compile Include="Src\OptionPanels\BuildOptionsXaml.xaml.cs">
<DependentUpon>BuildOptionsXaml.xaml</DependentUpon>
<Compile Include="Src\OptionPanels\BuildOptions.xaml.cs">
<DependentUpon>BuildOptions.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\OptionPanels\ProjectImports.xaml.cs">
@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="Src\OptionPanels\BuildOptionsXaml.xaml" />
<Page Include="Src\OptionPanels\BuildOptions.xaml" />
<Page Include="Src\OptionPanels\ProjectImports.xaml" />
<Page Include="Src\OptionPanels\TextEditorOptions.xaml" />
</ItemGroup>

Loading…
Cancel
Save