Browse Source

Cleanup Cpp-LinkerOptions

pull/30/head
PeterForstmeier 13 years ago
parent
commit
2436d6f59c
  1. 55
      src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs
  2. 7
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml

55
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs

@ -23,37 +23,12 @@ namespace ICSharpCode.CppBinding.Project @@ -23,37 +23,12 @@ namespace ICSharpCode.CppBinding.Project
public partial class LinkerOptions : ProjectOptionPanel
{
private const string metaElement ="Link";
private MSBuildBasedProject project;
public LinkerOptions()
{
InitializeComponent();
}
private void Initialize()
{
var msDefGroup = new MSBuildItemDefinitionGroup(project, project.ActiveConfiguration, project.ActivePlatform);
this.additionalLibsTextBox.Text = GetElementMetaData(msDefGroup,"AdditionalDependencies");
this.addModuleTextBox.Text = GetElementMetaData(msDefGroup,"AddModuleNamesToAssembly");
this.resourceFileTextBox.Text = GetElementMetaData(msDefGroup,"EmbedManagedResourceFile");
this.additionalOptionsTextBox.Text = GetElementMetaData(msDefGroup,"AdditionalOptions");
string def = GetElementMetaData(msDefGroup,"GenerateDebugInformation");
bool check;
if (bool.TryParse(def, out check))
{
this.CheckBoxChecked = check;
this.debugInfoCheckBox.IsChecked = check;
}
IsDirty = false;
}
#region Properties
@ -78,18 +53,36 @@ namespace ICSharpCode.CppBinding.Project @@ -78,18 +53,36 @@ namespace ICSharpCode.CppBinding.Project
#region Save/Load
protected override void Initialize()
{
var msDefGroup = new MSBuildItemDefinitionGroup(base.Project, base.Project.ActiveConfiguration, base.Project.ActivePlatform);
this.additionalLibsTextBox.Text = GetElementMetaData(msDefGroup,"AdditionalDependencies");
this.addModuleTextBox.Text = GetElementMetaData(msDefGroup,"AddModuleNamesToAssembly");
this.resourceFileTextBox.Text = GetElementMetaData(msDefGroup,"EmbedManagedResourceFile");
this.additionalOptionsTextBox.Text = GetElementMetaData(msDefGroup,"AdditionalOptions");
string def = GetElementMetaData(msDefGroup,"GenerateDebugInformation");
bool check;
if (bool.TryParse(def, out check))
{
this.CheckBoxChecked = check;
this.debugInfoCheckBox.IsChecked = check;
}
IsDirty = false;
}
public override void OnApplyTemplate()
{
base.OnApplyTemplate();
HideHeader();
}
protected override void Load(MSBuildBasedProject project, string configuration, string platform)
{
base.Load(project, configuration, platform);
this.project = project;
Initialize();
}
protected override bool Save(MSBuildBasedProject project, string configuration, string platform)
{

7
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml

@ -30,9 +30,9 @@ @@ -30,9 +30,9 @@
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="150"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Label
Grid.ColumnSpan="2"
Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.AssemblyName}"></Label>
@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@
x:Name="rootNamespaceTextBox"
Text="{Binding RootNamespace.Value,UpdateSourceTrigger=PropertyChanged}"></TextBox>
<Label Grid.Row="4" Grid.ColumnSpan="2"
Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.OutputType}"></Label>
@ -139,6 +140,7 @@ @@ -139,6 +140,7 @@
Content="..."
Click="Win32ResourceComboButton_Click"></Button>
<GroupBox Grid.Row="10" Grid.ColumnSpan="3" Margin="0,5,0,0"
Header="{core:Localize Dialog.ProjectOptions.ApplicationSettings.ProjectInformation}">
<Grid Margin="15,0,0,0">
@ -169,6 +171,7 @@ @@ -169,6 +171,7 @@
<TextBox x:Name="outputNameTextBox" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"></TextBox>
</Grid>
</GroupBox>
</Grid>
</ScrollViewer>
</optionpanels:ProjectOptionPanel>
Loading…
Cancel
Save