Skip to content

Commit fe4e6ac

Browse files
committed
Hosts are now grouped
1 parent aca1b85 commit fe4e6ac

3 files changed

Lines changed: 24 additions & 2 deletions

File tree

Source/NETworkManager/ViewModels/PortScannerViewModel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ public PortScannerViewModel(int tabId, string host, string port)
296296

297297
// Result view
298298
_portScanResultView = CollectionViewSource.GetDefaultView(PortScanResult);
299-
299+
_portScanResultView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(PortInfo.Host)));
300+
300301
LoadSettings();
301302

302303
// Detect if settings have changed...

Source/NETworkManager/ViewModels/ProfileViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System;
44
using System.Collections.Generic;
55
using System.ComponentModel;
6-
using System.Diagnostics;
76
using System.Linq;
87
using System.Windows.Data;
98
using System.Windows.Input;

Source/NETworkManager/Views/PortScannerView.xaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,28 @@
273273
<DataGridTextColumn Header="{DynamicResource String_Service}" Binding="{Binding LookupInfo.Service}" MinWidth="100" />
274274
<DataGridTextColumn Header="{DynamicResource String_Description}" Binding="{Binding LookupInfo.Description}" MinWidth="200" Width="*" />
275275
</DataGrid.Columns>
276+
<DataGrid.GroupStyle>
277+
<GroupStyle>
278+
<GroupStyle.ContainerStyle>
279+
<Style TargetType="{x:Type GroupItem}">
280+
<Setter Property="Template">
281+
<Setter.Value>
282+
<ControlTemplate TargetType="{x:Type GroupItem}">
283+
<Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
284+
<Expander.Header>
285+
<StackPanel Orientation="Horizontal">
286+
<TextBlock Grid.Column="0" Text="{Binding Name}" Style="{DynamicResource DefaultTextBlock}"/>
287+
</StackPanel>
288+
</Expander.Header>
289+
<ItemsPresenter />
290+
</Expander>
291+
</ControlTemplate>
292+
</Setter.Value>
293+
</Setter>
294+
</Style>
295+
</GroupStyle.ContainerStyle>
296+
</GroupStyle>
297+
</DataGrid.GroupStyle>
276298
</DataGrid>
277299
<Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,20,0,0">
278300
<Expander.Header>

0 commit comments

Comments
 (0)