Connect as dialog improved

BornToBeRoot · BornToBeRoot · commit a7c40acfbdbb · 2017-12-31T02:45:17.000+01:00
diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
@@ -152,7 +152,7 @@ private void Connect()
         {
             rdpClient.Server = _rdpSessionInfo.Hostname;
 
-            if(_rdpSessionInfo.CustomCredentials)
+            if (_rdpSessionInfo.CustomCredentials)
             {
                 rdpClient.UserName = _rdpSessionInfo.Username;
                 rdpClient.AdvancedSettings9.ClearTextPassword = SecureStringHelper.ConvertToString(_rdpSessionInfo.Password);
@@ -192,7 +192,7 @@ private void Connect()
 
             rdpClient.Connect();
         }
-
+               
         private void Reconnect()
         {
             if (_rdpSessionInfo.AdjustScreenAutomatically)
@@ -345,7 +345,7 @@ private void RdpClient_OnConnected(object sender, EventArgs e)
             Disconnected = false;
             Connected = true;
         }
-
+        
         private void RdpClient_OnDisconnected(object sender, AxMSTSCLib.IMsTscAxEvents_OnDisconnectedEvent e)
         {
             Connected = false;
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -95,7 +95,8 @@
     <system:String x:Key="String_Header_ConfigureNetworkInterface">Konfiguriere Netzwerkinterface</system:String>
     <system:String x:Key="String_Header_Authentication">Authentifizierung</system:String>
     <system:String x:Key="String_Header_CredentialNotFound">Anmeldeinformation nicht gefunden!</system:String>
-
+    <system:String x:Key="String_Header_ConnectAs">Verbinden als</system:String>
+    
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
     <system:String x:Key="String_Slogan">Ein leistungsstarkes Tool zum Verwalten von Netzwerken und zur Behebung von Netzwerkproblemen!</system:String>
@@ -424,7 +425,8 @@
     <system:String x:Key="String_Watermark_ExampleTags">server; dmz</system:String>
     <system:String x:Key="String_Watermark_ExampleUsername">Admin</system:String>
     <system:String x:Key="String_Watermark_ExampleCredentialName">Windows-Testbenutzer</system:String>
-    
+    <system:String x:Key="String_Watermark_ExampleRemoteDesktopSessionName">Webserver</system:String>
+
     <!-- ShowProgress -->
     <system:String x:Key="String_Progress_SetStaticIPAddress">Setze statische IP-Adresse und Gateway...</system:String>
     <system:String x:Key="String_Progress_SetDynamicIPAddress">Setze dynamische IP-Adresse...</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -424,6 +424,8 @@
     <system:String x:Key="String_Watermark_ExampleTags">server; dmz</system:String>
     <system:String x:Key="String_Watermark_ExampleUsername">Admin</system:String>
     <system:String x:Key="String_Watermark_ExampleCredentialName">Windows-Testuser</system:String>
+    <system:String x:Key="String_Watermark_ExampleRemoteDesktopSessionName">Webserver</system:String>
+    <system:String x:Key="String_Header_ConnectAs">Connect as</system:String>
     
     <!-- ShowProgress -->
     <system:String x:Key="String_Progress_SetStaticIPAddress">Set static IP address and gateway...</system:String>
diff --git a/Source/NETworkManager/ViewModels/Applications/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/Applications/ARPTableViewModel.cs
@@ -9,7 +9,6 @@
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels.Dialogs;
 using NETworkManager.Views.Dialogs;
-using System.Threading.Tasks;
 
 namespace NETworkManager.ViewModels.Applications
 {
diff --git a/Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs b/Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs
@@ -336,7 +336,7 @@ private async void ConnectSessionAsAction()
         {
             CustomDialog customDialog = new CustomDialog()
             {
-                Title = Application.Current.Resources["String_Header_Connect"] as string
+                Title = Application.Current.Resources["String_Header_ConnectAs"] as string
             };
 
             RemoteDesktopSessionConnectViewModel connectRemoteDesktopSessionViewModel = new RemoteDesktopSessionConnectViewModel(instance =>
@@ -367,14 +367,16 @@ private async void ConnectSessionAsAction()
                     }
                 }
 
-                ConnectSession(remoteDesktopSessionInfo);
+                ConnectSession(remoteDesktopSessionInfo, instance.Name);
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
                 ConfigurationManager.Current.FixAirspace = false;
             });
 
-            // Set the hostname
+            // Set name, hostname
+            connectRemoteDesktopSessionViewModel.ConnectAs = true;
+            connectRemoteDesktopSessionViewModel.Name = SelectedSession.Name;
             connectRemoteDesktopSessionViewModel.Hostname = SelectedSession.Hostname;
 
             // Request credentials
diff --git a/Source/NETworkManager/ViewModels/Dialogs/RemoteDesktopSessionConnectViewModel.cs b/Source/NETworkManager/ViewModels/Dialogs/RemoteDesktopSessionConnectViewModel.cs
@@ -21,6 +21,34 @@ public ICommand CancelCommand
             get { return _cancelCommand; }
         }
 
