Merge pull request #45 from 0xf005ba11/better-rdp-connect

change rdp connect to drop down flyout

Author: jxy-s

VMPlex/UI/ManagerPage.xaml

@@ -105,11 +105,32 @@
                 <ui:AppBarButton x:Name="vmAdd" Icon="Add" ToolTip="Create VM" Click="OnAddCommand" IsTabStop="False" IsCompact="True"/>
                 <ui:AppBarButton x:Name="vmDelete" Icon="Delete" ToolTip="Delete VM" Click="OnDeleteCommand" IsTabStop="False" IsCompact="True"/>
                 <ui:AppBarSeparator IsCompact="True"/>
-                <ui:AppBarButton x:Name="rdpConnect" ToolTip="Remote Desktop Connection" Click="OnRdpConnect" IsTabStop="False" IsCompact="True">
-                    <ui:AppBarButton.Icon>
-                        <ui:FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE8AF;"/>
-                    </ui:AppBarButton.Icon>
-                </ui:AppBarButton>
+                <ui:DropDownButton Name="rdpDropDown" ToolTip="Remote Desktop Connection" IsTabStop="False" CornerRadius="0" Padding="15,11,15,10" FocusVisualMargin="0,0,0,0">
+                    <ui:DropDownButton.Style>
+                        <Style TargetType="ui:DropDownButton">
+                            <Setter Property="Background" Value="Transparent"/>
+                            <Setter Property="BorderThickness" Value="0"/>
+                        </Style>
+                    </ui:DropDownButton.Style>
+                    <ui:FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE8AF;"/>
+                    <ui:DropDownButton.Flyout>
+                        <ui:Flyout Placement="BottomEdgeAlignedRight">
+                            <ui:Flyout.FlyoutPresenterStyle>
+                                <Style TargetType="ui:FlyoutPresenter">
+                                    <Setter Property="Padding" Value="2"/>
+                                    <Setter Property="BorderThickness" Value="0"/>
+                                </Style>
+                            </ui:Flyout.FlyoutPresenterStyle>
+                            <ui:SimpleStackPanel Orientation="Horizontal" Margin="12 10 12 10" Spacing="20">
+                                <ComboBox Name="rdpConnectionBox" IsEditable="True" StaysOpenOnEdit="True" Width="250" 
+                                          ItemsSource="{Binding Source={x:Static root:UserSettings.Instance}, Path=Settings.RdpConnections, UpdateSourceTrigger=PropertyChanged}"
+                                          DisplayMemberPath="DisplayText"
+                                          />
+                                <Button Name="rdpConnectButton" Content="Connect" Click="RdpConnectButton_Click"/>
+                            </ui:SimpleStackPanel>
+                        </ui:Flyout>
+                    </ui:DropDownButton.Flyout>
+                </ui:DropDownButton>
             </DockPanel>
         </Grid>
         <Grid Grid.Row="1">

VMPlex/UI/ManagerPage.xaml.cs

@@ -444,15 +444,15 @@ private void RevertCheckpoint(object data)
             VMManager.RevertSnapshot((VirtualMachine)data);
         }
 
-        private void OnRdpConnect(object sender, RoutedEventArgs e)
+        private void RdpConnectButton_Click(object sender, RoutedEventArgs e)
         {
-            var settings = RdpConnectWindow.Show();
-            if (settings == null)
-            {
-                return;
-            }
+            rdpDropDown.Flyout.Hide();
 
-            if (settings.Server.Length == 0)
+            var strings = rdpConnectionBox.Text.Split('\\');
+            string domain = strings.Length > 1 ? strings[0] : "";
+            string server = strings.Length > 1 ? strings[1] : strings[0];
+
+            if (server.Length == 0)
             {
                 MessageBox.Show(
                     MessageBoxImage.Error,
@@ -462,6 +462,10 @@ private void OnRdpConnect(object sender, RoutedEventArgs e)
                 return;
             }
 
+            var settings = UserSettings.Instance.Settings.RdpConnections.FirstOrDefault(
+                c => c.Domain == domain && c.Server == server,
+                new RdpSettings { Domain = domain, Server = server });
+
             TabItem tab;
             try
             {

VMPlex/UI/RdpConnectWindow.xaml

@@ -221,6 +221,12 @@ public enum AudioRedirectionModeSetting
         /// </summary>
         [JsonInclude]
         public int DesktopHeight { get; set; } = 768;
+
+        [JsonIgnore]
+        public string DisplayText 
+        {
+            get { return Domain.Length > 0 ? $"{Domain}\\{Server}" : Server; } 
+        }
     }
 
     /// <summary>