Add ScrollViewer

13 years ago · 3ed2c63fd5
4 changed files with 118 additions and 118 deletions
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml
@ -10,8 +10,7 @@
				@@ -10,8 +10,7 @@
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
 	xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project">
 	
-	<ScrollViewer
-		VerticalScrollBarVisibility="Auto">
+	<ScrollViewer VerticalScrollBarVisibility="Auto">
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto"></RowDefinition>
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.xaml
@ -6,27 +6,30 @@
				@@ -6,27 +6,30 @@
 	xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project"
 	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels">
-	<GroupBox Header="{core:Localize Dialog.ProjectOptions.BuildEvents}">
-		<StackPanel>
-			<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PreBuild}" Target="{Binding ElementName=preBuild}"/>
-			<DockPanel>
-				<optionpanels:StorageLocationPicker Location="{Binding PreBuildEvent.Location}" DockPanel.Dock="Left" />
-				<TextBox Name="preBuild" Text="{Binding PreBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75"
-				         HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
-			</DockPanel>
-			
-			<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PostBuild}" Target="{Binding ElementName=postBuild}"/>
-			<DockPanel>
-				<optionpanels:StorageLocationPicker Location="{Binding PostBuildEvent.Location}" DockPanel.Dock="Left" />
-				<TextBox Name="postBuild" Text="{Binding PostBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75"
-				         HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
-			</DockPanel>
-			
-			<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.RunPostBuild}" />
-			<DockPanel>
-				<optionpanels:StorageLocationPicker Location="{Binding RunPostBuildEvent.Location}" DockPanel.Dock="Left" />
-				<ComboBox gui:EnumBinding.EnumType="{x:Type project:RunPostBuildEvent}" SelectedValue="{Binding RunPostBuildEvent.Value}" />
-			</DockPanel>
-		</StackPanel>
-	</GroupBox>
+	<ScrollViewer
+		VerticalScrollBarVisibility="Auto">
+		<GroupBox Header="{core:Localize Dialog.ProjectOptions.BuildEvents}">
+			<StackPanel>
+				<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PreBuild}" Target="{Binding ElementName=preBuild}"/>
+				<DockPanel>
+					<optionpanels:StorageLocationPicker Location="{Binding PreBuildEvent.Location}" DockPanel.Dock="Left" />
+					<TextBox Name="preBuild" Text="{Binding PreBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75"
+					         HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
+				</DockPanel>
+				
+				<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.PostBuild}" Target="{Binding ElementName=postBuild}"/>
+				<DockPanel>
+					<optionpanels:StorageLocationPicker Location="{Binding PostBuildEvent.Location}" DockPanel.Dock="Left" />
+					<TextBox Name="postBuild" Text="{Binding PostBuildEvent.Value, UpdateSourceTrigger=PropertyChanged}" Height="75"
+					         HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" />
+				</DockPanel>
+				
+				<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.RunPostBuild}" />
+				<DockPanel>
+					<optionpanels:StorageLocationPicker Location="{Binding RunPostBuildEvent.Location}" DockPanel.Dock="Left" />
+					<ComboBox gui:EnumBinding.EnumType="{x:Type project:RunPostBuildEvent}" SelectedValue="{Binding RunPostBuildEvent.Value}" />
+				</DockPanel>
+			</StackPanel>
+		</GroupBox>
+	</ScrollViewer>
 </optionpanels:ProjectOptionPanel>
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml
@ -1,4 +1,4 @@
				@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <optionpanels:ProjectOptionPanel
 	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@ -6,24 +6,21 @@
				@@ -6,24 +6,21 @@
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
 	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">
-	
-	<Grid>
-		<Grid.RowDefinitions>
-		<RowDefinition ></RowDefinition>
-		</Grid.RowDefinitions>
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition
-				Width="40"></ColumnDefinition>
-			<ColumnDefinition></ColumnDefinition>
+	<ScrollViewer VerticalScrollBarVisibility="Auto">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto"></ColumnDefinition>
+				<ColumnDefinition></ColumnDefinition>
 			
-		</Grid.ColumnDefinitions>
-		
-		<optionpanels:StorageLocationPicker Margin="5,40,0,0"
-			x:Name="location" Location="{Binding ReferencePath.Location}" />
+			</Grid.ColumnDefinitions>
+			
+			<optionpanels:StorageLocationPicker Margin="5,40,0,0"
+				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>
+		</Grid>
+	</ScrollViewer>
 </optionpanels:ProjectOptionPanel>
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.xaml
@ -10,79 +10,80 @@
				@@ -10,79 +10,80 @@
 	<optionpanels:ProjectOptionPanel.Resources>
 		<optionpanels:StringToBoolConverter
 			x:Key="strTobool"></optionpanels:StringToBoolConverter>
