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
public partial class LinkerOptions : ProjectOptionPanel public partial class LinkerOptions : ProjectOptionPanel
{ {
private const string metaElement ="Link"; private const string metaElement ="Link";
private MSBuildBasedProject project;
public LinkerOptions() public LinkerOptions()
{ {
InitializeComponent(); 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 #region Properties
@ -78,18 +53,36 @@ namespace ICSharpCode.CppBinding.Project
#region Save/Load #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() public override void OnApplyTemplate()
{ {
base.OnApplyTemplate(); base.OnApplyTemplate();
HideHeader(); 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) 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 @@
<ColumnDefinition Width="Auto"></ColumnDefinition> <ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="150"></ColumnDefinition> <ColumnDefinition Width="150"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition> <ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label <Label
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.AssemblyName}"></Label> Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.AssemblyName}"></Label>
@ -54,6 +54,7 @@
x:Name="rootNamespaceTextBox" x:Name="rootNamespaceTextBox"
Text="{Binding RootNamespace.Value,UpdateSourceTrigger=PropertyChanged}"></TextBox> Text="{Binding RootNamespace.Value,UpdateSourceTrigger=PropertyChanged}"></TextBox>
<Label Grid.Row="4" Grid.ColumnSpan="2" <Label Grid.Row="4" Grid.ColumnSpan="2"
Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.OutputType}"></Label> Content="{core:Localize Dialog.ProjectOptions.ApplicationSettings.OutputType}"></Label>
@ -139,6 +140,7 @@
Content="..." Content="..."
Click="Win32ResourceComboButton_Click"></Button> Click="Win32ResourceComboButton_Click"></Button>
<GroupBox Grid.Row="10" Grid.ColumnSpan="3" Margin="0,5,0,0" <GroupBox Grid.Row="10" Grid.ColumnSpan="3" Margin="0,5,0,0"
Header="{core:Localize Dialog.ProjectOptions.ApplicationSettings.ProjectInformation}"> Header="{core:Localize Dialog.ProjectOptions.ApplicationSettings.ProjectInformation}">
<Grid Margin="15,0,0,0"> <Grid Margin="15,0,0,0">
@ -169,6 +171,7 @@
<TextBox x:Name="outputNameTextBox" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"></TextBox> <TextBox x:Name="outputNameTextBox" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"></TextBox>
</Grid> </Grid>
</GroupBox> </GroupBox>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</optionpanels:ProjectOptionPanel> </optionpanels:ProjectOptionPanel>
Loading…
Cancel
Save