improve UI for multi-selected-editor #83

1. title for bulk editor. 2. search by group name. 3. count of selected
1Remote · May 17, 2021 · 7c96c48 · 7c96c48
1 parent 6f7eea4
commit 7c96c48
Show file tree

Hide file tree

Showing 27 changed files with 314 additions and 90 deletions.
diff --git a/PRM.Core/Languages/de-de.json b/PRM.Core/Languages/de-de.json
@@ -131,7 +131,7 @@
   "system_options_theme_tab_ui_classical": "Klassisch",
 
   // server operate
-  "server_card_operate_conn": "Verbinden",
+  "word_connect": "Verbinden",
   "server_card_operate_duplicate": "Duplizieren",
   "server_card_operate_copy_address": "Server-Adresse in die Zwischenablage kopieren",
   "server_card_operate_copy_username": "Benutzername in die Zwischenablage kopieren",
@@ -146,6 +146,8 @@
 
   // server editor
   "server_editor_different_options": "<different options>",
+  "server_editor_bulk_editing_title": "You are editing in bulk: ",
+  "server_editor_multi_selected_count": "Select {0} items",
   "server_editor_group_title_common": "Allgemein",
   "server_editor_group_title_connection": "Verbindung",
   "server_editor_group_title_display": "Anzeige",

diff --git a/PRM.Core/Languages/de-de.xaml b/PRM.Core/Languages/de-de.xaml
diff --git a/PRM.Core/Languages/en-us.json b/PRM.Core/Languages/en-us.json
@@ -131,7 +131,7 @@
   "system_options_theme_tab_ui_classical": "Classical",
 
   // server operate
-  "server_card_operate_conn": "Connect",
+  "word_connect": "Connect",
   "server_card_operate_duplicate": "Duplicate",
   "server_card_operate_copy_address": "Copy address to clipboard",
   "server_card_operate_copy_username": "Copy username to clipboard",
@@ -146,6 +146,8 @@
 
   // server editor
   "server_editor_different_options": "<different options>",
+  "server_editor_bulk_editing_title": "You are editing in bulk: ",
+  "server_editor_multi_selected_count": "Select {0} items",
   "server_editor_group_title_common": "Common",
   "server_editor_group_title_connection": "Connection",
   "server_editor_group_title_display": "Display",
@@ -204,7 +206,7 @@
   // server editor - RD-gateway group items
   "server_editor_gateway_mode": "Connection",
   "server_editor_gateway_mode_automatically_detect": "Automatically detect RD Gateway server settings",
-  "server_editor_gateway_mode_use_these": "Use these RD Gateway server settings",
+  "server_editor_gateway_mode_use_these": "Use the following RD Gateway server settings",
   "server_editor_gateway_mode_do_not_use": "Do not use RD Gateway server",
   "server_editor_gateway_server_host_name": "Host Name",
   "server_editor_gateway_logon_method": "Logon Method",

diff --git a/PRM.Core/Languages/en-us.xaml b/PRM.Core/Languages/en-us.xaml
diff --git a/PRM.Core/Languages/zh-cn.json b/PRM.Core/Languages/zh-cn.json
@@ -131,7 +131,7 @@
   "system_options_theme_tab_ui_classical": "经典",
 
   // server operate
-  "server_card_operate_conn": "连接",
+  "word_connect": "连接",
   "server_card_operate_duplicate": "创建副本",
   "server_card_operate_copy_address": "复制地址到剪贴板",
   "server_card_operate_copy_username": "复制用户名到剪贴板",
@@ -145,7 +145,9 @@
   "import_failure_with_data_format_error": "导入0条，输入的数据文件格式有误!",
 
   // server editor
-  "server_editor_different_options": "<不同的选项>",
+  "server_editor_different_options": "<不同的值>",
+  "server_editor_bulk_editing_title": "你正在批量编辑: ",
+  "server_editor_multi_selected_count": "选中{0}项",
   "server_editor_group_title_common": "常规",
   "server_editor_group_title_connection": "连接",
   "server_editor_group_title_display": "显示",

diff --git a/PRM.Core/Languages/zh-cn.xaml b/PRM.Core/Languages/zh-cn.xaml
diff --git a/PRM.Core/PRM.Core.csproj b/PRM.Core/PRM.Core.csproj
@@ -29,7 +29,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>DEBUG;TRACE;UseKiTTY;FOR_MICROSOFT_STORE;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>

