Skip to content

Commit 9f14fa2

Browse files
BornToBeRootBornToBeRoot
authored
Docs: Remote Desktop, SNMP & Profile default value fixed (BornToBeRoot#2293)
* Docs: Remote Desktop * Docs: BornToBeRoot#2293 * Docs: Remote Desktop * Fix: Minor design issues * Fix: Default screen size value in profile/group * Docs: Remote Desktop * Docs: Note to encrypt profiles * Docs: BornToBeRoot#2293
1 parent cda751f commit 9f14fa2

6 files changed

Lines changed: 1118 additions & 32 deletions

File tree

‎Source/NETworkManager.Profiles/GroupInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public class GroupInfo
3333
public SecureString RemoteDesktop_Password { get; set; }
3434
public bool RemoteDesktop_OverrideDisplay { get; set; }
3535
public bool RemoteDesktop_AdjustScreenAutomatically { get; set; }
36-
public bool RemoteDesktop_UseCurrentViewSize { get; set; }
37-
public bool RemoteDesktop_UseFixedScreenSize { get; set; } = true;
36+
public bool RemoteDesktop_UseCurrentViewSize { get; set; } = GlobalStaticConfiguration.RemoteDesktop_UseCurrentViewSize;
37+
public bool RemoteDesktop_UseFixedScreenSize { get; set; }
3838
public int RemoteDesktop_ScreenWidth { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ScreenWidth;
3939
public int RemoteDesktop_ScreenHeight { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ScreenHeight;
4040
public bool RemoteDesktop_UseCustomScreenSize { get; set; }

‎Source/NETworkManager.Profiles/ProfileInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public class ProfileInfo
8484
public SecureString RemoteDesktop_Password { get; set; }
8585
public bool RemoteDesktop_OverrideDisplay { get; set; }
8686
public bool RemoteDesktop_AdjustScreenAutomatically { get; set; }
87-
public bool RemoteDesktop_UseCurrentViewSize { get; set; }
88-
public bool RemoteDesktop_UseFixedScreenSize { get; set; } = true;
87+
public bool RemoteDesktop_UseCurrentViewSize { get; set; } = GlobalStaticConfiguration.RemoteDesktop_UseCurrentViewSize;
88+
public bool RemoteDesktop_UseFixedScreenSize { get; set; }
8989
public int RemoteDesktop_ScreenWidth { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ScreenWidth;
9090
public int RemoteDesktop_ScreenHeight { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ScreenHeight;
9191
public bool RemoteDesktop_UseCustomScreenSize { get; set; }

‎Source/NETworkManager/Views/ProfileDialog.xaml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
<RowDefinition Height="10" />
307307
<RowDefinition Height="Auto" />
308308
</Grid.RowDefinitions>
309-
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.IPv4Address}" />
309+
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.IPv4Address}" Margin="24,0,0,0" VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
310310
<TextBox x:Name="TextBoxNetworkInterfaceIPAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Address}" >
311311
<TextBox.Text>
312312
<Binding Path="NetworkInterface_IPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -317,7 +317,7 @@
317317
</Binding>
318318
</TextBox.Text>
319319
</TextBox>
320-
<TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.SubnetMask}" />
320+
<TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.SubnetMask}" Margin="24,0,0,0" VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
321321
<ComboBox x:Name="ComboBoxNetworkInterfaceSubnetmask" Grid.Column="2" Grid.Row="2" Style="{StaticResource EditableComboBox}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4SubnetmaskIPv4CIDR}" ItemsSource="{x:Static network:Subnetmask.List}">
322322
<ComboBox.Text>
323323
<Binding Path="NetworkInterface_Subnetmask" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -328,7 +328,7 @@
328328
</Binding>
329329
</ComboBox.Text>
330330
</ComboBox>
331-
<TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.DefaultGateway}" />
331+
<TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.DefaultGateway}" Margin="24,0,0,0" VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
332332
<TextBox x:Name="TextBoxNetworkInterfaceGateway" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Gateway}" >
333333
<TextBox.Text>
334334
<Binding Path="NetworkInterface_Gateway" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -357,7 +357,7 @@
357357
<RowDefinition Height="10" />
358358
<RowDefinition Height="Auto" />
359359
</Grid.RowDefinitions>
360-
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.PrimaryDNSServer}" />
360+
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.PrimaryDNSServer}" Margin="24,0,0,0" VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
361361
<TextBox x:Name="TextBoxNetworkInterfacePrimaryDNSServer" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Gateway}" >
362362
<TextBox.Text>
363363
<Binding Path="NetworkInterface_PrimaryDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -367,7 +367,7 @@
367367
</Binding>
368368
</TextBox.Text>
369369
</TextBox>
370-
<TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.SecondaryDNSServer}" />
370+
<TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.SecondaryDNSServer}" Margin="24,0,0,0" VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
371371
<TextBox x:Name="TextBoxNetworkInterfaceSecondaryDNSServer" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4DNSServer}" >
372372
<TextBox.Text>
373373
<Binding Path="NetworkInterface_SecondaryDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -489,7 +489,7 @@
489489
<TextBox x:Name="TextBoxPortScannerPorts" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePortScanRange}">
490490
<TextBox.Text>
491491
<Binding Path="PortScanner_Ports" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
492-
<Binding.ValidationRules>
492+
<Binding.ValidationRules>
493493
<validators:EmptyOrPortRangeValidator ValidatesOnTargetUpdated="True" />
494494
</Binding.ValidationRules>
495495
</Binding>
@@ -821,7 +821,7 @@
821821
</PasswordBox.Style>
822822
<interactivity:Interaction.Behaviors>
823823
<wpfHelpers:PasswordBoxBindingBehavior Password="{Binding RemoteDesktop_Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
824-
</interactivity:Interaction.Behaviors>
824+
</interactivity:Interaction.Behaviors>
825825
</PasswordBox>
826826
<Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="10" ToolTip="{x:Static localization:Strings.WarningMessage_ProfileFileNotEncryptedStoringPasswords}" Visibility="{Binding IsProfileFileEncrypted, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource WarnImageRectangle}" Margin="10,0,0,0">
827827
<Rectangle.Resources>
@@ -1091,7 +1091,7 @@
10911091
</PasswordBox.Style>
10921092
<interactivity:Interaction.Behaviors>
10931093
<wpfHelpers:PasswordBoxBindingBehavior Password="{Binding RemoteDesktop_GatewayServerPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
1094-
</interactivity:Interaction.Behaviors>
1094+
</interactivity:Interaction.Behaviors>
10951095
</PasswordBox>
10961096
<Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="42" ToolTip="{x:Static localization:Strings.WarningMessage_ProfileFileNotEncryptedStoringPasswords}" Visibility="{Binding IsProfileFileEncrypted, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource WarnImageRectangle}" Margin="10,0,0,0">
10971097
<Rectangle.Resources>
@@ -1239,7 +1239,7 @@
12391239
<CheckBox Grid.Column="0" Grid.Row="10" Content="{x:Static localization:Strings.Command}" IsChecked="{Binding PowerShell_OverrideCommand}" IsEnabled="{Binding PowerShell_EnableRemoteConsole, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultCheckBox}" />
12401240
<TextBox Grid.Column="2" Grid.Row="10" Text="{Binding PowerShell_Command, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
12411241
<TextBox.Style>
1242-
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
1242+
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
12431243
<Style.Triggers>
12441244
<DataTrigger Binding="{Binding PowerShell_EnableRemoteConsole}" Value="True">
12451245
<Setter Property="IsEnabled" Value="False" />
@@ -1731,13 +1731,13 @@
17311731
</Binding>
17321732
</TextBox.Text>
17331733
</TextBox>
1734-
<TextBlock Grid.Column="0" Grid.Row="10" Text="{x:Static localization:Strings.Mode}" Margin="24,0,0,0" />
1734+
<TextBlock Grid.Column="0" Grid.Row="10" Text="{x:Static localization:Strings.Mode}" Margin="24,0,0,0" VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
17351735
<ComboBox Grid.Column="2" Grid.Row="10" ItemsSource="{Binding SNMP_Modes}" SelectedItem="{Binding SNMP_Mode}" IsEnabled="{Binding SNMP_OverrideOIDAndMode}" />
17361736
<CheckBox Grid.Column="0" Grid.Row="12" Content="{x:Static localization:Strings.Version}" IsChecked="{Binding SNMP_OverrideVersionAndAuth}" Style="{StaticResource DefaultCheckBox}" />
17371737
<ComboBox Grid.Column="2" Grid.Row="12" ItemsSource="{Binding SNMP_Versions}" SelectedItem="{Binding SNMP_Version}" IsEnabled="{Binding SNMP_OverrideVersionAndAuth}" />
1738-
<TextBlock Grid.Column="0" Grid.Row="14" Text="{x:Static localization:Strings.Community}" Margin="24,0,0,0">
1738+
<TextBlock Grid.Column="0" Grid.Row="14" Text="{x:Static localization:Strings.Community}" Margin="24,0,0,0" VerticalAlignment="Center">
17391739
<TextBlock.Style>
1740-
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}">
1740+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DisabledTextBlock}">
17411741
<Style.Triggers>
17421742
<DataTrigger Binding="{Binding SNMP_Version}" Value="V3">
17431743
<Setter Property="Visibility" Value="Collapsed" />
@@ -1794,9 +1794,9 @@
17941794
<Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
17951795
</Rectangle.Resources>
17961796
</Rectangle>
1797-
<TextBlock Grid.Column="0" Grid.Row="16" Text="{x:Static localization:Strings.Security}" Margin="24,0,0,0">
1797+
<TextBlock Grid.Column="0" Grid.Row="16" Text="{x:Static localization:Strings.Security}" Margin="24,0,0,0" VerticalAlignment="Center">
17981798
<TextBlock.Style>
1799-
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}">
1799+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DisabledTextBlock}">
18001800
<Setter Property="Visibility" Value="Collapsed" />
18011801
<Style.Triggers>
18021802
<DataTrigger Binding="{Binding SNMP_Version}" Value="V3">
@@ -1818,9 +1818,9 @@
18181818
</Style>
18191819
</ComboBox.Style>
18201820
</ComboBox>
1821-
<TextBlock Grid.Column="0" Grid.Row="18" Text="{x:Static localization:Strings.Username}" Margin="24,0,0,0">
1821+
<TextBlock Grid.Column="0" Grid.Row="18" Text="{x:Static localization:Strings.Username}" Margin="24,0,0,0" VerticalAlignment="Center">
18221822
<TextBlock.Style>
1823-
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}">
1823+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DisabledTextBlock}">
18241824
<Setter Property="Visibility" Value="Collapsed" />
18251825
<Style.Triggers>
18261826
<DataTrigger Binding="{Binding SNMP_Version}" Value="V3">
@@ -1849,9 +1849,9 @@
18491849
</Binding>
18501850
</TextBox.Text>
18511851
</TextBox>
1852-
<TextBlock Grid.Column="0" Grid.Row="20" Text="{x:Static localization:Strings.Auth}" Margin="24,0,0,0">
1852+
<TextBlock Grid.Column="0" Grid.Row="20" Text="{x:Static localization:Strings.Auth}" Margin="24,0,0,0" VerticalAlignment="Center">
18531853
<TextBlock.Style>
1854-
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}">
1854+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DisabledTextBlock}">
18551855
<Setter Property="Visibility" Value="Collapsed" />
18561856
<Style.Triggers>
18571857
<MultiDataTrigger>
@@ -1969,9 +1969,9 @@
19691969
<Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
19701970
</Rectangle.Resources>
19711971
</Rectangle>
1972-
<TextBlock Grid.Column="0" Grid.Row="24" Text="{x:Static localization:Strings.Priv}" Margin="24,0,0,0">
1972+
<TextBlock Grid.Column="0" Grid.Row="24" Text="{x:Static localization:Strings.Priv}" Margin="24,0,0,0" VerticalAlignment="Center">
19731973
<TextBlock.Style>
1974-
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}">
1974+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DisabledTextBlock}">
19751975
<Setter Property="Visibility" Value="Collapsed" />
19761976
<Style.Triggers>
19771977
<MultiDataTrigger>
@@ -2055,7 +2055,7 @@
20552055
</Grid>
20562056
</StackPanel>
20572057
</ScrollViewer>
2058-
</TabItem>
2058+
</TabItem>
20592059
<TabItem Header="{x:Static localization:Strings.WakeOnLAN}">
20602060
<ScrollViewer Style="{StaticResource DefaultScrollViewer}" HorizontalScrollBarVisibility="Disabled">
20612061
<StackPanel IsEnabled="{Binding WakeOnLAN_Enabled}" Margin="0,0,0,20">
@@ -2067,7 +2067,7 @@
20672067
<Grid.RowDefinitions>
20682068
<RowDefinition Height="Auto" />
20692069
<RowDefinition Height="10" />
2070-
<RowDefinition Height="Auto" />
2070+
<RowDefinition Height="Auto" />
20712071
</Grid.RowDefinitions>
20722072
<Grid.ColumnDefinitions>
20732073
<ColumnDefinition Width="1*" />
@@ -2572,7 +2572,7 @@
25722572
<MultiDataTrigger.Setters>
25732573
<Setter Property="IsEnabled" Value="False" />
25742574
</MultiDataTrigger.Setters>
2575-
</MultiDataTrigger>
2575+
</MultiDataTrigger>
25762576
<!-- Whois -->
25772577
<MultiDataTrigger>
25782578
<MultiDataTrigger.Conditions>

