#83 the common options now can show as <different options> in multi…

…-edit.
1Remote · May 11, 2021 · 23983ac · 23983ac
1 parent 9619d6e
commit 23983ac
Show file tree

Hide file tree

Showing 43 changed files with 865 additions and 606 deletions.
diff --git a/PRM.Core/Languages/de-de.json b/PRM.Core/Languages/de-de.json
@@ -152,6 +152,7 @@
   "managementpage_edit_selected_confirm": "Sicher, um alle ausgewählten auf den neuen Wert zu aktualisieren: '",
 
   // server editor
+  "server_editor_different_options": "<different options>",
   "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
@@ -152,6 +152,7 @@
   "managementpage_edit_selected_confirm": "Sure to move all selected to new value: '",
 
   // server editor
+  "server_editor_different_options": "<different options>",
   "server_editor_group_title_common": "Common",
   "server_editor_group_title_connection": "Connection",
   "server_editor_group_title_display": "Display",

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
@@ -152,6 +152,7 @@
   "managementpage_edit_selected_confirm": "确认要将所选项目变更为 '",
 
   // server editor
+  "server_editor_different_options": "<不同的选项>",
   "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/Model/GlobalEventHelper.cs b/PRM.Core/Model/GlobalEventHelper.cs
@@ -43,6 +43,9 @@ public static class GlobalEventHelper
         /// </summary>
         public static OnRequestGoToServerEditPageDelegate OnRequestGoToServerEditPage { get; set; } = null;
 
+        public delegate void OnRequestGoToServerMultipleEditPageDelegate(IEnumerable<ProtocolServerBase> servers, bool showAnimation = true);
+        public static OnRequestGoToServerMultipleEditPageDelegate OnRequestGoToServerMultipleEditPage { get; set; } = null;
+
         public delegate void OnRequestUpdateServerDelegate(ProtocolServerBase server);
         public static OnRequestUpdateServerDelegate OnRequestUpdateServer { get; set; } = null;
 

diff --git a/PRM.Core/PRM.Core.csproj b/PRM.Core/PRM.Core.csproj
@@ -131,6 +131,12 @@
     <Compile Include="Model\GlobalData.cs" />
     <Compile Include="Model\GlobalEventHelper.cs" />
     <Compile Include="Model\SystemConfig.KeywordMatch.cs" />
+    <Compile Include="Protocol\BaseClassForm\ProtocolServerWithAddrPortBaseForm.xaml.cs">
+      <DependentUpon>ProtocolServerWithAddrPortBaseForm.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Protocol\BaseClassForm\ProtocolServerWithAddrPortUserPwdBaseForm.xaml.cs">
+      <DependentUpon>ProtocolServerWithAddrPortUserPwdBaseForm.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Protocol\Putty\KittyPortableSessionConfigReader.cs" />
     <Compile Include="Utils\DesktopResolutionWatcher.cs" />
     <Compile Include="Model\SystemConfig.cs" />