+        private bool _connectAs;
+        public bool ConnectAs
+        {
+            get { return _connectAs; }
+            set
+            {
+                if (value == _connectAs)
+                    return;
+
+                _connectAs = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private string _name;
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                if (value == _name)
+                    return;
+
+                _name = value;
+                OnPropertyChanged();
+            }
+        }
+
         private string _hostname;
         public string Hostname
         {
diff --git a/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml b/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml
@@ -77,7 +77,7 @@
                                     <MenuItem.Icon>
                                         <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
                                             <Rectangle.OpacityMask>
-                                                <VisualBrush Stretch="Uniform" Visual="{IconPacks:FontAwesome Kind=Desktop}" />
+                                                <VisualBrush Stretch="Uniform" Visual="{IconPacks:Octicons Kind=DeviceDesktop}" />
                                             </Rectangle.OpacityMask>
                                         </Rectangle>
                                     </MenuItem.Icon>
@@ -86,7 +86,7 @@
                                     <MenuItem.Icon>
                                         <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
                                             <Rectangle.OpacityMask>
-                                                <VisualBrush Stretch="Uniform" Visual="{IconPacks:FontAwesome Kind=Desktop}" />
+                                                <VisualBrush Stretch="Uniform" Visual="{IconPacks:Octicons Kind=DeviceDesktop}" />
                                             </Rectangle.OpacityMask>
                                         </Rectangle>
                                     </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/Dialogs/RemoteDesktopSessionConnectDialog.xaml b/Source/NETworkManager/Views/Dialogs/RemoteDesktopSessionConnectDialog.xaml
@@ -32,14 +32,25 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="10" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="10" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Hostname}" />
-            <TextBox x:Name="txtHostname" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostname}">
+            <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Name}" Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,0,0,10" />
+            <TextBox x:Name="txtName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleRemoteDesktopSessionName}" Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityConverter}}" IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" Margin="0,0,0,10">
+                <TextBox.Text>
+                    <Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                        <Binding.ValidationRules>
+                            <Validator:EmptyValidator ValidatesOnTargetUpdated="True" />
+                        </Binding.ValidationRules>
+                    </Binding>
+                </TextBox.Text>
+            </TextBox>
+            <TextBlock Grid.Column="0" Grid.Row="1" Text="{DynamicResource String_Hostname}" />
+            <TextBox x:Name="txtHostname" Grid.Column="2" Grid.Row="1" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostname}" IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}">
                 <TextBox.Text>
                     <Binding Path="Hostname" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -48,9 +59,9 @@
                     </Binding>
                 </TextBox.Text>
             </TextBox>
-            <TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_UseCredentials}" />
-            <mah:ToggleSwitch Grid.Column="2" Grid.Row="2" OffLabel="" OnLabel="" IsChecked="{Binding UseCredentials}" />
-            <StackPanel Grid.Column="2" Grid.Row="4" Orientation="Horizontal" Visibility="{Binding UseCredentials, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <TextBlock Grid.Column="0" Grid.Row="3" Text="{DynamicResource String_UseCredentials}" />
+            <mah:ToggleSwitch Grid.Column="2" Grid.Row="3" OffLabel="" OnLabel="" IsChecked="{Binding UseCredentials}" IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" />
+            <StackPanel Grid.Column="2" Grid.Row="5" Orientation="Horizontal" Visibility="{Binding UseCredentials, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <RadioButton Content="{DynamicResource String_Credentials}" IsEnabled="{Binding CredentialsLocked, Converter={StaticResource BooleanReverseConverter}}" />
                 <RadioButton Content="{DynamicResource String_Custom}" IsChecked="{Binding CustomCredentials}" Margin="10,0,0,0"/>
             </StackPanel>
