pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add ScrollViewer

pull/30/head
PeterForstmeier 14 years ago
parent
8b635bd82e
commit
3ed2c63fd5
4 changed files with 118 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml
  2. 49
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.xaml
  3. 33
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml
  4. 151
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml

3
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml
Unescape View File

@ -10,8 +10,7 @@
xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels" xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project"> xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project">
<ScrollViewer <ScrollViewer VerticalScrollBarVisibility="Auto">
VerticalScrollBarVisibility="Auto">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>

49
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.xaml
Unescape View File

@ -6,27 +6,30 @@
xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project" xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project"
xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui" xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"> xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels">
<GroupBox Header="{core:Localize Dialog.ProjectOptions.BuildEvents}"> <ScrollViewer
<StackPanel> VerticalScrollBarVisibility="Auto">
<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PreBuild}" Target="{Binding ElementName=preBuild}"/> <GroupBox Header="{core:Localize Dialog.ProjectOptions.BuildEvents}">
<DockPanel> <StackPanel>
<optionpanels:StorageLocationPicker Location="{Binding PreBuildEvent.Location}" DockPanel.Dock="Left" /> <Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PreBuild}" Target="{Binding ElementName=preBuild}"/>
<TextBox Name="preBuild" Text="{Binding PreBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75" <DockPanel>
HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" /> <optionpanels:StorageLocationPicker Location="{Binding PreBuildEvent.Location}" DockPanel.Dock="Left" />
</DockPanel> <TextBox Name="preBuild" Text="{Binding PreBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75"
HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PostBuild}" Target="{Binding ElementName=postBuild}"/> </DockPanel>
<DockPanel>
<optionpanels:StorageLocationPicker Location="{Binding PostBuildEvent.Location}" DockPanel.Dock="Left" /> <Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PostBuild}" Target="{Binding ElementName=postBuild}"/>
<TextBox Name="postBuild" Text="{Binding PostBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75" <DockPanel>
HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" /> <optionpanels:StorageLocationPicker Location="{Binding PostBuildEvent.Location}" DockPanel.Dock="Left" />
</DockPanel> <TextBox Name="postBuild" Text="{Binding PostBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75"
HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.RunPostBuild}" /> </DockPanel>
<DockPanel>
<optionpanels:StorageLocationPicker Location="{Binding RunPostBuildEvent.Location}" DockPanel.Dock="Left" /> <Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.RunPostBuild}" />
<ComboBox gui:EnumBinding.EnumType="{x:Type project:RunPostBuildEvent}" SelectedValue="{Binding RunPostBuildEvent.Value}" /> <DockPanel>
</DockPanel> <optionpanels:StorageLocationPicker Location="{Binding RunPostBuildEvent.Location}" DockPanel.Dock="Left" />
</StackPanel> <ComboBox gui:EnumBinding.EnumType="{x:Type project:RunPostBuildEvent}" SelectedValue="{Binding RunPostBuildEvent.Value}" />
</GroupBox> </DockPanel>
</StackPanel>
</GroupBox>
</ScrollViewer>
</optionpanels:ProjectOptionPanel> </optionpanels:ProjectOptionPanel>

33
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml
Unescape View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<optionpanels:ProjectOptionPanel <optionpanels:ProjectOptionPanel
x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths" x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@ -6,24 +6,21 @@
xmlns:core="http://icsharpcode.net/sharpdevelop/core" xmlns:core="http://icsharpcode.net/sharpdevelop/core"
xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets" xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project" xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project"
xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui" xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"> xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.ColumnDefinitions>
<RowDefinition ></RowDefinition> <ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.RowDefinitions> <ColumnDefinition></ColumnDefinition>
<Grid.ColumnDefinitions>
<ColumnDefinition
Width="40"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<optionpanels:StorageLocationPicker Margin="5,40,0,0" <optionpanels:StorageLocationPicker Margin="5,40,0,0"
x:Name="location" Location="{Binding ReferencePath.Location}" /> x:Name="location" Location="{Binding ReferencePath.Location}" />
<gui:StringListEditorXaml x:Name="editor" Grid.Column="1" Grid.RowSpan="2"></gui:StringListEditorXaml>
<gui:StringListEditorXaml x:Name="editor" Grid.Column="1" Grid.RowSpan="2"></gui:StringListEditorXaml> </Grid>
</ScrollViewer>
</Grid>
</optionpanels:ProjectOptionPanel> </optionpanels:ProjectOptionPanel>

151
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
Unescape View File