‎docs/Changelog/next-release.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Release date: **xx.xx.2023**
3737
- Subnet Calculator
3838
- Fixed a design issue with the calculate button in subnetting [#2230](https://github.com/BornToBeRoot/NETworkManager/pull/2230){:target="\_blank"}
3939
- [AirSpace Fixer](https://www.nuget.org/packages/AirspaceFixer){:target="\_blank"} code optimized (only called if needed). This will also prevent a screenshot bug when the application is loading and a dialog is shown. [#2253](https://github.com/BornToBeRoot/NETworkManager/pull/2253){:target="\_blank"}
40-
40+
- Profile / Group
41+
- Fix default value for Remote Desktop sreen size [#2293](https://github.com/BornToBeRoot/NETworkManager/pull/2293){:target="\_blank"}
4142
## Deprecated
4243

4344
Deprecated
@@ -56,10 +57,11 @@ Deprecated
5657
- Application > Ping Monitor [#2267](https://github.com/BornToBeRoot/NETworkManager/pull/2267){:target="\_blank"}
5758
- Application > Traceroute [#2268](https://github.com/BornToBeRoot/NETworkManager/pull/2268){:target="\_blank"}
5859
- Application > DNS Lookup [#2273](https://github.com/BornToBeRoot/NETworkManager/pull/2273){:target="\_blank"}
60+
- Application > Remote Desktop [#2293](https://github.com/BornToBeRoot/NETworkManager/pull/2293){:target="\_blank"}
5961
- Application > PowerShell [#2249](https://github.com/BornToBeRoot/NETworkManager/pull/2249){:target="\_blank"}
6062
- Application > TigerVNC [#2248](https://github.com/BornToBeRoot/NETworkManager/pull/2248){:target="\_blank"}
6163
- Application > Web Console [#2244](https://github.com/BornToBeRoot/NETworkManager/pull/2244){:target="\_blank"}
62-
- Application > SNMP [#2289](https://github.com/BornToBeRoot/NETworkManager/pull/2289){:target="\_blank"}
64+
- Application > SNMP [#2289](https://github.com/BornToBeRoot/NETworkManager/pull/2289){:target="\_blank"} [#2293](https://github.com/BornToBeRoot/NETworkManager/pull/2293){:target="\_blank"}
6365
- Application > Wake on LAN [#2242](https://github.com/BornToBeRoot/NETworkManager/pull/2242){:target="\_blank"}
6466
- Application > Whois [#2236](https://github.com/BornToBeRoot/NETworkManager/pull/2236){:target="\_blank"}
6567
- Application > Subnet Calculator [#2233](https://github.com/BornToBeRoot/NETworkManager/pull/2233){:target="\_blank"}

0 commit comments

Comments
 (0)