Skip to content

Commit 3c32bed

Browse files
committed
Feature: Expand / Collapse row via button
1 parent 10dfca3 commit 3c32bed

File tree

2 files changed

+34
-12
lines changed

2 files changed

+34
-12
lines changed

Source/NETworkManager/Controls/AWSSessionManagerControl.xaml

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,43 @@
1818
</local:UserControlBase.Resources>
1919
<Grid SizeChanged="WindowGrid_SizeChanged">
2020
<!-- Background color will prevent flickering when app inside the panel is closed -->
21-
<WindowsFormsHost Visibility="{Binding IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Background="{DynamicResource MahApps.Brushes.Window.Background}" Margin="10">
21+
<WindowsFormsHost Visibility="{Binding Path=IsConnected, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
22+
Background="{DynamicResource ResourceKey=MahApps.Brushes.Window.Background}"
23+
Margin="10">
2224
<windowsForms:Panel x:Name="WindowHost" />
2325
</WindowsFormsHost>
24-
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center" Visibility="{Binding IsConnected, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
26+
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center"
27+
Visibility="{Binding Path=IsConnected, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}">
2528
<Grid.RowDefinitions>
2629
<RowDefinition Height="Auto" />
2730
<RowDefinition Height="Auto" />
2831
<RowDefinition Height="20" />
2932
<RowDefinition Height="Auto" />
3033
</Grid.RowDefinitions>
31-
<TextBlock Grid.Row="0" Text="{x:Static localization:Strings.Disconnected}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
32-
<TextBlock Grid.Row="1" Foreground="{DynamicResource MahApps.Brushes.Accent}" Text="{x:Static localization:Strings.PowerShellProcessHasEnded}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
33-
<mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
34-
<Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" IsDefault="True" IsEnabled="{Binding IsConnecting, Converter={StaticResource BooleanReverseConverter}}" HorizontalAlignment="Center" Style="{StaticResource DefaultButton}"/>
35-
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
34+
<TextBlock Grid.Column="0" Grid.Row="0"
35+
Text="{x:Static Member=localization:Strings.Disconnected}"
36+
Style="{StaticResource ResourceKey=HeaderTextBlock}"
37+
Visibility="{Binding Path=IsConnecting, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityHiddenConverter}}" />
38+
<TextBlock Grid.Column="0" Grid.Row="1"
39+
Foreground="{DynamicResource ResourceKey=MahApps.Brushes.Accent}"
40+
Text="{x:Static Member=localization:Strings.PowerShellProcessHasEnded}"
41+
Style="{DynamicResource ResourceKey=DefaultTextBlock}"
42+
Visibility="{Binding Path=IsConnecting, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityHiddenConverter}}" />
43+
<mah:ProgressRing Grid.Column="0" Grid.Row="0" Grid.RowSpan="2"
44+
Height="50" Width="50"
45+
IsActive="{Binding Path=IsConnecting}"
46+
Visibility="{Binding Path=IsConnecting, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"/>
47+
<Button Grid.Column="0" Grid.Row="3"
48+
Content="{x:Static Member=localization:Strings.Reconnect}"
49+
Command="{Binding Path=ReconnectCommand}"
50+
Visibility="{Binding Path=IsConnecting, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
51+
IsDefault="True"
52+
IsEnabled="{Binding Path=IsConnecting, Converter={StaticResource ResourceKey=BooleanReverseConverter}}"
53+
HorizontalAlignment="Center" Style="{StaticResource ResourceKey=DefaultButton}"/>
54+
<TextBlock Grid.Column="0" Grid.Row="3"
55+
Text="{x:Static Member=localization:Strings.ConnectingDots}"
56+
Style="{StaticResource ResourceKey=MessageTextBlock}"
57+
Visibility="{Binding Path=IsConnecting, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}" />
3658
</Grid>
3759
</Grid>
3860
</local:UserControlBase>

Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ private void ScanProfileAction()
214214

215215
private void AddProfileAction()
216216
{
217-
ProfileDialogManager.ShowAddProfileDialog(this, _dialogCoordinator, null, null, ApplicationName.IPScanner).ConfigureAwait(true);
217+
ProfileDialogManager.ShowAddProfileDialog(this, _dialogCoordinator, null, null, ApplicationName.IPScanner).ConfigureAwait(false);
218218
}
219219

220220
private bool ModifyProfile_CanExecute(object obj) => SelectedProfile is { IsDynamic: false };
@@ -223,28 +223,28 @@ private void AddProfileAction()
223223

224224
private void EditProfileAction()
225225
{
226-
ProfileDialogManager.ShowEditProfileDialog(this, _dialogCoordinator, SelectedProfile).ConfigureAwait(true);
226+
ProfileDialogManager.ShowEditProfileDialog(this, _dialogCoordinator, SelectedProfile).ConfigureAwait(false);
227227
}
228228

229229
public ICommand CopyAsProfileCommand => new RelayCommand(_ => CopyAsProfileAction(), ModifyProfile_CanExecute);
230230

231231
private void CopyAsProfileAction()
232232
{
233-
ProfileDialogManager.ShowCopyAsProfileDialog(this, _dialogCoordinator, SelectedProfile).ConfigureAwait(true);
233+
ProfileDialogManager.ShowCopyAsProfileDialog(this, _dialogCoordinator, SelectedProfile).ConfigureAwait(false);
234234
}
235235

236236
public ICommand DeleteProfileCommand => new RelayCommand(_ => DeleteProfileAction(), ModifyProfile_CanExecute);
237237

238238
private void DeleteProfileAction()
239239
{
240-
ProfileDialogManager.ShowDeleteProfileDialog(this, _dialogCoordinator, new List<ProfileInfo> { SelectedProfile }).ConfigureAwait(true);
240+
ProfileDialogManager.ShowDeleteProfileDialog(this, _dialogCoordinator, new List<ProfileInfo> { SelectedProfile }).ConfigureAwait(false);
241241
}
242242

243243
public ICommand EditGroupCommand => new RelayCommand(EditGroupAction);
244244

245245
private void EditGroupAction(object group)
246246
{
247-
ProfileDialogManager.ShowEditGroupDialog(this, _dialogCoordinator, ProfileManager.GetGroup(group.ToString())).ConfigureAwait(true);
247+
ProfileDialogManager.ShowEditGroupDialog(this, _dialogCoordinator, ProfileManager.GetGroup(group.ToString())).ConfigureAwait(false);
248248
}
249249

250250
public ICommand ClearSearchCommand => new RelayCommand(_ => ClearSearchAction());

0 commit comments

Comments
 (0)