From ee0ff78f99a968cc110d3c2375785b675a19fc86 Mon Sep 17 00:00:00 2001 From: PeterForstmeier Date: Tue, 24 Apr 2012 20:30:11 +0200 Subject: [PATCH] Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs can hide header, cleanup --- .../CppBinding/Project/LinkerOptionsXaml.xaml | 12 ++++++------ .../Project/LinkerOptionsXaml.xaml.cs | 11 ++++++++--- .../Project/PreprocessorOptions.xaml.cs | 7 ++++++- .../ProjectOptions/ProjectOptionPanel.cs | 17 +++++++++++++++++ .../ProjectOptions/ProjectOptionPanel.xaml | 6 +++--- 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml index 09a0d39282..46b111b135 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml @@ -26,11 +26,11 @@ - - + @@ -39,19 +39,19 @@ Height="20" Grid.Column="1" Content="...."> - + - + - + - + diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml.cs index d63999410a..4403ede5e7 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml.cs +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml.cs @@ -57,7 +57,7 @@ namespace ICSharpCode.CppBinding.Project this.debugInfoCheckBox.IsChecked = check; } - IsDirty = false; + IsDirty = false; } #region Properties @@ -83,6 +83,11 @@ namespace ICSharpCode.CppBinding.Project #endregion #region Save/Load + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + HideHeader(); + } protected override void Load(MSBuildBasedProject project, string configuration, string platform) { @@ -134,7 +139,7 @@ namespace ICSharpCode.CppBinding.Project void AdditionalLibsButton_Click(object sender, RoutedEventArgs e) { var dlg = InitStringListEditor(StringParser.Parse("${res:ICSharpCode.CppBinding.ProjectOptions.SymbolLabel}:"), - StringParser.Parse("${res:ICSharpCode.CppBinding.ProjectOptions.Linker.AdditionalLibs}:"),false); + StringParser.Parse("${res:ICSharpCode.CppBinding.ProjectOptions.Linker.AdditionalLibs}:"),false); string[] strings = this.additionalLibsTextBox.Text.Split(';'); dlg.LoadList (strings); dlg.ShowDialog(); @@ -145,7 +150,7 @@ namespace ICSharpCode.CppBinding.Project } } - + void AddModuleButton_Click(object sender, RoutedEventArgs e) { var dlg = InitStringListEditor(StringParser.Parse("${res:ICSharpCode.CppBinding.ProjectOptions.SymbolLabel}:"), diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs index 30527b8bf0..e0b54ca3e2 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs @@ -74,8 +74,13 @@ namespace ICSharpCode.CppBinding.Project #endregion - #region Save/Load + #region overrides + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + HideHeader(); + } protected override void Load(MSBuildBasedProject project, string configuration, string platform) { base.Load(project, configuration, platform); diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs index 1b5385e2c9..1f3c89f2c2 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs @@ -7,6 +7,8 @@ using System.ComponentModel; using System.Linq; using System.Windows; using System.Windows.Controls; +using System.Windows.Shapes; + using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Project; @@ -34,6 +36,9 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels string activePlatform; bool resettingIndex; + StackPanel configStackPanel; + Line headerline; + protected virtual void Load(MSBuildBasedProject project, string configuration, string platform) { foreach (IProjectProperty p in projectProperties.Values) @@ -49,13 +54,25 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels return true; } + + public void HideHeader () + { + configStackPanel.Visibility = Visibility.Hidden; + headerline.Visibility = Visibility.Hidden; + } + + public override void OnApplyTemplate() { base.OnApplyTemplate(); configurationComboBox = Template.FindName("PART_configuration", this) as ComboBox; platformComboBox = Template.FindName("PART_platform", this) as ComboBox; + + headerline = Template.FindName("PART_headerline", this) as Line; + configStackPanel = Template.FindName("PART_stackpanel", this) as StackPanel; } + object owner; object IOptionPanel.Owner { diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.xaml index ae92bc9da7..8caf2b2162 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.xaml +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.xaml @@ -11,13 +11,13 @@ Background="{TemplateBinding Panel.Background}" SnapsToDevicePixels="True"> - + - +