Skip to content

Commit 4c12c53

Browse files
BornToBeRootBornToBeRoot
committed
Chore: Adjust design & refactoring & cleanup
1 parent 4dcc399 commit 4c12c53

4 files changed

Lines changed: 252 additions & 215 deletions

File tree

‎Source/NETworkManager/Views/ARPTableView.xaml‎

Lines changed: 74 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -36,60 +36,70 @@
3636
<RowDefinition Height="10" />
3737
<RowDefinition Height="Auto" />
3838
</Grid.RowDefinitions>
39-
<StackPanel Grid.Column="0" Grid.Row="0"
40-
Orientation="Horizontal"
41-
VerticalAlignment="Center"
42-
HorizontalAlignment="Right">
43-
<CheckBox IsChecked="{Binding AutoRefreshEnabled}"
44-
Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}"
45-
Margin="0,0,10,0" />
46-
<ComboBox ItemsSource="{Binding AutoRefreshTimes}"
47-
SelectedItem="{Binding SelectedAutoRefreshTime}"
48-
MinWidth="150"
49-
Margin="0,0,10,0">
50-
<ComboBox.ItemTemplate>
51-
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
52-
<TextBlock>
53-
<TextBlock.Text>
54-
<MultiBinding StringFormat="{}{0} {1}">
55-
<Binding Path="Value" />
56-
<Binding Path="TimeUnit"
57-
Converter="{StaticResource TimeUnitToStringConverter}" />
58-
</MultiBinding>
59-
</TextBlock.Text>
60-
</TextBlock>
61-
</DataTemplate>
62-
</ComboBox.ItemTemplate>
63-
</ComboBox>
64-
<Button Command="{Binding Path=RefreshCommand}"
65-
Style="{StaticResource CleanButton}"
66-
Margin="0,0,10,0">
67-
<Rectangle Width="24" Height="24"
68-
wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
69-
<Rectangle.OpacityMask>
70-
<VisualBrush Stretch="Uniform"
71-
Visual="{iconPacks:Material Kind=Refresh}" />
72-
</Rectangle.OpacityMask>
73-
<Rectangle.Style>
74-
<Style TargetType="{x:Type TypeName=Rectangle}">
75-
<Setter Property="Fill"
76-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
77-
<Style.Triggers>
78-
<DataTrigger
79-
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
80-
Value="True">
81-
<Setter Property="Fill"
82-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
83-
</DataTrigger>
84-
</Style.Triggers>
85-
</Style>
86-
</Rectangle.Style>
87-
</Rectangle>
88-
</Button>
89-
<TextBox Width="250"
90-
Text="{Binding Path=Search, UpdateSourceTrigger=PropertyChanged}"
91-
Style="{StaticResource ResourceKey=SearchTextBox}" />
92-
</StackPanel>
39+
<Grid Grid.Column="0" Grid.Row="0">
40+
<Grid.ColumnDefinitions>
41+
<ColumnDefinition Width="*" />
42+
<ColumnDefinition Width="Auto" />
43+
</Grid.ColumnDefinitions>
44+
<TextBlock Grid.Column="0"
45+
Style="{StaticResource HeaderTextBlock}"
46+
Text="{x:Static localization:Strings.ARPTable}"
47+
VerticalAlignment="Center" />
48+
<StackPanel Grid.Column="1"
49+
Orientation="Horizontal"
50+
VerticalAlignment="Center"
51+
HorizontalAlignment="Right">
52+
<CheckBox IsChecked="{Binding AutoRefreshEnabled}"
53+
Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}"
54+
Margin="0,0,10,0" />
55+
<ComboBox ItemsSource="{Binding AutoRefreshTimes}"
56+
SelectedItem="{Binding SelectedAutoRefreshTime}"
57+
MinWidth="150"
58+
Margin="0,0,10,0">
59+
<ComboBox.ItemTemplate>
60+
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
61+
<TextBlock>
62+
<TextBlock.Text>
63+
<MultiBinding StringFormat="{}{0} {1}">
64+
<Binding Path="Value" />
65+
<Binding Path="TimeUnit"
66+
Converter="{StaticResource TimeUnitToStringConverter}" />
67+
</MultiBinding>
68+
</TextBlock.Text>
69+
</TextBlock>
70+
</DataTemplate>
71+
</ComboBox.ItemTemplate>
72+
</ComboBox>
73+
<Button Command="{Binding Path=RefreshCommand}"
74+
Style="{StaticResource CleanButton}"
75+
Margin="0,0,10,0">
76+
<Rectangle Width="16" Height="16"
77+
wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
78+
<Rectangle.OpacityMask>
79+
<VisualBrush Stretch="Uniform"
80+
Visual="{iconPacks:Material Kind=Refresh}" />
81+
</Rectangle.OpacityMask>
82+
<Rectangle.Style>
83+
<Style TargetType="{x:Type TypeName=Rectangle}">
84+
<Setter Property="Fill"
85+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
86+
<Style.Triggers>
87+
<DataTrigger
88+
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
89+
Value="True">
90+
<Setter Property="Fill"
91+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
92+
</DataTrigger>
93+
</Style.Triggers>
94+
</Style>
95+
</Rectangle.Style>
96+
</Rectangle>
97+
</Button>
98+
<TextBox Width="250"
99+
Text="{Binding Path=Search, UpdateSourceTrigger=PropertyChanged}"
100+
Style="{StaticResource ResourceKey=SearchTextBox}" />
101+
</StackPanel>
102+
</Grid>
93103
<controls:MultiSelectDataGrid x:Name="DataGridArpTable"
94104
Grid.Column="0" Grid.Row="2"
95105
ItemsSource="{Binding ResultsView}"
@@ -177,18 +187,17 @@
177187
</controls:MultiSelectDataGrid.Columns>
178188
</controls:MultiSelectDataGrid>
179189
<WrapPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal"
180-
VerticalAlignment="Center"
181-
HorizontalAlignment="Left">
190+
VerticalAlignment="Center"
191+
HorizontalAlignment="Left">
182192
<networkManager:LoadingIndicator IsActive="True"
183-
Style="{DynamicResource ResourceKey=LoadingIndicatorPulseStyle}"
184-
Visibility="{Binding Path=IsRefreshing, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
185-
Width="24" Height="24"
186-
SpeedRatio="1" Margin="0,0,10,0" />
187-
<TextBlock Foreground="{DynamicResource MahApps.Brushes.Accent}"
188-
Text="{Binding StatusMessage}"
189-
VerticalAlignment="Center"
190-
Visibility="{Binding IsStatusMessageDisplayed, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
191-
Style="{DynamicResource StatusMessageTextBlock}" />
193+
Style="{DynamicResource ResourceKey=LoadingIndicatorPulseStyle}"
194+
Visibility="{Binding Path=IsRefreshing, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
195+
Width="24" Height="24"
196+
SpeedRatio="1" Margin="0,0,10,0" />
197+
<TextBlock Style="{StaticResource ResourceKey=AccentTextBlock}"
198+
Visibility="{Binding Path=IsStatusMessageDisplayed, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
199+
Text="{Binding Path=StatusMessage}"
200+
VerticalAlignment="Center" />
192201
</WrapPanel>
193202
<Grid Grid.Column="0" Grid.Row="6">
194203
<Grid.ColumnDefinitions>