@@ -409,6 +415,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Protocol\BaseClassForm\ProtocolServerWithAddrPortBaseForm.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Protocol\BaseClassForm\ProtocolServerWithAddrPortUserPwdBaseForm.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Protocol\FileTransmit\FTP\ProtocolServerFTPForm.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/PRM.Core/Protocol/BaseClassForm/ProtocolServerFormBase.cs b/PRM.Core/Protocol/BaseClassForm/ProtocolServerFormBase.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace PRM.Core.Protocol
+namespace PRM.Core.Protocol.BaseClassForm
 {
     public abstract class ProtocolServerFormBase : UserControl
     {

diff --git a/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortBaseForm.xaml b/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortBaseForm.xaml
@@ -0,0 +1,60 @@
+<baseClassForm:ProtocolServerFormBase x:Class="PRM.Core.Protocol.BaseClassForm.ProtocolServerWithAddrPortBaseForm"
+                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                        xmlns:protocol="clr-namespace:PRM.Core.Protocol"
+                        xmlns:controls="clr-namespace:PRM.Core.Resources.Controls"
+                        xmlns:local="clr-namespace:PRM.Core.Protocol.VNC"
+                        xmlns:passwordEx="clr-namespace:Shawn.Utils"
+                        xmlns:baseClassForm="clr-namespace:PRM.Core.Protocol.BaseClassForm"
+                        mc:Ignorable="d"
+                        d:DataContext="{d:DesignInstance protocol:ProtocolServerWithAddrPortBase}"
+                        d:DesignHeight="1450" d:DesignWidth="800">
+    <StackPanel>
+        <StackPanel.Resources>
+            <ResourceDictionary>
+                <ResourceDictionary.MergedDictionaries>
+                    <ResourceDictionary Source="pack://application:,,,/PRM.Core;component/Utils/PasswordEx/PasswordBoxEx.xaml"></ResourceDictionary>
+                </ResourceDictionary.MergedDictionaries>
+            </ResourceDictionary>
+        </StackPanel.Resources>
+
+        <StackPanel>
+
+            <TextBlock Style="{StaticResource EditorGroupTextBlockTitle}" Text="{DynamicResource server_editor_group_title_connection}"></TextBlock>
+
+            <Grid Style="{StaticResource EditorRowGrid}">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Style="{StaticResource EditorRowGridTitle}" Text="{DynamicResource server_editor_connection_address}"></TextBlock>
+                    <Grid Style="{StaticResource EditorRowGridInput}">
+                        <TextBox Text="{Binding Address,UpdateSourceTrigger=PropertyChanged}"
+                                 Style="{StaticResource TextBoxWithPlaceHolder}"
+                                 Tag="e.g. 192.168.0.101"></TextBox>
+                    </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}"
+                                 HorizontalAlignment="Left"
+                                 InputMethod.IsInputMethodEnabled="False"
+                                 InputScope="Number"
+                                 ></TextBox>
+                    </Grid>
+                </StackPanel>
+            </Grid>
+
+            <Grid Name="GridPwd">
+                <Grid.Style>
+                    <Style TargetType="Grid" BasedOn="{StaticResource EditorRowGrid}">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding ElementName=CbUsePrivateKey,Path= IsChecked}" Value="True">
+                                <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                <Setter Property="IsEnabled" Value="False"></Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Grid.Style>
+            </Grid>
+        </StackPanel>
+    </StackPanel>
+</baseClassForm:ProtocolServerFormBase>
diff --git a/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortBaseForm.xaml.cs b/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortBaseForm.xaml.cs
@@ -0,0 +1,13 @@
+namespace PRM.Core.Protocol.BaseClassForm
+{
+    public partial class ProtocolServerWithAddrPortBaseForm : ProtocolServerFormBase
+    {
+        public readonly ProtocolServerBase Vm;
+        public ProtocolServerWithAddrPortBaseForm(ProtocolServerBase vm) : base(vm)
+        {
+            InitializeComponent();
+            Vm = vm;
+            DataContext = vm;
+        }
+    }
+}
diff --git a/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortUserPwdBaseForm.xaml b/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortUserPwdBaseForm.xaml
@@ -0,0 +1,68 @@
+<baseClassForm:ProtocolServerFormBase x:Class="PRM.Core.Protocol.BaseClassForm.ProtocolServerWithAddrPortUserPwdBaseForm"
+                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                        xmlns:protocol="clr-namespace:PRM.Core.Protocol"
+                        xmlns:controls="clr-namespace:PRM.Core.Resources.Controls"
+                        xmlns:local="clr-namespace:PRM.Core.Protocol.VNC"
+                        xmlns:passwordEx="clr-namespace:Shawn.Utils"
+                        xmlns:baseClassForm="clr-namespace:PRM.Core.Protocol.BaseClassForm"
+                        mc:Ignorable="d"
+                        d:DataContext="{d:DesignInstance protocol:ProtocolServerWithAddrPortUserPwdBase}"
+                        d:DesignHeight="1450" d:DesignWidth="800">
+    <StackPanel>
+        <StackPanel.Resources>
+            <ResourceDictionary>
+                <ResourceDictionary.MergedDictionaries>
+                    <ResourceDictionary Source="pack://application:,,,/PRM.Core;component/Utils/PasswordEx/PasswordBoxEx.xaml"></ResourceDictionary>
+                </ResourceDictionary.MergedDictionaries>
+            </ResourceDictionary>
+        </StackPanel.Resources>
+
+        <StackPanel>
+
+            <TextBlock Style="{StaticResource EditorGroupTextBlockTitle}" Text="{DynamicResource server_editor_group_title_connection}"></TextBlock>
+
+            <Grid Style="{StaticResource EditorRowGrid}">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Style="{StaticResource EditorRowGridTitle}" Text="{DynamicResource server_editor_connection_address}"></TextBlock>
+                    <Grid Style="{StaticResource EditorRowGridInput}">
+                        <TextBox Text="{Binding Address,UpdateSourceTrigger=PropertyChanged}"
+                                 Style="{StaticResource TextBoxWithPlaceHolder}"
+                                 Tag="e.g. 192.168.0.101"></TextBox>
+                    </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"
+                                 InputScope="Number"
+                        ></TextBox>
+                    </Grid>
+                </StackPanel>
+            </Grid>
+
+            <Grid Name="GridPwd">
+                <Grid.Style>
+                    <Style TargetType="Grid" BasedOn="{StaticResource EditorRowGrid}">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding ElementName=CbUsePrivateKey,Path= IsChecked}" Value="True">
+                                <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                <Setter Property="IsEnabled" Value="False"></Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Grid.Style>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Style="{StaticResource EditorRowGridTitle}" Text="{DynamicResource server_editor_connection_password}"></TextBlock>
+                    <Grid Style="{StaticResource EditorRowGridInput}">
+                        <PasswordBox passwordEx:PasswordBoxEx.Password="{Binding Password,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"
+                                     Style="{StaticResource PasswordBoxEx}" />
+                    </Grid>
+                </StackPanel>
+            </Grid>
+        </StackPanel>
+    </StackPanel>
+</baseClassForm:ProtocolServerFormBase>
diff --git a/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortUserPwdBaseForm.xaml.cs b/PRM.Core/Protocol/BaseClassForm/ProtocolServerWithAddrPortUserPwdBaseForm.xaml.cs
@@ -0,0 +1,13 @@
+namespace PRM.Core.Protocol.BaseClassForm
+{
+    public partial class ProtocolServerWithAddrPortUserPwdBaseForm : ProtocolServerFormBase
+    {
+        public readonly ProtocolServerBase Vm;
+        public ProtocolServerWithAddrPortUserPwdBaseForm(ProtocolServerBase vm) : base(vm)
+        {
+            InitializeComponent();
+            Vm = vm;
+            DataContext = vm;
+        }
+    }
+}