diff --git a/Source/NETworkManager/Views/Dialogs/RemoteDesktopSessionDialog.xaml b/Source/NETworkManager/Views/Dialogs/RemoteDesktopSessionDialog.xaml
@@ -40,7 +40,7 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Name}" />
-            <TextBox x:Name="txtName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostname}">
+            <TextBox x:Name="txtName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleRemoteDesktopSessionName}">
                 <TextBox.Text>
                     <Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ private void Connect()`
`152`	`152`	`{`
`153`	`153`	`rdpClient.Server = _rdpSessionInfo.Hostname;`
`154`	`154`
`155`		`- if(_rdpSessionInfo.CustomCredentials)`
	`155`	`+ if (_rdpSessionInfo.CustomCredentials)`
`156`	`156`	`{`
`157`	`157`	`rdpClient.UserName = _rdpSessionInfo.Username;`
`158`	`158`	`rdpClient.AdvancedSettings9.ClearTextPassword = SecureStringHelper.ConvertToString(_rdpSessionInfo.Password);`
`@@ -192,7 +192,7 @@ private void Connect()`
`192`	`192`
`193`	`193`	`rdpClient.Connect();`
`194`	`194`	`}`
`195`		`-`
	`195`	`+`
`196`	`196`	`private void Reconnect()`
`197`	`197`	`{`
`198`	`198`	`if (_rdpSessionInfo.AdjustScreenAutomatically)`
`@@ -345,7 +345,7 @@ private void RdpClient_OnConnected(object sender, EventArgs e)`
`345`	`345`	`Disconnected = false;`
`346`	`346`	`Connected = true;`
`347`	`347`	`}`
`348`		`-`
	`348`	`+`
`349`	`349`	`private void RdpClient_OnDisconnected(object sender, AxMSTSCLib.IMsTscAxEvents_OnDisconnectedEvent e)`
`350`	`350`	`{`
`351`	`351`	`Connected = false;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using MahApps.Metro.Controls.Dialogs;`
`10`	`10`	`using NETworkManager.ViewModels.Dialogs;`
`11`	`11`	`using NETworkManager.Views.Dialogs;`
`12`		`-using System.Threading.Tasks;`
`13`	`12`
`14`	`13`	`namespace NETworkManager.ViewModels.Applications`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ private async void ConnectSessionAsAction()`
`336`	`336`	`{`
`337`	`337`	`CustomDialog customDialog = new CustomDialog()`
`338`	`338`	`{`
`339`		`- Title = Application.Current.Resources["String_Header_Connect"] as string`
	`339`	`+ Title = Application.Current.Resources["String_Header_ConnectAs"] as string`
`340`	`340`	`};`
`341`	`341`
`342`	`342`	`RemoteDesktopSessionConnectViewModel connectRemoteDesktopSessionViewModel = new RemoteDesktopSessionConnectViewModel(instance =>`
`@@ -367,14 +367,16 @@ private async void ConnectSessionAsAction()`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`
`370`		`- ConnectSession(remoteDesktopSessionInfo);`
	`370`	`+ ConnectSession(remoteDesktopSessionInfo, instance.Name);`
`371`	`371`	`}, instance =>`
`372`	`372`	`{`
`373`	`373`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`374`	`374`	`ConfigurationManager.Current.FixAirspace = false;`
`375`	`375`	`});`
`376`	`376`
`377`		`- // Set the hostname`
	`377`	`+ // Set name, hostname`
	`378`	`+ connectRemoteDesktopSessionViewModel.ConnectAs = true;`
	`379`	`+ connectRemoteDesktopSessionViewModel.Name = SelectedSession.Name;`
`378`	`380`	`connectRemoteDesktopSessionViewModel.Hostname = SelectedSession.Hostname;`
`379`	`381`
`380`	`382`	`// Request credentials`