Skip to content

Commit 66a91c6

Browse files
BornToBeRootBornToBeRoot
committed
UI improved
1 parent c7026e4 commit 66a91c6

13 files changed

Lines changed: 391 additions & 380 deletions

‎Source/NETworkManager/Controls/RemoteDesktopControl.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<RowDefinition Height="20" />
2222
<RowDefinition Height="Auto" />
2323
</Grid.RowDefinitions>
24-
<TextBlock Grid.Row="0" Text="{DynamicResource String_Header_Disconnected}" Style="{StaticResource HeaderTextBlock}" FontSize="18" />
24+
<TextBlock Grid.Row="0" Text="{DynamicResource String_Header_Disconnected}" Style="{StaticResource HeaderTextBlock}" />
2525
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding DisconnectReason}" Style="{DynamicResource DefaultTextBlock}" />
2626
<Button Grid.Row="4" Content="{DynamicResource String_Button_Reconnect}" Command="{Binding ReconnectCommand}" IsDefault="True" Style="{StaticResource DefaultButton}"/>
2727
</Grid>

‎Source/NETworkManager/MainWindow.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=FilterRemoveOutline}" />
457457
</Rectangle.OpacityMask>
458458
</Rectangle>
459-
<TextBlock Grid.Row="1" Style="{StaticResource HeaderTextBlock}" FontSize="18" Foreground="{DynamicResource GrayBrush3}" Text="{DynamicResource String_SearchedApplicationNotFound}" Margin="10,0" TextWrapping="Wrap" TextAlignment="Center" />
459+
<TextBlock Grid.Row="1" Style="{StaticResource HeaderTextBlock}" Foreground="{DynamicResource GrayBrush3}" Text="{DynamicResource String_SearchedApplicationNotFound}" Margin="10,0" TextWrapping="Wrap" TextAlignment="Center" />
460460
</Grid>
461461
<Border Grid.Row="2" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="0,1,0,0" Background="Transparent">
462462
<Button Height="48" HorizontalContentAlignment="Stretch" Command="{Binding OpenSettingsCommand}" Focusable="False">
@@ -562,7 +562,7 @@
562562
<RowDefinition Height="*" />
563563
</Grid.RowDefinitions>
564564
<Border x:Name="HeaderBorder" Grid.Row="0" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="0,0,0,1" MouseDown="HeaderBorder_MouseDown">
565-
<TextBlock VerticalAlignment="Center" Height="48" TextAlignment="Center" Style="{StaticResource HeaderTextBlock}" Text="{Binding SelectedApplication.TranslatedName}" Foreground="{DynamicResource GrayBrush3}" Margin="0" />
565+
<TextBlock VerticalAlignment="Center" Height="48" TextAlignment="Center" FontSize="22" Style="{StaticResource HeaderTextBlock}" Text="{Binding SelectedApplication.TranslatedName}" Foreground="{DynamicResource GrayBrush3}" Margin="0" />
566566
</Border>
567567
<ContentControl x:Name="contentControlApplication" Grid.Row="1" Focusable="False" />
568568
</Grid>

