Skip to content

Commit 8bd40ef

Browse files
BornToBeRootBornToBeRoot
authored
Fix: Dialog unlock size (#3026)
1 parent 205fd95 commit 8bd40ef

File tree

3 files changed

+81
-73
lines changed

3 files changed

+81
-73
lines changed

‎Source/NETworkManager/MainWindow.xaml‎

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -16,50 +16,52 @@
1616
xmlns:networkManager="clr-namespace:NETworkManager"
1717
xmlns:models="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
1818
mc:Ignorable="d"
19-
Style="{DynamicResource DefaultWindow}"
20-
dialogs:DialogParticipation.Register="{Binding}"
21-
MinWidth="800" Width="1024" Height="768" MinHeight="600"
19+
Style="{DynamicResource ResourceKey=DefaultWindow}"
20+
dialogs:DialogParticipation.Register="{Binding }"
21+
MinWidth="800" MinHeight="600"
22+
Width="1024" Height="768"
2223
SaveWindowPosition="True" TitleAlignment="Left"
2324
ContentRendered="MetroMainWindow_ContentRendered" StateChanged="MetroWindowMain_StateChanged"
2425
Activated="MetroMainWindow_Activated" Closing="MetroWindowMain_Closing"
2526
d:DataContext="{d:DesignInstance networkManager:MainWindow}">
2627
<!-- MetroDialogStyles.xaml must be adjusted if MinWidth/MinHeight is changed -->
2728
<mah:MetroWindow.Resources>
2829
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
30+
<converters:BooleanReverseConverter x:Key="BooleanReverseConverter"></converters:BooleanReverseConverter>
2931
<converters:ApplicationNameToTranslatedStringConverter x:Key="ApplicationNameToTranslatedStringConverter" />
3032
<converters:ApplicationNameToIconConverter x:Key="ApplicationNameToIconConverter" />
3133
<converters:IntZeroToVisibilityCollapsedConverter x:Key="IntZeroToVisibilityCollapsedConverter" />
3234
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
3335
<!-- ReSharper disable once Xaml.RedundantResource - Used in TrayIcon -->
3436
<ContextMenu x:Key="ContextMenuNotifyIcon" MinWidth="200" Opened="ContextMenu_Opened" x:Shared="False">
35-
<MenuItem Header="{x:Static localization:Strings.Show}" Command="{Binding ShowWindowCommand}">
37+
<MenuItem Header="{x:Static Member=localization:Strings.Show}" Command="{Binding Path=ShowWindowCommand}">
3638
<MenuItem.Icon>
37-
<Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
39+
<Rectangle Width="16" Height="16" Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
3840
<Rectangle.OpacityMask>
3941
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=OpenInNew}" />
4042
</Rectangle.OpacityMask>
4143
</Rectangle>
4244
</MenuItem.Icon>
4345
</MenuItem>
44-
<MenuItem Header="{x:Static localization:Strings.Status}" Command="{Binding OpenStatusWindowCommand}">
46+
<MenuItem Header="{x:Static Member=localization:Strings.Status}" Command="{Binding Path=OpenStatusWindowCommand}">
4547
<MenuItem.Icon>
46-
<Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
48+
<Rectangle Width="16" Height="16" Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
4749
<Rectangle.OpacityMask>
4850
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Pulse}" />
4951
</Rectangle.OpacityMask>
5052
</Rectangle>
5153
</MenuItem.Icon>
5254
</MenuItem>
53-
<MenuItem Header="{x:Static localization:Strings.Settings}" Command="{Binding OpenSettingsFromTrayCommand}">
55+
<MenuItem Header="{x:Static Member=localization:Strings.Settings}" Command="{Binding Path=OpenSettingsFromTrayCommand}">
5456
<MenuItem.Icon>
55-
<Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
57+
<Rectangle Width="16" Height="16" Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
5658
<Rectangle.OpacityMask>
5759
<VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
5860
</Rectangle.OpacityMask>
5961
</Rectangle>
6062
</MenuItem.Icon>
6163
</MenuItem>
62-
<MenuItem Header="{x:Static localization:Strings.Close}" Command="{Binding CloseApplicationCommand}">
64+
<MenuItem Header="{x:Static Member=localization:Strings.Close}" Command="{Binding Path=CloseApplicationCommand}">
6365
<MenuItem.Icon>
6466
<Rectangle Width="16" Height="16" Fill="Red">
6567
<Rectangle.OpacityMask>
@@ -71,27 +73,27 @@
7173
</ContextMenu>
7274
</mah:MetroWindow.Resources>
7375
<mah:MetroWindow.InputBindings>
74-
<KeyBinding Command="{Binding OpenRunCommand}" Modifiers="Control+Shift" Key="P" />
76+
<KeyBinding Command="{Binding Path=OpenRunCommand}" Modifiers="Control+Shift" Key="P" />
7577
</mah:MetroWindow.InputBindings>
7678
<mah:MetroWindow.WindowButtonCommands>
77-
<mah:WindowButtonCommands Template="{DynamicResource MahApps.Templates.WindowButtonCommands.Win10}" />
79+
<mah:WindowButtonCommands Template="{DynamicResource ResourceKey=MahApps.Templates.WindowButtonCommands.Win10}" />
7880
</mah:MetroWindow.WindowButtonCommands>
7981
<mah:MetroWindow.LeftWindowCommands>
8082
<mah:WindowCommands ShowSeparators="False">
8183
<!-- Fix some design issues with margin -2 and -1 -->
82-
<Grid Background="{DynamicResource MahApps.Brushes.Gray10}"
83-
Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsAdmin, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
84+
<Grid Background="{DynamicResource ResourceKey=MahApps.Brushes.Gray10}"
85+
Visibility="{Binding Source={x:Static Member=settings:ConfigurationManager.Current}, Path=IsAdmin, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
8486
Margin="-2,-1,0,0">
85-
<TextBlock Text="Administrator" Foreground="{DynamicResource MahApps.Brushes.Gray3}"
86-
Style="{StaticResource CenterTextBlock}" Margin="10,0" />
87+
<TextBlock Text="Administrator" Foreground="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"
88+
Style="{StaticResource ResourceKey=CenterTextBlock}" Margin="10,0" />
8789
</Grid>
8890
</mah:WindowCommands>
8991
</mah:MetroWindow.LeftWindowCommands>
9092
<mah:MetroWindow.RightWindowCommands>
91-
<mah:WindowCommands ShowSeparators="False" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsChildWindowOpen, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
92-
<Button Command="{Binding OpenRunCommand}"
93+
<mah:WindowCommands ShowSeparators="False" IsEnabled="{Binding Source={x:Static Member=settings:ConfigurationManager.Current}, Path=IsChildWindowOpen, Converter={StaticResource ResourceKey=BooleanReverseConverter}}">
94+
<Button Command="{Binding Path=OpenRunCommand}"
9395
Visibility="{Binding Path=FlyoutRunCommandIsOpen, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
94-
ToolTip="{x:Static localization:Strings.ToolTip_RunCommandWithHotKey}"
96+
ToolTip="{x:Static Member=localization:Strings.ToolTip_RunCommandWithHotKey}"
9597
Cursor="Hand"
9698
Focusable="False">
9799
<StackPanel Orientation="Horizontal">
@@ -103,56 +105,60 @@
103105
</Rectangle>
104106
</StackPanel>
105107
</Button>
106-
<Button Command="{Binding RestartApplicationCommand}"
108+
<Button Command="{Binding Path=RestartApplicationCommand}"
107109
Opacity="1"
108-
Visibility="{Binding IsRestartRequired, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
109-
ToolTip="{x:Static localization:Strings.RestartRequired}"
110+
Visibility="{Binding Path=IsRestartRequired, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
111+
ToolTip="{x:Static Member=localization:Strings.RestartRequired}"
110112
Cursor="Hand">
111113
<Rectangle Width="20" Height="20"
112-
Fill="{DynamicResource MahApps.Brushes.Accent}">
114+
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Accent}">
113115
<Rectangle.OpacityMask>
114116
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ReloadAlert}" />
115117
</Rectangle.OpacityMask>
116118
</Rectangle>
117119
</Button>
118-
<Button Command="{Binding OpenWebsiteCommand}"
120+
<Button Command="{Binding Path=OpenWebsiteCommand}"
119121
Opacity="1"
120-
Visibility="{Binding IsUpdateAvailable, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
121-
CommandParameter="{Binding UpdateReleaseUrl, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
122+
Visibility="{Binding Path=IsUpdateAvailable, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
123+
CommandParameter="{Binding Path=UpdateReleaseUrl, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
122124
Cursor="Hand"
123-
ToolTip="{x:Static localization:Strings.UpdateAvailable}"
125+
ToolTip="{x:Static Member=localization:Strings.UpdateAvailable}"
124126
Focusable="False">
125127
<Rectangle Width="20" Height="20"
126-
Fill="{DynamicResource MahApps.Brushes.Accent}">
128+
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Accent}">
127129
<Rectangle.OpacityMask>
128130
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=RocketLaunchOutline}" />
129131
</Rectangle.OpacityMask>
130132
</Rectangle>
131133
</Button>
132-
<Button Command="{Binding UnlockProfileCommand}"
134+
<Button Command="{Binding Path=UnlockProfileCommand}"
133135
Opacity="1"
134-
Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=ProfileManagerShowUnlock, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
135-
CommandParameter="{Binding UpdateReleaseUrl, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
136+
Visibility="{Binding Source={x:Static Member=settings:ConfigurationManager.Current}, Path=ProfileManagerShowUnlock, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
137+
CommandParameter="{Binding Path=UpdateReleaseUrl, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
136138
Cursor="Hand"
137-
ToolTip="{x:Static localization:Strings.UnlockProfile}"
139+
ToolTip="{x:Static Member=localization:Strings.UnlockProfile}"
138140
Focusable="False">
139141
<Rectangle Width="20" Height="20"
140-
Fill="{DynamicResource MahApps.Brushes.Accent}">
142+
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Accent}">
141143
<Rectangle.OpacityMask>
142144
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=InterfacePassword}" />
143145
</Rectangle.OpacityMask>
144146
</Rectangle>
145147
</Button>
146-
<ComboBox ItemsSource="{Binding ProfileFiles}"
147-
SelectedItem="{Binding SelectedProfileFile, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
148-
IsDropDownOpen="{Binding IsProfileFileDropDownOpened}"
149-
Background="{DynamicResource MahApps.Brushes.Gray10}"
148+
<ComboBox ItemsSource="{Binding Path=ProfileFiles}"
149+
SelectedItem="{Binding Path=SelectedProfileFile, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
150+
IsDropDownOpen="{Binding Path=IsProfileFileDropDownOpened}"
151+
Background="{DynamicResource ResourceKey=MahApps.Brushes.Gray10}"
150152
BorderThickness="0"
151153
MinWidth="180"
152154
HorizontalAlignment="Left"
153155
Focusable="False"
154156
VerticalAlignment="Center"
155157
Height="30">
158+
<ComboBox.Resources>
159+
<!-- ReSharper disable once Xaml.RedundantResource - Override MahApps default style -->
160+
<SolidColorBrush x:Key="MahApps.Brushes.Control.Disabled" Color="{DynamicResource ResourceKey=MahApps.Colors.Gray8}" />
161+
</ComboBox.Resources>
156162
<ComboBox.ItemTemplate>
157163
<DataTemplate>
158164
<Grid>
@@ -162,7 +168,7 @@
162168
<ColumnDefinition MinWidth="70" />
163169
</Grid.ColumnDefinitions>
164170
<Rectangle Grid.Column="0" Grid.Row="0" Width="20" Height="20"
165-
Fill="{DynamicResource MahApps.Brushes.Gray3}">
171+
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
166172
<Rectangle.Style>
167173
<Style TargetType="Rectangle">
168174
<Setter Property="OpacityMask">
@@ -172,7 +178,7 @@
172178
</Setter.Value>
173179
</Setter>
174180
<Style.Triggers>
175-
<DataTrigger Binding="{Binding IsEncrypted}" Value="True">
181+
<DataTrigger Binding="{Binding Path=IsEncrypted}" Value="True">
176182
<Setter Property="OpacityMask">
177183
<Setter.Value>
178184
<VisualBrush Stretch="Uniform"
@@ -184,14 +190,14 @@
184190
</Style>
185191
</Rectangle.Style>
186192
</Rectangle>
187-
<TextBlock Grid.Column="2" Grid.Row="0" Text="{Binding Name}" />
193+
<TextBlock Grid.Column="2" Grid.Row="0" Text="{Binding Path=Name}" />
188194
</Grid>
189195
</DataTemplate>
190196
</ComboBox.ItemTemplate>
191197
</ComboBox>
192-
<Button Command="{Binding OpenWebsiteCommand}"
193-
ToolTip="{x:Static localization:Strings.ToolTip_StarForkProjectOnGitHub}"
194-
CommandParameter="{x:Static resources:Resources.NETworkManager_GitHubRepoUrl}"
198+
<Button Command="{Binding Path=OpenWebsiteCommand}"
199+
ToolTip="{x:Static Member=localization:Strings.ToolTip_StarForkProjectOnGitHub}"
200+
CommandParameter="{x:Static Member=resources:Resources.NETworkManager_GitHubRepoUrl}"
195201
Cursor="Hand"
196202
Focusable="False">
197203
<StackPanel Orientation="Horizontal">
@@ -204,9 +210,9 @@
204210
</StackPanel>
205211
</Button>
206212

207-
<Button Command="{Binding OpenWebsiteCommand}"
208-
ToolTip="{x:Static localization:Strings.ToolTip_ReportIssueOrCreateFeatureRequest}"
209-
CommandParameter="{x:Static resources:Resources.NETworkManager_GitHubNewIssueUrl}"
213+
<Button Command="{Binding Path=OpenWebsiteCommand}"
214+
ToolTip="{x:Static Member=localization:Strings.ToolTip_ReportIssueOrCreateFeatureRequest}"
215+
CommandParameter="{x:Static Member=resources:Resources.NETworkManager_GitHubNewIssueUrl}"
210216
Cursor="Hand"
211217
Focusable="False">
212218
<StackPanel Orientation="Horizontal">

‎Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,8 @@ private async Task RemoveIPv4AddressAction()
938938

939939
private async void ReloadNetworkInterfaces()
940940
{
941+
Debug.WriteLine("ReloadNetworkInterfaces.............");
942+
941943
// Avoid multiple reloads
942944
if(IsNetworkInterfaceLoading)
943945
return;

0 commit comments

Comments
 (0)