-	</optionpanels:ProjectOptionPanel.Resources>	
-	<StackPanel
-		Orientation="Vertical">
-		<GroupBox
-			Header="{core:Localize Dialog.ProjectOptions.Signing.StrongName}">
-			<Grid>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="30"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-				</Grid.RowDefinitions>
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto"></ColumnDefinition>
-					<ColumnDefinition Width="3*"></ColumnDefinition>
-					<ColumnDefinition Width="*"></ColumnDefinition>
-				</Grid.ColumnDefinitions>
-			
-				<CheckBox x:Name="signAssemblyCheckBox"
-					Grid.Column="1" VerticalAlignment="Bottom"
-					Content="{core:Localize Dialog.ProjectOptions.Signing.SignAssembly}"
-					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>
-				
-				<optionpanels:StorageLocationPicker
-					Grid.Row="2"></optionpanels:StorageLocationPicker>
-		
-				<!--	SelectionChanged="KeyFileComboBox_SelectionChanged"-->		
-				<ComboBox
-					x:Name="keyFileComboBox"
-					Grid.Row="2"
-					Grid.Column="1"
-					VerticalAlignment="Center"
-					Margin="3,3,3,3"
-					IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
-					ItemsSource="{Binding KeyFile}"
-					SelectedValue="{Binding Path=SelectedKey}">
-				</ComboBox>
-				
-				<Button
-					x:Name="changePasswordButton"
-					Grid.Row="2"
-					Grid.Column="3"
-					VerticalAlignment="Center"
-					IsEnabled="False"
-					Content="{core:Localize Dialog.ProjectOptions.Signing.ChangePassword}"
-					Margin="10,3,10,3"></Button>
-				
-				<CheckBox
-					x:Name="delaySignOnlyCheckBox"
-					Grid.Row="3"
-					Grid.Column="1"
-					VerticalAlignment="Center"
-					IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
-					Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}"
-					IsChecked="{Binding DelaySign.Value,Converter={StaticResource strTobool}}">
-				</CheckBox>
-
-				<Label
-					Grid.Row="4"
-					Grid.Column="1" VerticalAlignment="Center"
-					IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
-					Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignWarning}"></Label>
-			</Grid>
-		</GroupBox>
-		<GroupBox
-			Header="{core:Localize Dialog.ProjectOptions.Signing.ClickOnce}"
-			Margin="0,20,0,0">
-			<Label Content="{core:Localize Dialog.ProjectOptions.Signing.ClickOnceNotSupported}"></Label>
-		</GroupBox>
-	</StackPanel>
+	</optionpanels:ProjectOptionPanel.Resources>
+	<ScrollViewer VerticalScrollBarVisibility="Auto">
+		<StackPanel
+			Orientation="Vertical">
+			<GroupBox
+				Header="{core:Localize Dialog.ProjectOptions.Signing.StrongName}">
+				<Grid>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="30"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto"></ColumnDefinition>
+						<ColumnDefinition Width="3*"></ColumnDefinition>
+						<ColumnDefinition Width="*"></ColumnDefinition>
+					</Grid.ColumnDefinitions>
+					
+					<CheckBox x:Name="signAssemblyCheckBox"
+					          Grid.Column="1" VerticalAlignment="Bottom"
+					          Content="{core:Localize Dialog.ProjectOptions.Signing.SignAssembly}"
+					          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>
+					
+					<optionpanels:StorageLocationPicker
+						Grid.Row="2"></optionpanels:StorageLocationPicker>
+					
+					<ComboBox
+						x:Name="keyFileComboBox"
+						Grid.Row="2"
+						Grid.Column="1"
+						VerticalAlignment="Center"
+						Margin="3,3,3,3"
+						IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
+						ItemsSource="{Binding KeyFile}"
+						SelectedValue="{Binding Path=SelectedKey}">
+					</ComboBox>
+					
+					<Button
+						x:Name="changePasswordButton"
+						Grid.Row="2"
+						Grid.Column="3"
+						VerticalAlignment="Center"
+						IsEnabled="False"
+						Content="{core:Localize Dialog.ProjectOptions.Signing.ChangePassword}"
+						Margin="10,3,10,3"></Button>
+					
+					<CheckBox
+						x:Name="delaySignOnlyCheckBox"
+						Grid.Row="3"
+						Grid.Column="1"
+						VerticalAlignment="Center"
+						IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
+						Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}"
+						IsChecked="{Binding DelaySign.Value,Converter={StaticResource strTobool}}">
+					</CheckBox>
+					
+					<Label
+						Grid.Row="4"
+						Grid.Column="1" VerticalAlignment="Center"
+						IsEnabled="{Binding ElementName=signAssemblyCheckBox, Path=IsChecked}"
+						Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignWarning}"></Label>
+				</Grid>
+			</GroupBox>
+			<GroupBox
+				Header="{core:Localize Dialog.ProjectOptions.Signing.ClickOnce}"
+				Margin="0,20,0,0">
+				<Label Content="{core:Localize Dialog.ProjectOptions.Signing.ClickOnceNotSupported}"></Label>
+			</GroupBox>
+		</StackPanel>
+	</ScrollViewer>
 </optionpanels:ProjectOptionPanel>