‎Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</Grid.ColumnDefinitions>
1818
<Rectangle Grid.Column="0" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" VerticalAlignment="Center">
1919
<Rectangle.OpacityMask>
20-
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronDown}" />
20+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Entypo Kind=ChevronThinDown}" />
2121
</Rectangle.OpacityMask>
2222
</Rectangle>
2323
<Controls:ContentControlEx Grid.Column="1"
@@ -40,7 +40,7 @@
4040
<Trigger Property="IsChecked" Value="True">
4141
<Setter TargetName="Chevron" Property="OpacityMask">
4242
<Setter.Value>
43-
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronUp}" />
43+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Entypo Kind=ChevronThinUp}" />
4444
</Setter.Value>
4545
</Setter>
4646
</Trigger>
@@ -91,7 +91,7 @@
9191
</Controls:ContentControlEx>
9292
<Rectangle Grid.Column="1" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" VerticalAlignment="Center">
9393
<Rectangle.OpacityMask>
94-
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronDown}" />
94+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Entypo Kind=ChevronThinDown}" />
9595
</Rectangle.OpacityMask>
9696
</Rectangle>
9797
</Grid>
@@ -100,7 +100,7 @@
100100
<Trigger Property="IsChecked" Value="True">
101101
<Setter TargetName="Chevron" Property="OpacityMask">
102102
<Setter.Value>
103-
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronUp}" />
103+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Entypo Kind=ChevronThinUp}" />
104104
</Setter.Value>
105105
</Setter>
106106
</Trigger>
@@ -138,7 +138,7 @@
138138
<TextBlock Grid.Column="0" Text="{TemplateBinding Content}" Style="{StaticResource HeaderTextBlock}" Margin="10,10,10,0" />
139139
<Rectangle Grid.Column="1" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" Margin="0,10,10,0" VerticalAlignment="Center" HorizontalAlignment="Center">
140140
<Rectangle.OpacityMask>
141-
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronLeft}" />
141+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Entypo Kind=ChevronThinLeft}" />
142142
</Rectangle.OpacityMask>
143143
</Rectangle>
144144
</Grid>
@@ -166,12 +166,12 @@
166166
<RowDefinition Height="Auto" />
167167
<RowDefinition Height="*" />
168168
</Grid.RowDefinitions>
169-
<Rectangle Grid.Row="0" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" Margin="10,14.5,10,10" VerticalAlignment="Center" HorizontalAlignment="Center">
169+
<Rectangle Grid.Row="0" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" Margin="10,12.5,10,10" VerticalAlignment="Center" HorizontalAlignment="Center">
170170
<Rectangle.OpacityMask>
171-
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronRight}" />
171+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:Entypo Kind=ChevronThinRight}" />
172172
</Rectangle.OpacityMask>
173173
</Rectangle>
174-
<TextBlock Grid.Row="1" Text="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" FontSize="18" Style="{StaticResource HeaderTextBlock}" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center">
174+
<TextBlock Grid.Row="1" Text="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" Style="{StaticResource HeaderTextBlock}" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center">
175175
<TextBlock.LayoutTransform>
176176
<RotateTransform Angle="90" />
177177
</TextBlock.LayoutTransform>

‎Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,21 @@
77

88
<Style x:Key="HeaderTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
99
<Setter Property="FontFamily" Value="{StaticResource HeaderFontFamily}" />
10-
<Setter Property="FontSize" Value="22" />
10+
<Setter Property="FontSize" Value="18" />
1111
<Setter Property="Margin" Value="0,0,0,10" />
1212
</Style>
1313

14+
<Style x:Key="MessageTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
15+
<Setter Property="FontFamily" Value="{StaticResource HeaderFontFamily}" />
16+
<Setter Property="FontSize" Value="18" />
17+
<Setter Property="Foreground" Value="{DynamicResource GrayBrush3}" />
18+
<Setter Property="VerticalAlignment" Value="Center" />
19+
<Setter Property="HorizontalAlignment" Value="Center" />
20+
<Setter Property="TextWrapping" Value="Wrap" />
21+
<Setter Property="TextAlignment" Value="Center" />
22+
<Setter Property="Margin" Value="10,0" />
23+
</Style>
24+
1425
<Style x:Key="BoldTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
1526
<Setter Property="FontWeight" Value="Bold" />
1627
</Style>

‎Source/NETworkManager/Views/Applications/DNSLookupView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
<Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
188188
<Expander.Header>
189189
<StackPanel Orientation="Horizontal">
190-
<TextBlock Text="{Binding Name}" FontSize="18" Margin="0" Style="{DynamicResource HeaderTextBlock}" />
190+
<TextBlock Text="{Binding Name}" Margin="0" />
191191
</StackPanel>
192192
</Expander.Header>
193193
<ItemsPresenter />

‎Source/NETworkManager/Views/Applications/IPScannerView.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
<ControlTemplate>
393393
<Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
394394
<Expander.Header>
395-
<TextBlock Text="{Binding Name}" Style="{StaticResource HeaderTextBlock}" FontSize="18" Margin="0" />
395+
<TextBlock Text="{Binding Name}" Style="{DynamicResource DefaultTextBlock}" />
396396
</Expander.Header>
397397
<ItemsPresenter />
398398
</Expander>
@@ -409,9 +409,9 @@
409409
</Style>
410410
</ListBox.ItemContainerStyle>
411411
</ListBox>
412-
<TextBlock Grid.Row="2" FontSize="18" Foreground="{DynamicResource GrayBrush3}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" >
412+
<TextBlock Grid.Row="2" >
413413
<TextBlock.Style>
414-
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource HeaderTextBlock}">
414+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
415415
<Setter Property="Visibility" Value="Collapsed" />
416416
<Style.Triggers>
417417
<DataTrigger Binding="{Binding IPScannerProfiles.Count}" Value="0" >

0 commit comments

Comments
 (0)