diff --git a/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortBaseForm.xaml b/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortBaseForm.xaml
@@ -34,11 +34,11 @@
                     </Grid>
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Width="60" Text="{DynamicResource server_editor_connection_port}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">
-                        <TextBox Width="50" Text="{Binding Port,UpdateSourceTrigger=PropertyChanged,ValidatesOnExceptions=True,NotifyOnValidationError=True}"
+                        <TextBox MinWidth="50" Text="{Binding Port,UpdateSourceTrigger=PropertyChanged,ValidatesOnExceptions=True,NotifyOnValidationError=True}"
                                  HorizontalAlignment="Left"
                                  InputMethod.IsInputMethodEnabled="False"
                                  InputScope="Number"
-                                 ></TextBox>
+                        ></TextBox>
                     </Grid>
                 </StackPanel>
             </Grid>

diff --git a/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortUserPwdBaseForm.xaml b/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortUserPwdBaseForm.xaml
@@ -34,7 +34,6 @@
                     </Grid>
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Width="60" Text="{DynamicResource server_editor_connection_port}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">
-                        <!--TODO needs a number only text box --> 
                         <TextBox MinWidth="50" Text="{Binding Port,UpdateSourceTrigger=PropertyChanged,ValidatesOnExceptions=True,NotifyOnValidationError=True}"
                                  HorizontalAlignment="Left"
                                  InputMethod.IsInputMethodEnabled="False"

diff --git a/PRM.Core/Protocol/FileTransmit/FTP/ProtocolServerFTPForm.xaml b/PRM.Core/Protocol/FileTransmit/FTP/ProtocolServerFTPForm.xaml
@@ -34,7 +34,7 @@
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Width="60" Text="{DynamicResource server_editor_connection_port}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">
                         <TextBox Text="{Binding Port,UpdateSourceTrigger=PropertyChanged,ValidatesOnExceptions=True,NotifyOnValidationError=True}"
-                                 Width="50" HorizontalAlignment="Left"
+                                 MinWidth="50" HorizontalAlignment="Left"
                                  InputMethod.IsInputMethodEnabled="False"
                                  InputScope="Number"
                                  ></TextBox>
@@ -51,7 +51,7 @@
                 </StackPanel>
             </Grid>
 
-            <Grid Name="GridPwd">
+            <Grid Name="GridPwd" Style="{StaticResource EditorRowGrid}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Text="{DynamicResource server_editor_connection_password}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">

diff --git a/PRM.Core/Protocol/FileTransmit/SFTP/ProtocolServerSFTPForm.xaml b/PRM.Core/Protocol/FileTransmit/SFTP/ProtocolServerSFTPForm.xaml
@@ -34,7 +34,7 @@
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Width="60" Text="{DynamicResource server_editor_connection_port}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">
                         <TextBox Text="{Binding Port,UpdateSourceTrigger=PropertyChanged,ValidatesOnExceptions=True,NotifyOnValidationError=True}"
-                                 Width="50" HorizontalAlignment="Left"
+                                 MinWidth="50" HorizontalAlignment="Left"
                                  InputMethod.IsInputMethodEnabled="False"
                                  InputScope="Number"
                                  ></TextBox>

diff --git a/PRM.Core/Protocol/Putty/ProtocolPuttyForm.xaml b/PRM.Core/Protocol/Putty/ProtocolPuttyForm.xaml
@@ -36,7 +36,7 @@
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Width="60" Text="{DynamicResource server_editor_connection_port}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">
                         <TextBox Text="{Binding Port,UpdateSourceTrigger=PropertyChanged,ValidatesOnExceptions=True,NotifyOnValidationError=True}"
-                                 Width="50" HorizontalAlignment="Left"
+                                 MinWidth="50" HorizontalAlignment="Left"
                                  InputMethod.IsInputMethodEnabled="False"
                                  InputScope="Number"
                                  ></TextBox>

diff --git a/PRM.Core/Protocol/RDP/ProtocolServerRDPForm.xaml b/PRM.Core/Protocol/RDP/ProtocolServerRDPForm.xaml
@@ -37,7 +37,7 @@
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Width="60" Text="{DynamicResource server_editor_connection_port}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">
                         <TextBox Text="{Binding Port,UpdateSourceTrigger=PropertyChanged,ValidatesOnExceptions=True,NotifyOnValidationError=True}"
