Skip to content

Commit 2d5bb18

Browse files
BornToBeRootBornToBeRoot
committed
Feature: Profile & group description
1 parent 44c8f49 commit 2d5bb18

16 files changed

+316
-22
lines changed

‎Source/NETworkManager/Views/AWSSessionManagerHostView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
1616
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
1717
xmlns:controls="clr-namespace:NETworkManager.Controls"
18+
xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
1819
dialogs:DialogParticipation.Register="{Binding}"
1920
Loaded="UserControl_Loaded"
2021
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:AWSSessionManagerHostViewModel}">
@@ -387,7 +388,7 @@
387388
</Grid>
388389
<ListBox Grid.Column="0" Grid.Row="2" ItemsSource="{Binding Profiles}"
389390
Visibility="{Binding IsSearching, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
390-
DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}"
391+
SelectedItem="{Binding SelectedProfile}"
391392
Style="{StaticResource ProfileListBox}"
392393
ScrollViewer.CanContentScroll="True"
393394
VirtualizingPanel.IsVirtualizing="True"
@@ -569,8 +570,26 @@
569570
BasedOn="{StaticResource MahApps.Styles.ListBoxItem}">
570571
<Setter Property="ContextMenu" Value="{StaticResource ListBoxItemContextMenu}" />
571572
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
573+
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
574+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
572575
</Style>
573576
</ListBox.ItemContainerStyle>
577+
<ListBox.ItemTemplate>
578+
<DataTemplate DataType="{x:Type profiles:ProfileInfo}">
579+
<Grid Background="Transparent">
580+
<Grid.ToolTip>
581+
<ToolTip MinWidth="250">
582+
<StackPanel Margin="10">
583+
<TextBlock Text="{Binding AWSSessionManager_InstanceID}" Style="{StaticResource DefaultTextBlock}" />
584+
<Separator Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,10" />
585+
<TextBlock Text="{Binding Description}" Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
586+
</StackPanel>
587+
</ToolTip>
588+
</Grid.ToolTip>
589+
<TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" />
590+
</Grid>
591+
</DataTemplate>
592+
</ListBox.ItemTemplate>
574593
</ListBox>
575594
<mah:ProgressRing Grid.Row="2" Height="50" Width="50" IsActive="{Binding IsSearching}" />
576595
<Grid Grid.Row="2" VerticalAlignment="Center">

‎Source/NETworkManager/Views/DNSLookupHostView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
1313
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
1414
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
15+
xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
1516
dialogs:DialogParticipation.Register="{Binding}"
1617
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DNSLookupHostViewModel}">
1718
<UserControl.Resources>
@@ -213,7 +214,7 @@
213214
</Grid>
214215
<ListBox Grid.Column="0" Grid.Row="2" ItemsSource="{Binding Profiles}"
215216
Visibility="{Binding IsSearching, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
216-
DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}"
217+
SelectedItem="{Binding SelectedProfile}"
217218
Style="{StaticResource ProfileListBox}"
218219
ScrollViewer.CanContentScroll="True"
219220
VirtualizingPanel.IsVirtualizing="True"
@@ -345,8 +346,26 @@
345346
BasedOn="{StaticResource MahApps.Styles.ListBoxItem}">
346347
<Setter Property="ContextMenu" Value="{StaticResource ProfileContextMenu}" />
347348
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
349+
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
350+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
348351
</Style>
349352
</ListBox.ItemContainerStyle>
353+
<ListBox.ItemTemplate>
354+
<DataTemplate DataType="{x:Type profiles:ProfileInfo}">
355+
<Grid Background="Transparent">
356+
<Grid.ToolTip>
357+
<ToolTip MinWidth="250">
358+
<StackPanel Margin="10">
359+
<TextBlock Text="{Binding DNSLookup_Host}" Style="{StaticResource DefaultTextBlock}" />
360+
<Separator Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,10" />
361+
<TextBlock Text="{Binding Description}" Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
362+
</StackPanel>
363+
</ToolTip>
364+
</Grid.ToolTip>
365+
<TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" />
366+
</Grid>
367+
</DataTemplate>
368+
</ListBox.ItemTemplate>
350369
</ListBox>
351370
<mah:ProgressRing Grid.Row="2" Height="50" Width="50" IsActive="{Binding IsSearching}" />
352371
<Grid Grid.Row="2" VerticalAlignment="Center">

‎Source/NETworkManager/Views/IPGeolocationHostView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
1313
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
1414
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
15+
xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
1516
dialogs:DialogParticipation.Register="{Binding}"
1617
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPGeolocationHostViewModel}">
1718
<UserControl.Resources>
@@ -216,7 +217,7 @@
216217
</Grid>
217218
<ListBox Grid.Column="0" Grid.Row="2" ItemsSource="{Binding Profiles}"
218219
Visibility="{Binding IsSearching, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
219-
DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}"
220+
SelectedItem="{Binding SelectedProfile}"
220221
Style="{StaticResource ProfileListBox}">
221222
<ListBox.Resources>
222223
<ContextMenu x:Key="ProfileContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
@@ -337,8 +338,26 @@
337338
BasedOn="{StaticResource MahApps.Styles.ListBoxItem}">
338339
<Setter Property="ContextMenu" Value="{StaticResource ProfileContextMenu}" />
339340
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
341+
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
342+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
340343
</Style>
341344
</ListBox.ItemContainerStyle>
345+
<ListBox.ItemTemplate>
346+
<DataTemplate DataType="{x:Type profiles:ProfileInfo}">
347+
<Grid Background="Transparent">
348+
<Grid.ToolTip>
349+
<ToolTip MinWidth="250">
350+
<StackPanel Margin="10">
351+
<TextBlock Text="{Binding IPGeolocation_Host}" Style="{StaticResource DefaultTextBlock}" />
352+
<Separator Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,10" />
353+
<TextBlock Text="{Binding Description}" Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
354+
</StackPanel>
355+
</ToolTip>
356+
</Grid.ToolTip>
357+
<TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" />
358+
</Grid>
359+
</DataTemplate>
360+
</ListBox.ItemTemplate>
342361
</ListBox>
343362
<mah:ProgressRing Grid.Row="2" Height="50" Width="50" IsActive="{Binding IsSearching}" />
344363
<Grid Grid.Row="2" VerticalAlignment="Center">