‎Source/NETworkManager/Views/ConnectionsView.xaml‎

Lines changed: 68 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -31,60 +31,70 @@
3131
<RowDefinition Height="10" />
3232
<RowDefinition Height="Auto" />
3333
</Grid.RowDefinitions>
34-
<StackPanel Grid.Column="0" Grid.Row="0"
35-
Orientation="Horizontal"
36-
VerticalAlignment="Center"
37-
HorizontalAlignment="Right">
38-
<CheckBox IsChecked="{Binding AutoRefreshEnabled}"
39-
Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}"
40-
Margin="0,0,10,0" />
41-
<ComboBox ItemsSource="{Binding AutoRefreshTimes}"
42-
SelectedItem="{Binding SelectedAutoRefreshTime}"
43-
MinWidth="150"
44-
Margin="0,0,10,0">
45-
<ComboBox.ItemTemplate>
46-
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
47-
<TextBlock>
48-
<TextBlock.Text>
49-
<MultiBinding StringFormat="{}{0} {1}">
50-
<Binding Path="Value" />
51-
<Binding Path="TimeUnit"
52-
Converter="{StaticResource TimeUnitToStringConverter}" />
53-
</MultiBinding>
54-
</TextBlock.Text>
55-
</TextBlock>
56-
</DataTemplate>
57-
</ComboBox.ItemTemplate>
58-
</ComboBox>
59-
<Button Command="{Binding Path=RefreshCommand}"
60-
Style="{StaticResource CleanButton}"
61-
Margin="0,0,10,0">
62-
<Rectangle Width="24" Height="24"
63-
wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
64-
<Rectangle.OpacityMask>
65-
<VisualBrush Stretch="Uniform"
66-
Visual="{iconPacks:Material Kind=Refresh}" />
67-
</Rectangle.OpacityMask>
68-
<Rectangle.Style>
69-
<Style TargetType="{x:Type TypeName=Rectangle}">
70-
<Setter Property="Fill"
71-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
72-
<Style.Triggers>
73-
<DataTrigger
74-
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
75-
Value="True">
76-
<Setter Property="Fill"
77-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
78-
</DataTrigger>
79-
</Style.Triggers>
80-
</Style>
81-
</Rectangle.Style>
82-
</Rectangle>
83-
</Button>
84-
<TextBox Width="250"
85-
Text="{Binding Path=Search, UpdateSourceTrigger=PropertyChanged}"
86-
Style="{StaticResource ResourceKey=SearchTextBox}" />
87-
</StackPanel>
34+
<Grid Grid.Column="0" Grid.Row="0">
35+
<Grid.ColumnDefinitions>
36+
<ColumnDefinition Width="*" />
37+
<ColumnDefinition Width="Auto" />
38+
</Grid.ColumnDefinitions>
39+
<TextBlock Grid.Column="0"
40+
Style="{StaticResource HeaderTextBlock}"
41+
Text="{x:Static localization:Strings.Connections}"
42+
VerticalAlignment="Center" />
43+
<StackPanel Grid.Column="1"
44+
Orientation="Horizontal"
45+
VerticalAlignment="Center"
46+
HorizontalAlignment="Right">
47+
<CheckBox IsChecked="{Binding AutoRefreshEnabled}"
48+
Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}"
49+
Margin="0,0,10,0" />
50+
<ComboBox ItemsSource="{Binding AutoRefreshTimes}"
51+
SelectedItem="{Binding SelectedAutoRefreshTime}"
52+
MinWidth="150"
53+
Margin="0,0,10,0">
54+
<ComboBox.ItemTemplate>
55+
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
56+
<TextBlock>
57+
<TextBlock.Text>
58+
<MultiBinding StringFormat="{}{0} {1}">
59+
<Binding Path="Value" />
60+
<Binding Path="TimeUnit"
61+
Converter="{StaticResource TimeUnitToStringConverter}" />
62+
</MultiBinding>
63+
</TextBlock.Text>
64+
</TextBlock>
65+
</DataTemplate>
66+
</ComboBox.ItemTemplate>
67+
</ComboBox>
68+
<Button Command="{Binding Path=RefreshCommand}"
69+
Style="{StaticResource CleanButton}"
70+
Margin="0,0,10,0">
71+
<Rectangle Width="16" Height="16"
72+
wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
73+
<Rectangle.OpacityMask>
74+
<VisualBrush Stretch="Uniform"
75+
Visual="{iconPacks:Material Kind=Refresh}" />
76+
</Rectangle.OpacityMask>
77+
<Rectangle.Style>
78+
<Style TargetType="{x:Type TypeName=Rectangle}">
79+
<Setter Property="Fill"
80+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
81+
<Style.Triggers>
82+
<DataTrigger
83+
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
84+
Value="True">
85+
<Setter Property="Fill"
86+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
87+
</DataTrigger>
88+
</Style.Triggers>
89+
</Style>
90+
</Rectangle.Style>
91+
</Rectangle>
92+
</Button>
93+
<TextBox Width="250"
94+
Text="{Binding Path=Search, UpdateSourceTrigger=PropertyChanged}"
95+
Style="{StaticResource ResourceKey=SearchTextBox}" />
96+
</StackPanel>
97+
</Grid>
8898
<controls:MultiSelectDataGrid Grid.Column="0" Grid.Row="2"
8999
ItemsSource="{Binding ResultsView}"
90100
SelectedItem="{Binding SelectedResult}"
@@ -212,11 +222,10 @@
212222
Visibility="{Binding Path=IsRefreshing, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
213223
Width="24" Height="24"
214224
SpeedRatio="1" Margin="0,0,10,0" />
215-
<TextBlock Foreground="{DynamicResource MahApps.Brushes.Accent}"
216-
Text="{Binding StatusMessage}"
217-
VerticalAlignment="Center"
218-
Visibility="{Binding IsStatusMessageDisplayed, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
219-
Style="{DynamicResource StatusMessageTextBlock}" />
225+
<TextBlock Style="{StaticResource ResourceKey=AccentTextBlock}"
226+
Visibility="{Binding Path=IsStatusMessageDisplayed, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
227+
Text="{Binding Path=StatusMessage}"
228+
VerticalAlignment="Center" />
220229
</WrapPanel>
221230
</Grid>
222231
</TabItem>

0 commit comments

Comments
 (0)