-                                 Width="50" HorizontalAlignment="Left"
+                                 MinWidth="50" HorizontalAlignment="Left"
                                  InputMethod.IsInputMethodEnabled="False"
                                  InputScope="Number"></TextBox>
                     </Grid>
@@ -90,7 +90,7 @@
                             <ComboBoxItem Content="{DynamicResource server_editor_display_full_screen_flag_window}" />
                             <ComboBoxItem Content="{DynamicResource server_editor_display_full_screen_flag_full_screen}" />
                             <ComboBoxItem Content="{DynamicResource server_editor_display_full_screen_flag_all_screens}" />
-                            <ComboBoxItem Visibility="{Binding RdpFullScreenFlag, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{DynamicResource server_editor_different_options}" />
+                            <ComboBoxItem Visibility="{Binding RdpFullScreenFlag, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{Binding Server_editor_different_options}" />
                         </ComboBox>
                     </Grid>
                 </StackPanel>
@@ -146,7 +146,7 @@
                             <ComboBoxItem Content="{DynamicResource server_editor_display_window_resize_mode_fixed}" />
                             <ComboBoxItem IsEnabled="{Binding RdpFullScreenFlag, Converter={StaticResource ConverterTrueWhenERdpFullScreen},UpdateSourceTrigger=PropertyChanged}" Content="{DynamicResource server_editor_display_window_resize_mode_stretch_full_screen}" />
                             <ComboBoxItem IsEnabled="{Binding RdpFullScreenFlag, Converter={StaticResource ConverterTrueWhenERdpFullScreen},UpdateSourceTrigger=PropertyChanged}" Content="{DynamicResource server_editor_display_window_resize_mode_fixed_full_screen}" />
-                            <ComboBoxItem Visibility="{Binding RdpWindowResizeMode, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{DynamicResource server_editor_different_options}" />
+                            <ComboBoxItem Visibility="{Binding RdpWindowResizeMode, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{Binding Server_editor_different_options}" />
                         </ComboBox>
                     </Grid>
 
@@ -183,12 +183,12 @@
                         <Grid.Resources>
                             <local:ConverterEDisplayPerformance x:Key="ConverterEDisplayPerformance" />
                         </Grid.Resources>
-                        <ComboBox Text="{DynamicResource server_editor_different_options}" SelectedIndex="{Binding DisplayPerformance, Converter={StaticResource ConverterEDisplayPerformance}}">
+                        <ComboBox SelectedIndex="{Binding DisplayPerformance, Converter={StaticResource ConverterEDisplayPerformance}}">
                             <ComboBoxItem Content="{DynamicResource server_editor_display_rdp_performance_auto}" ToolTip="{DynamicResource server_editor_display_rdp_performance_auto}" />
                             <ComboBoxItem Content="{DynamicResource server_editor_display_rdp_performance_low}" ToolTip="{DynamicResource server_editor_display_rdp_performance_low}" />
                             <ComboBoxItem Content="{DynamicResource server_editor_display_rdp_performance_middle}" ToolTip="{DynamicResource server_editor_display_rdp_performance_middle}" />
                             <ComboBoxItem Content="{DynamicResource server_editor_display_rdp_performance_high}" ToolTip="{DynamicResource server_editor_display_rdp_performance_high}" />
-                            <ComboBoxItem Visibility="{Binding DisplayPerformance, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{DynamicResource server_editor_different_options}" />
+                            <ComboBoxItem Visibility="{Binding DisplayPerformance, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{Binding Server_editor_different_options}" />
                         </ComboBox>
                     </Grid>
                 </StackPanel>
@@ -245,7 +245,6 @@
         <StackPanel>
             <StackPanel.Resources>
                 <local:ConverterEGatewayLogonMethod x:Key="ConverterEGatewayLogonMethod" />
-                <local:ConverterEGatewayMode2Bool x:Key="ConverterEGatewayMode2Bool" />
             </StackPanel.Resources>
 
             <TextBlock Style="{StaticResource EditorGroupTextBlockTitle}" Text="{DynamicResource server_editor_group_title_gateway}"></TextBlock>
@@ -254,21 +253,15 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Text="{DynamicResource server_editor_gateway_mode}"></TextBlock>
                     <Grid Style="{StaticResource EditorRowGridInput}">