@ -10,79 +10,80 @@
<optionpanels:ProjectOptionPanel.Resources> <optionpanels:ProjectOptionPanel.Resources>
<optionpanels:StringToBoolConverter <optionpanels:StringToBoolConverter
x:Key="strTobool"></optionpanels:StringToBoolConverter> x:Key="strTobool"></optionpanels:StringToBoolConverter>
</optionpanels:ProjectOptionPanel.Resources> </optionpanels:ProjectOptionPanel.Resources>
<StackPanel <ScrollViewer VerticalScrollBarVisibility="Auto">
Orientation="Vertical"> <StackPanel
<GroupBox Orientation="Vertical">
Header="{core:Localize Dialog.ProjectOptions.Signing.StrongName}"> <GroupBox
<Grid> Header="{core:Localize Dialog.ProjectOptions.Signing.StrongName}">
<Grid.RowDefinitions> <Grid>
<RowDefinition Height="30"></RowDefinition> <Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions> <RowDefinition Height="Auto"></RowDefinition>
<Grid.ColumnDefinitions> </Grid.RowDefinitions>
<ColumnDefinition Width="Auto"></ColumnDefinition> <Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"></ColumnDefinition> <ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="3*"></ColumnDefinition>
</Grid.ColumnDefinitions> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<CheckBox x:Name="signAssemblyCheckBox"
Grid.Column="1" VerticalAlignment="Bottom" <CheckBox x:Name="signAssemblyCheckBox"
Content="{core:Localize Dialog.ProjectOptions.Signing.SignAssembly}" Grid.Column="1" VerticalAlignment="Bottom"
IsChecked="{Binding SignAssembly.Value,Converter={StaticResource strTobool}}"> Content="{core:Localize Dialog.ProjectOptions.Signing.SignAssembly}"
</CheckBox> IsChecked="{Binding SignAssembly.Value,Converter={StaticResource strTobool}}">
</CheckBox>
<Label Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
Content="{core:Localize Dialog.ProjectOptions.Signing.ChooseKeyFile}"></Label> <Label Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
Content="{core:Localize Dialog.ProjectOptions.Signing.ChooseKeyFile}"></Label>
<optionpanels:StorageLocationPicker
Grid.Row="2"></optionpanels:StorageLocationPicker> <optionpanels:StorageLocationPicker
Grid.Row="2"></optionpanels:StorageLocationPicker>
<!-- SelectionChanged="KeyFileComboBox_SelectionChanged"-->
<ComboBox <ComboBox
x:Name="keyFileComboBox" x:Name="keyFileComboBox"
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="3,3,3,3" Margin="3,3,3,3"
IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}" IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
ItemsSource="{Binding KeyFile}" ItemsSource="{Binding KeyFile}"
SelectedValue="{Binding Path=SelectedKey}"> SelectedValue="{Binding Path=SelectedKey}">
</ComboBox> </ComboBox>
<Button <Button
x:Name="changePasswordButton" x:Name="changePasswordButton"
Grid.Row="2" Grid.Row="2"
Grid.Column="3" Grid.Column="3"
VerticalAlignment="Center" VerticalAlignment="Center"
IsEnabled="False" IsEnabled="False"
Content="{core:Localize Dialog.ProjectOptions.Signing.ChangePassword}" Content="{core:Localize Dialog.ProjectOptions.Signing.ChangePassword}"
Margin="10,3,10,3"></Button> Margin="10,3,10,3"></Button>
<CheckBox <CheckBox
x:Name="delaySignOnlyCheckBox" x:Name="delaySignOnlyCheckBox"
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}" IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}" Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}"
IsChecked="{Binding DelaySign.Value,Converter={StaticResource strTobool}}"> IsChecked="{Binding DelaySign.Value,Converter={StaticResource strTobool}}">
</CheckBox> </CheckBox>
<Label <Label
Grid.Row="4" Grid.Row="4"
Grid.Column="1" VerticalAlignment="Center" Grid.Column="1" VerticalAlignment="Center"
IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}" IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignWarning}"></Label> Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignWarning}"></Label>
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox <GroupBox
Header="{core:Localize Dialog.ProjectOptions.Signing.ClickOnce}" Header="{core:Localize Dialog.ProjectOptions.Signing.ClickOnce}"
Margin="0,20,0,0"> Margin="0,20,0,0">
<Label Content="{core:Localize Dialog.ProjectOptions.Signing.ClickOnceNotSupported}"></Label> <Label Content="{core:Localize Dialog.ProjectOptions.Signing.ClickOnceNotSupported}"></Label>
</GroupBox> </GroupBox>
</StackPanel> </StackPanel>
</ScrollViewer>
</optionpanels:ProjectOptionPanel> </optionpanels:ProjectOptionPanel>
Write Preview
Loading…
Cancel
Save