‎Source/NETworkManager/Views/IPScannerHostView.xaml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
1313
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
1414
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
15+
xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
1516
dialogs:DialogParticipation.Register="{Binding}"
1617
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerHostViewModel}">
1718
<UserControl.Resources>
@@ -215,7 +216,6 @@
215216
<ListBox Grid.Column="0" Grid.Row="2"
216217
ItemsSource="{Binding Profiles}"
217218
Visibility="{Binding IsSearching, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
218-
DisplayMemberPath="Name"
219219
SelectedItem="{Binding SelectedProfile}"
220220
Style="{StaticResource ProfileListBox}"
221221
ScrollViewer.CanContentScroll="True"
@@ -347,8 +347,26 @@
347347
BasedOn="{StaticResource MahApps.Styles.ListBoxItem}">
348348
<Setter Property="ContextMenu" Value="{StaticResource ProfileContextMenu}" />
349349
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
350+
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
351+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
350352
</Style>
351353
</ListBox.ItemContainerStyle>
354+
<ListBox.ItemTemplate>
355+
<DataTemplate DataType="{x:Type profiles:ProfileInfo}">
356+
<Grid Background="Transparent">
357+
<Grid.ToolTip>
358+
<ToolTip MinWidth="250">
359+
<StackPanel Margin="10">
360+
<TextBlock Text="{Binding IPScanner_HostOrIPRange}" Style="{StaticResource DefaultTextBlock}" />
361+
<Separator Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,10" />
362+
<TextBlock Text="{Binding Description}" Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
363+
</StackPanel>
364+
</ToolTip>
365+
</Grid.ToolTip>
366+
<TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" />
367+
</Grid>
368+
</DataTemplate>
369+
</ListBox.ItemTemplate>
352370
</ListBox>
353371
<mah:ProgressRing Grid.Row="2" Height="50" Width="50" IsActive="{Binding IsSearching}" />
354372
<Grid Grid.Row="2" VerticalAlignment="Center">

‎Source/NETworkManager/Views/NetworkInterfaceView.xaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
1616
xmlns:controls="clr-namespace:NETworkManager.Controls"
1717
xmlns:liveChart="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
18+
xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
1819
dialog:DialogParticipation.Register="{Binding}"
1920
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:NetworkInterfaceViewModel}">
2021
<UserControl.InputBindings>
@@ -1252,7 +1253,7 @@
12521253
</Grid>
12531254
<ListBox Grid.Column="0" Grid.Row="2" ItemsSource="{Binding Profiles}"
12541255
Visibility="{Binding IsSearching, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
1255-
DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}"
1256+
SelectedItem="{Binding SelectedProfile}"
12561257
Style="{StaticResource ProfileListBox}"
12571258
ScrollViewer.CanContentScroll="True"
12581259
VirtualizingPanel.IsVirtualizing="True"
@@ -1384,8 +1385,26 @@
13841385
<Style TargetType="{x:Type ListBoxItem}"
13851386
BasedOn="{StaticResource MahApps.Styles.ListBoxItem}">
13861387
<Setter Property="ContextMenu" Value="{StaticResource ListBoxItemContextMenu}" />
1388+
<Setter Property="VerticalContentAlignment" Value="Stretch" />
1389+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
13871390
</Style>
13881391
</ListBox.ItemContainerStyle>
1392+
<ListBox.ItemTemplate>
1393+
<DataTemplate DataType="{x:Type profiles:ProfileInfo}">
1394+
<Grid Background="Transparent">
1395+
<Grid.ToolTip>
1396+
<ToolTip MinWidth="250">
1397+
<StackPanel Margin="10">
1398+
<TextBlock Text="{Binding Host}" Style="{StaticResource DefaultTextBlock}" />
1399+
<Separator Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,10" />
1400+
<TextBlock Text="{Binding Description}" Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
1401+
</StackPanel>
1402+
</ToolTip>
1403+
</Grid.ToolTip>
1404+
<TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" />
1405+
</Grid>
1406+
</DataTemplate>
1407+
</ListBox.ItemTemplate>
13891408
</ListBox>
13901409
<mah:ProgressRing Grid.Row="2" Height="50" Width="50" IsActive="{Binding IsSearching}" />
13911410
<Grid Grid.Row="2" VerticalAlignment="Center">

‎Source/NETworkManager/Views/PingMonitorHostView.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
1313
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
1414
xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
15+
xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
1516
dialogs:DialogParticipation.Register="{Binding}"
1617
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PingMonitorHostViewModel}">
1718
<UserControl.Resources>
@@ -507,7 +508,7 @@
507508
</Style>
508509
</ListBox.ItemContainerStyle>
509510
<ListBox.ItemTemplate>
510-
<DataTemplate>
511+
<DataTemplate DataType="{x:Type profiles:ProfileInfo}">
511512
<Grid Background="Transparent">
512513
<Grid.ToolTip>
513514
<ToolTip MinWidth="250">

0 commit comments

Comments
 (0)