-                        <RadioButton GroupName="RDGatewaySetting"
-                                     Name="RbRDGatewayNo"
-                                     IsChecked="{Binding GatewayMode, Converter={StaticResource ConverterEGatewayMode2Bool}, ConverterParameter={x:Static local:EGatewayMode.DoNotUseGateway}}"
-                                     Content="{DynamicResource server_editor_gateway_mode_do_not_use}" VerticalAlignment="Center"></RadioButton>
-                    </Grid>
-                </StackPanel>
-            </Grid>
-            <Grid Style="{StaticResource EditorRowGrid}" Margin="0">
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Style="{StaticResource EditorRowGridTitle}" Text=""></TextBlock>
-                    <Grid Style="{StaticResource EditorRowGridInput}">
-                        <RadioButton GroupName="RDGatewaySetting"
-                                     Name="RbRDGatewayAuto"
-                                     IsChecked="{Binding GatewayMode, Converter={StaticResource ConverterEGatewayMode2Bool}, ConverterParameter={x:Static local:EGatewayMode.AutomaticallyDetectGatewayServerSettings}}"
-                                     Content="{DynamicResource server_editor_gateway_mode_automatically_detect}" VerticalAlignment="Center"></RadioButton>
+                        <Grid.Resources>
+                            <local:ConverterEGatewayMode x:Key="ConverterEGatewayMode" />
+                        </Grid.Resources>
+                        <ComboBox SelectedIndex="{Binding GatewayMode, Converter={StaticResource ConverterEGatewayMode}}">
+                            <ComboBoxItem Content="{DynamicResource server_editor_gateway_mode_automatically_detect}" ToolTip="{DynamicResource server_editor_display_rdp_performance_low}" />
+                            <ComboBoxItem Content="{DynamicResource server_editor_gateway_mode_use_these}" ToolTip="{DynamicResource server_editor_display_rdp_performance_middle}" />
+                            <ComboBoxItem Content="{DynamicResource server_editor_gateway_mode_do_not_use}" ToolTip="{DynamicResource server_editor_gateway_mode_do_not_use}" />
+                            <ComboBoxItem Visibility="{Binding GatewayMode, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{Binding Server_editor_different_options}" />
+                        </ComboBox>
                     </Grid>
                 </StackPanel>
             </Grid>
@@ -278,18 +271,12 @@
                     <TextBlock Style="{StaticResource EditorRowGridTitle}" Text="" />
                     <Grid Style="{StaticResource EditorRowGridInput}">
                         <StackPanel>
-                            <Grid Style="{StaticResource EditorRowGrid}" Margin="0">
-                                <RadioButton GroupName="RDGatewaySetting"
-                                             IsChecked="{Binding GatewayMode, Converter={StaticResource ConverterEGatewayMode2Bool}, ConverterParameter={x:Static local:EGatewayMode.UseTheseGatewayServerSettings}}"
-                                             Name="RbRDGatewayUse" Content="{DynamicResource server_editor_gateway_mode_use_these}"
-                                             VerticalAlignment="Center" />
-                            </Grid>
                             <StackPanel Margin="20 0 0 0">
                                 <StackPanel.Style>
                                     <Style TargetType="StackPanel">
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ElementName=RbRDGatewayNo, Path=IsChecked}" Value="True">
-                                                <Setter Property="IsEnabled" Value="False"></Setter>
+                                            <DataTrigger Binding="{Binding GatewayMode}" Value="{x:Static local:EGatewayMode.DoNotUseGateway}">
+                                                <Setter Property="Visibility" Value="Collapsed"></Setter>
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
@@ -306,7 +293,7 @@
                                         <ComboBox SelectedIndex="{Binding GatewayLogonMethod, Converter={StaticResource ConverterEGatewayLogonMethod}}" Width="200">
                                             <ComboBoxItem Content="{DynamicResource server_editor_gateway_logon_method_psw}" ToolTip="{DynamicResource server_editor_gateway_logon_method_psw}" />
                                             <ComboBoxItem Content="{DynamicResource server_editor_gateway_logon_method_smart_card}" ToolTip="{DynamicResource server_editor_gateway_logon_method_smart_card}" />
-                                            <ComboBoxItem Visibility="{Binding GatewayLogonMethod, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{DynamicResource server_editor_different_options}" />
+                                            <ComboBoxItem Visibility="{Binding GatewayLogonMethod, Converter={StaticResource ConverterEqual2Visible}, ConverterParameter={x:Null}}" Content="{Binding Server_editor_different_options}" />
                                         </ComboBox>
                                     </StackPanel>
                                 </Grid>