Mercurial > silverbladetech
changeset 116:d3380f499575
requires layout tidy up
| author | stevenh7776 |
|---|---|
| date | Sun, 20 May 2012 18:48:00 +0100 |
| parents | 4de4e7829319 |
| children | 9eadccc3b46c |
| files | SSRS/SSRS/Data/DynamicFormField.cs SSRS/SSRS/MainPage.xaml |
| diffstat | 2 files changed, 53 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/SSRS/SSRS/Data/DynamicFormField.cs Sun May 20 15:50:37 2012 +0100 +++ b/SSRS/SSRS/Data/DynamicFormField.cs Sun May 20 18:48:00 2012 +0100 @@ -1,5 +1,4 @@ using System; -using SSRS.Services; namespace SSRS.Data {
--- a/SSRS/SSRS/MainPage.xaml Sun May 20 15:50:37 2012 +0100 +++ b/SSRS/SSRS/MainPage.xaml Sun May 20 18:48:00 2012 +0100 @@ -111,7 +111,7 @@ </VisualStateGroup> </VisualStateManager.VisualStateGroups> <Grid x:Name="SideMenu" - Width="300" + Width="400" Margin="0,0,0,51" HorizontalAlignment="Left"> <Grid.Projection> @@ -122,7 +122,7 @@ VerticalAlignment="Center" IsBusy="{Binding IsBusy}"> - <StackPanel Width="300" VerticalAlignment="Top"> + <StackPanel Width="400" VerticalAlignment="Top"> <Rectangle Height="20" VerticalAlignment="Top" Fill="{StaticResource Highlight}" /> @@ -150,8 +150,8 @@ <Rectangle x:Name="Rect" Fill="Orange" /> <sdk:Label HorizontalContentAlignment="Center" Content="{Binding Name}" - FontFamily="Segoe UI" - FontSize="20" + FontFamily="Segoe UI Light" + FontSize="16" Foreground="White" /> </Grid> </Viewbox> @@ -197,7 +197,7 @@ <TextBlock x:Name="HeaderSubText" Width="300" Height="32" - Margin="0,130,-402,0" + Margin="0,130,-409,0" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" @@ -211,55 +211,70 @@ </TextBlock> <Grid x:Name="Page1_Content" Width="610" - Margin="0,13,-634,72" + Margin="0,150,-634,72" HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5"> + <Grid.RenderTransform> <CompositeTransform /> </Grid.RenderTransform> - <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> + + <Grid.RowDefinitions> + <RowDefinition Height="80" /> + <RowDefinition Height="*" /> + </Grid.RowDefinitions> + + <StackPanel Grid.Row="0" Orientation="Horizontal"> <ComboBox x:Name="FileExportTypesCombo" + Width="100" + Height="25" + Margin="20" ItemsSource="{Binding ExportFileTypes}" SelectedItem="{Binding SelectedExportFileTypes}" /> - <ItemsControl BorderThickness="0" ItemsSource="{Binding Fields}"> - <ItemsControl.ItemTemplate> - <DataTemplate> - <Grid> - <Grid.ColumnDefinitions> - <ColumnDefinition MinWidth="100" /> - <ColumnDefinition Width="*" /> - </Grid.ColumnDefinitions> - <TextBlock VerticalAlignment="Center" Text="{Binding Caption}" /> - <c:FormFieldTemplateSelector Grid.Column="1" - Margin="0,2,0,2" - DataType="{Binding Type}"> - <c:FormFieldTemplateSelector.DataTemplates> - <c:TemplateSelectorDataTemplate DataType="System.String"> - <TextBox Width="100" Text="{Binding Value, Mode=TwoWay}" /> - </c:TemplateSelectorDataTemplate> - <c:TemplateSelectorDataTemplate DataType="System.DateTime"> - <sdk:DatePicker Width="100" SelectedDate="{Binding Value, Mode=TwoWay}" /> - </c:TemplateSelectorDataTemplate> - <c:TemplateSelectorDataTemplate DataType="System.Boolean"> - <CheckBox IsChecked="{Binding Value, Mode=TwoWay}" /> - </c:TemplateSelectorDataTemplate> - </c:FormFieldTemplateSelector.DataTemplates> - </c:FormFieldTemplateSelector> - </Grid> - </DataTemplate> - </ItemsControl.ItemTemplate> - </ItemsControl> <Button x:Name="SmallButton" Width="100" Height="40" - Margin="0,0,0,92" - HorizontalAlignment="Right" - VerticalAlignment="Bottom" + Margin="20" Content="Submit" Style="{StaticResource SmallTile_Btn}" /> </StackPanel> + <ItemsControl Grid.Row="1" + Height="100" + BorderThickness="0" + ItemsSource="{Binding Fields}"> + + <ItemsControl.ItemTemplate> + <DataTemplate> + <Grid> + <Grid.ColumnDefinitions> + <ColumnDefinition MinWidth="100" /> + <ColumnDefinition Width="*" /> + </Grid.ColumnDefinitions> + <TextBlock VerticalAlignment="Center" Text="{Binding Caption}" /> + <c:FormFieldTemplateSelector Grid.Column="1" + Margin="5" + DataType="{Binding Type}"> + <c:FormFieldTemplateSelector.DataTemplates> + <c:TemplateSelectorDataTemplate DataType="System.String"> + <TextBox Width="100" Text="{Binding Value, Mode=TwoWay}" /> + </c:TemplateSelectorDataTemplate> + <c:TemplateSelectorDataTemplate DataType="Float"> + <TextBox Width="100" Text="{Binding Value, Mode=TwoWay}" /> + </c:TemplateSelectorDataTemplate> + <c:TemplateSelectorDataTemplate DataType="System.DateTime"> + <sdk:DatePicker Width="100" SelectedDate="{Binding Value, Mode=TwoWay}" /> + </c:TemplateSelectorDataTemplate> + <c:TemplateSelectorDataTemplate DataType="System.Boolean"> + <CheckBox IsChecked="{Binding Value, Mode=TwoWay}" /> + </c:TemplateSelectorDataTemplate> + </c:FormFieldTemplateSelector.DataTemplates> + </c:FormFieldTemplateSelector> + </Grid> + </DataTemplate> + </ItemsControl.ItemTemplate> + </ItemsControl> </Grid> <Grid x:Name="Footer" Height="51"