Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Ping Monitor improvements #2573

Merged
merged 11 commits into from
Dec 9, 2023
Prev Previous commit
Next Next commit
Feature: Expand ping monitor host
  • Loading branch information
BornToBeRoot committed Dec 8, 2023
commit 6d50b5d454f4092d1bb4d6701eaa1f368ee3cc3b
20 changes: 14 additions & 6 deletions Source/NETworkManager/Views/PingMonitorView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
</UserControl.Resources>
<Expander Style="{StaticResource DefaultExpander}" IsExpanded="{Binding ExpandHostView}" BorderThickness="1,1,1,1" BorderBrush="{DynamicResource MahApps.Brushes.Gray8}">
<Expander Style="{StaticResource DefaultExpander}"
IsExpanded="{Binding ExpandHostView}"
BorderThickness="1,1,1,1"
BorderBrush="{DynamicResource MahApps.Brushes.Gray8}">
<Expander.Header>
<Grid Margin="0,0,10,0">
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -80,7 +83,7 @@
Text="{Binding Title}"
VerticalAlignment="Center"
Style="{StaticResource DefaultTextBlock}" />
<TextBlock Grid.Column="4"
<TextBlock Grid.Column="4" Grid.Row="0"
VerticalAlignment="Center"
Style="{StaticResource DefaultTextBlock}"
Foreground="{StaticResource MahApps.Brushes.Gray5}">
Expand All @@ -105,12 +108,14 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<TextBlock Grid.Column="8"
<TextBlock Grid.Column="8" Grid.Row="0"
HorizontalAlignment="Right"
Background="{DynamicResource MahApps.Brushes.Gray8}"
Padding="5" Text="ICMP" Style="{StaticResource AccentTextBlock}"
VerticalAlignment="Center" />
<Button Grid.Column="10" Grid.Row="0" Command="{Binding PingCommand}" Style="{StaticResource CleanButton}">
<Button Grid.Column="10" Grid.Row="0"
Command="{Binding PingCommand}"
Style="{StaticResource CleanButton}">
<Rectangle Width="16" Height="16">
<Rectangle.Resources>
<VisualBrush x:Key="VisualControlPlay" Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}" />
Expand All @@ -134,7 +139,10 @@
</Rectangle.Style>
</Rectangle>
</Button>
<Button Grid.Column="12" Grid.Row="2" Command="{Binding CloseCommand}" Style="{StaticResource CleanButton}" ToolTip="{x:Static localization:Strings.Close}">
<Button Grid.Column="12" Grid.Row="0"
Command="{Binding CloseCommand}"
Style="{StaticResource CleanButton}"
ToolTip="{x:Static localization:Strings.Close}">
<Rectangle Width="16" Height="16">
<Rectangle.OpacityMask>
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=WindowClose}" />
Expand All @@ -159,7 +167,7 @@
<ColumnDefinition Width="10" />
<ColumnDefinition MinWidth="200" Width="*" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid Grid.Column="0" Grid.Row="0">
<Grid.Resources>
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}" />
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource TextBlockAsTextBox}">
Expand Down
4 changes: 4 additions & 0 deletions docs/Changelog/next-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ Release date: **xx.xx.2023**

## What's new?

- Ping Monitor
- UI redesigned [#2573](https://github.com/BornToBeRoot/NETworkManager/pull/2573){:target="\_blank"}
- Allow ranges like `192.168.0.0/24` or `10.0.[0-255].1` [#2573](https://github.com/BornToBeRoot/NETworkManager/pull/2573){:target="\_blank"}

## Experimental features

- Run command (HotKey: Ctrl+Shift+P) added. This feature allows you to open a command field to switch between applications and pass parameters to them.
Expand Down
8 changes: 8 additions & 0 deletions docs/Documentation/01_Application/06_PingMonitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,11 @@ Time in milliseconds to wait between each ping.
**Type:** `Integer` [Min `100`, Max `15000`]

**Default:** `1000`

### Expand host view

Expand the host view to show more information when the host is added.

**Type:** `Boolean`

**Default:** `false`