Skip to content

Commit 6ff56ee

Browse files
itn3000itn3000
committed
fix control alignment(#8)
1 parent cd2ba63 commit 6ff56ee

File tree

1 file changed

+67
-62
lines changed

1 file changed

+67
-62
lines changed

‎src/WEventViewer/OpenLogWindow.axaml

Lines changed: 67 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,36 @@
88
x:Class="WEventViewer.OpenLogWindow"
99
x:DataType="vm:OpenLogWindowViewModel"
1010
Title="OpenLogWindow">
11-
<Design.DataContext>
12-
<vm:OpenLogWindowViewModel/>
13-
</Design.DataContext>
14-
<Window.Resources>
15-
<vm:PathTypeValueConverter x:Key="PathTypeConverter"/>
16-
</Window.Resources>
17-
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="20">
18-
<Grid.RowDefinitions>
19-
<RowDefinition Height="*"></RowDefinition>
20-
<RowDefinition Height="Auto"></RowDefinition>
21-
</Grid.RowDefinitions>
22-
<StackPanel Margin="10" Orientation="Vertical" Grid.Row="0" Name="OptionPanel">
23-
<Grid HorizontalAlignment="Stretch" Grid.Row="0" VerticalAlignment="Center">
24-
<Grid.ColumnDefinitions>
25-
<ColumnDefinition Width="Auto"/>
26-
<ColumnDefinition Width="*"/>
27-
<ColumnDefinition Width="Auto"/>
28-
</Grid.ColumnDefinitions>
29-
<Label Content="LogName"
11+
<Design.DataContext>
12+
<vm:OpenLogWindowViewModel/>
13+
</Design.DataContext>
14+
<Window.Resources>
15+
<vm:PathTypeValueConverter x:Key="PathTypeConverter"/>
16+
</Window.Resources>
17+
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="20">
18+
<Grid.RowDefinitions>
19+
<RowDefinition Height="*"></RowDefinition>
20+
<RowDefinition Height="Auto"></RowDefinition>
21+
</Grid.RowDefinitions>
22+
<Grid Margin="10" Grid.Row="0" Name="OptionPanel">
23+
<Grid.RowDefinitions>
24+
<RowDefinition Height="Auto"/>
25+
<RowDefinition Height="Auto"/>
26+
<RowDefinition Height="*"/>
27+
</Grid.RowDefinitions>
28+
<Grid HorizontalAlignment="Stretch" Grid.Row="0" VerticalAlignment="Center">
29+
<Grid.ColumnDefinitions>
30+
<ColumnDefinition Width="Auto"/>
31+
<ColumnDefinition Width="*"/>
32+
<ColumnDefinition Width="Auto"/>
33+
</Grid.ColumnDefinitions>
34+
<Label Content="LogName"
3035
Margin="10,10,10,10"
3136
VerticalAlignment="Center"
3237
HorizontalAlignment="Left"
3338
Grid.Column="0"
3439
/>
35-
<TextBox HorizontalContentAlignment="Left"
40+
<TextBox HorizontalContentAlignment="Left"
3641
VerticalContentAlignment="Center"
3742
HorizontalAlignment="Stretch"
3843
TextAlignment="Left"
@@ -41,58 +46,58 @@
4146
MinWidth="200" MaxWidth="1000"
4247
Grid.Column="1"
4348
/>
44-
<Button Name="OpenLogButton"
49+
<Button Name="OpenLogButton"
4550
Grid.Column="2"
4651
Content="Open"
4752
IsVisible="{Binding IsEnableFilePathOpenButton}"
4853
Click="OnLogOpenButtonClicked"/>
49-
</Grid>
50-
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
51-
<Grid.ColumnDefinitions>
52-
<ColumnDefinition Width="Auto"/>
53-
<ColumnDefinition Width="Auto"/>
54-
</Grid.ColumnDefinitions>
55-
<Label Content="PathType"
54+
</Grid>
55+
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" Grid.Row="1">
56+
<Grid.ColumnDefinitions>
57+
<ColumnDefinition Width="Auto"/>
58+
<ColumnDefinition Width="Auto"/>
59+
</Grid.ColumnDefinitions>
60+
<Label Content="PathType"
5661
Margin="10,10,10,10"
5762
HorizontalAlignment="Left"
5863
VerticalAlignment="Center"
5964
Grid.Column="0"/>
60-
<!--<TextBox Margin="10,10,10,10"
65+
<!--<TextBox Margin="10,10,10,10"
6166
HorizontalAlignment="Stretch"
6267
TextAlignment="Left"
6368
VerticalContentAlignment="Center"
6469
Text="{Binding Path=PathType, Mode=TwoWay,Converter={StaticResource PathTypeConverter}}"/>-->
65-
<ComboBox
70+
<ComboBox
6671
HorizontalAlignment="Stretch"
6772
Margin="10"
6873
ItemsSource="{Binding PathTypes}"
6974
SelectedValue="{Binding CurrentSelected}"
7075
Grid.Column="1"
7176
>
72-
<ComboBox.ItemTemplate>
73-
<DataTemplate>
74-
<Label Content="{Binding DisplayName}"/>
75-
</DataTemplate>
76-
</ComboBox.ItemTemplate>
77-
</ComboBox>
78-
</Grid>
79-
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" MaxHeight="300" MaxWidth="{Binding #OptionPanel.Bounds.Width}">
80-
<StackPanel Orientation="Vertical" Margin="10">
81-
<CheckBox Name="UseRawQuery" Content="raw query" Margin="10" IsChecked="{Binding UseRawQuery}"/>
82-
<TextBox Name="RawQueryInput" Margin="10" Text="{Binding RawQuery}" IsEnabled="{Binding UseRawQuery}"/>
83-
<Border BorderThickness="1" BorderBrush="Gray"/>
84-
<StackPanel Orientation="Horizontal">
85-
<CheckBox Content="Since:" IsChecked="{Binding UseBeginDate}" Margin="10"/>
86-
<DatePicker Name="BeginDate" SelectedDate="{Binding BeginDate}" IsEnabled="{Binding UseBeginDate}"/>
87-
<TimePicker Name="BeginTime" SelectedTime="{Binding BeginTime}" IsEnabled="{Binding UseBeginDate}"/>
88-
</StackPanel>
89-
<StackPanel Orientation="Horizontal">
90-
<CheckBox Content="Until:" IsChecked="{Binding UseEndDate}" Margin="10"/>
91-
<DatePicker Name="EndDate" SelectedDate="{Binding EndDate}" IsEnabled="{Binding UseEndDate}"/>
92-
<TimePicker Name="EndTime" SelectedTime="{Binding EndTime}" IsEnabled="{Binding UseEndDate}"/>
93-
</StackPanel>
94-
<CheckBox Content="filter providers(separeted by ',')" Margin="10" IsChecked="{Binding UseProviderNames}"/>
95-
<TextBox Text="{Binding ProviderNames}" IsEnabled="{Binding UseProviderNames}"/>
77+
<ComboBox.ItemTemplate>
78+
<DataTemplate>
79+
<Label Content="{Binding DisplayName}"/>
80+
</DataTemplate>
81+
</ComboBox.ItemTemplate>
82+
</ComboBox>
83+
</Grid>
84+
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" Grid.Row="2">
85+
<StackPanel Orientation="Vertical" Margin="10">
86+
<CheckBox Name="UseRawQuery" Content="raw query" Margin="10" IsChecked="{Binding UseRawQuery}"/>
87+
<TextBox Name="RawQueryInput" Margin="10" Text="{Binding RawQuery}" IsEnabled="{Binding UseRawQuery}"/>
88+
<Border BorderThickness="1" BorderBrush="Gray"/>
89+
<StackPanel Orientation="Horizontal">
90+
<CheckBox Content="Since:" IsChecked="{Binding UseBeginDate}" Margin="10"/>
91+
<DatePicker Name="BeginDate" SelectedDate="{Binding BeginDate}" IsEnabled="{Binding UseBeginDate}"/>
92+
<TimePicker Name="BeginTime" SelectedTime="{Binding BeginTime}" IsEnabled="{Binding UseBeginDate}"/>
93+
</StackPanel>
94+
<StackPanel Orientation="Horizontal">
95+
<CheckBox Content="Until:" IsChecked="{Binding UseEndDate}" Margin="10"/>
96+
<DatePicker Name="EndDate" SelectedDate="{Binding EndDate}" IsEnabled="{Binding UseEndDate}"/>
97+
<TimePicker Name="EndTime" SelectedTime="{Binding EndTime}" IsEnabled="{Binding UseEndDate}"/>
98+
</StackPanel>
99+
<CheckBox Content="filter providers(separeted by ',')" Margin="10" IsChecked="{Binding UseProviderNames}"/>
100+
<TextBox Text="{Binding ProviderNames}" IsEnabled="{Binding UseProviderNames}"/>
96101
<CheckBox Content="filter by level" Margin="10" IsChecked="{Binding UseFilterByLevel}"/>
97102
<StackPanel Orientation="Horizontal">
98103
<CheckBox Content="Critical" Margin="10" IsChecked="{Binding IsCriticalChecked}" IsEnabled="{Binding UseFilterByLevel}"/>
@@ -102,13 +107,13 @@
102107
<CheckBox Content="Verbose" Margin="10" IsChecked="{Binding IsVerboseChecked}" IsEnabled="{Binding UseFilterByLevel}"/>
103108
</StackPanel>
104109
</StackPanel>
105-
</ScrollViewer>
106-
<!--<Expander Header="Advanced" Grid.Row="2" HorizontalAlignment="Stretch" MaxHeight="300">
110+
</ScrollViewer>
111+
<!--<Expander Header="Advanced" Grid.Row="2" HorizontalAlignment="Stretch" MaxHeight="300">
107112
</Expander>-->
108-
</StackPanel>
109-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1" VerticalAlignment="Bottom">
110-
<Button Content="OK" Command="{ Binding OkCommand }" Margin="10" Padding="10"/>
111-
<Button Content="Cancel" Command="{ Binding CancelCommand }" Margin="10" Padding="10"/>
112-
</StackPanel>
113-
</Grid>
113+
</Grid>
114+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1" VerticalAlignment="Bottom">
115+
<Button Content="OK" Command="{ Binding OkCommand }" Margin="10" Padding="10"/>
116+
<Button Content="Cancel" Command="{ Binding CancelCommand }" Margin="10" Padding="10"/>
117+
</StackPanel>
118+
</Grid>
114119
</Window>

0 commit comments

Comments
 (0)