Skip to content

Commit 9088777

Browse files
committed
Feature: Delete dialog added
1 parent 6260d1f commit 9088777

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

Source/NETworkManager/Views/ConfirmDeleteChildWindow.xaml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
77
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
88
xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
9+
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
10+
ChildWindowWidth="450"
11+
ChildWindowMaxHeight="500"
912
ShowTitleBar="True"
1013
TitleBarBackground="Transparent"
1114
TitleBarNonActiveBackground="Transparent"
@@ -22,9 +25,25 @@
2225
<RowDefinition Height="10" />
2326
<RowDefinition Height="Auto" />
2427
</Grid.RowDefinitions>
25-
<StackPanel Grid.Row="0">
26-
<TextBlock Text="{Binding Path=Message}" Style="{StaticResource ResourceKey=WrapTextBlock}" />
27-
</StackPanel>
28+
<ScrollViewer Grid.Column="0" Grid.Row="0"
29+
VerticalScrollBarVisibility="Auto"
30+
HorizontalScrollBarVisibility="Disabled">
31+
<Grid>
32+
<Grid.ColumnDefinitions>
33+
<ColumnDefinition Width="Auto" />
34+
<ColumnDefinition Width="10" />
35+
<ColumnDefinition Width="*" />
36+
</Grid.ColumnDefinitions>
37+
<Rectangle Grid.Column="0" Grid.Row="0"
38+
Width="32" Height="32"
39+
Style="{StaticResource InfoImageRectangle}" />
40+
<TextBlock Grid.Column="2" Grid.Row="0"
41+
VerticalAlignment="Center"
42+
Text="{Binding Message}"
43+
Style="{StaticResource ResourceKey=WrapTextBlock}"
44+
Foreground="{DynamicResource MahApps.Brushes.Gray3}"/>
45+
</Grid>
46+
</ScrollViewer>
2847
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
2948
<Button Content="{x:Static Member=localization:Strings.Delete}" Command="{Binding Path=DeleteCommand}" IsDefault="True"
3049
Style="{StaticResource ResourceKey=HighlightedButton}" Margin="0,0,10,0" />

Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@
4949
</Rectangle.OpacityMask>
5050
</Rectangle>
5151
<TextBlock Grid.Column="2" Grid.Row="0"
52-
Text="{x:Static Member=localization:Strings.EnterMasterPasswordToUnlockProfile}"
52+
VerticalAlignment="Center"
53+
Text="{x:Static Member=localization:Strings.EnterMasterPasswordToUnlockProfile}"
5354
Style="{StaticResource ResourceKey=WrapTextBlock}"
54-
Foreground="{DynamicResource MahApps.Brushes.Gray5}"/>
55+
Foreground="{DynamicResource MahApps.Brushes.Gray3}"/>
5556
</Grid>
5657
<Grid Grid.Column="0" Grid.Row="2" Margin="42,0,0,0">
5758
<Grid.Resources>

0 commit comments

Comments
 (0)