feat: Add "Allow Quick Connect to save entered address information" option, close #746

VShawn · VShawn · commit d99630c3e135 · 2024-11-02T09:37:26.000+08:00
diff --git a/Ui/Model/GlobalData.cs b/Ui/Model/GlobalData.cs
@@ -147,7 +147,7 @@ public bool ReloadServerList(bool force = false)
                 {
                     // read from db
                     VmItemList = _sourceService.GetServers(force);
-                    LocalityConnectRecorder.Cleanup();
+                    LocalityConnectRecorder.ConnectTimeCleanup();
                     ReadTagsFromServers();
                     OnDataReloaded?.Invoke();
                     return true;
diff --git a/Ui/Resources/Languages/cs-cz.xaml b/Ui/Resources/Languages/cs-cz.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Umístěte zavírací tlačítko na levou stranu, abyste zabránili náhodným dotykům</s:String>
     <s:String x:Key="Ask for password when open connect">Při otevření připojení požádat o heslo</s:String>
     <s:String x:Key="Remember the information above">Pamatujte na výše uvedené informace</s:String>
+    <s:String x:Key="Quick Connect">Rychlé připojení</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Povolte rychlému připojení uložit zadané informace o adrese</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/de-de.xaml b/Ui/Resources/Languages/de-de.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Platzieren Sie die Schließtaste auf der linken Seite, um versehentliche Berührungen zu verhindern</s:String>
     <s:String x:Key="Ask for password when open connect">Beim Öffnen der Verbindung nach dem Passwort fragen</s:String>
     <s:String x:Key="Remember the information above">Denken Sie an die obigen Informationen</s:String>
+    <s:String x:Key="Quick Connect">Schnellverbindung</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Erlauben Sie Quick Connect, eingegebene Adressinformationen zu speichern</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/en-us.xaml b/Ui/Resources/Languages/en-us.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Place the close button on the left side to prevent accidental touches</s:String>
     <s:String x:Key="Ask for password when open connect">Ask for password when open connect</s:String>
     <s:String x:Key="Remember the information above">Remember the information above</s:String>
+    <s:String x:Key="Quick Connect">Quick Connect</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Allow Quick Connect to save entered address information</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/fr-fr.xaml b/Ui/Resources/Languages/fr-fr.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Placez le bouton de fermeture sur le côté gauche pour éviter les contacts accidentels</s:String>
     <s:String x:Key="Ask for password when open connect">Demander un mot de passe lors de l'ouverture de la connexion</s:String>
     <s:String x:Key="Remember the information above">N'oubliez pas les informations ci-dessus</s:String>
+    <s:String x:Key="Quick Connect">Connexion rapide</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Autoriser Quick Connect à enregistrer les informations d'adresse saisies</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/gl-es.xaml b/Ui/Resources/Languages/gl-es.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Coloque o botón de peche no lado esquerdo para evitar toques accidentais</s:String>
     <s:String x:Key="Ask for password when open connect">Solicitar o contrasinal ao abrir a conexión</s:String>
     <s:String x:Key="Remember the information above">Lembra a información anterior</s:String>
+    <s:String x:Key="Quick Connect">Conexión rápida</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Permitir que a conexión rápida garde a información de enderezo introducida</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/glossary.csv b/Ui/Resources/Languages/glossary.csv
@@ -349,3 +349,5 @@ Copy the port along with the address when copying;Copy the port along with the a
 Place the close button on the left side to prevent accidental touches;Place the close button on the left side to prevent accidental touches;将关闭按钮放在左侧以防止误触;;;;;;;;;
 Ask for password when open connect;Ask for password when open connect;打开连接时输入密码;;;;;;;;;
 Remember the information above;Remember the information above;记住上述信息;;;;;;;;;
+Quick Connect;Quick Connect;快速连接;;;;;;;;;
+Allow Quick Connect to save entered address information;Allow Quick Connect to save entered address information;允许`快速连接`保存输入的地址信息;;;;;;;;;
diff --git a/Ui/Resources/Languages/glossary_translated_by_google.csv b/Ui/Resources/Languages/glossary_translated_by_google.csv
@@ -357,3 +357,5 @@ Copy the port along with the address when copying;Copy the port along with the a
 Place the close button on the left side to prevent accidental touches;Place the close button on the left side to prevent accidental touches;将关闭按钮放在左侧以防止误触;Umístěte zavírací tlačítko na levou stranu, abyste zabránili náhodným dotykům;Platzieren Sie die Schließtaste auf der linken Seite, um versehentliche Berührungen zu verhindern;Placez le bouton de fermeture sur le côté gauche pour éviter les contacts accidentels;Coloque o botão fechar no lado esquerdo para evitar toques acidentais;誤操作を防ぐために閉じるボタンを左側に配置;將關閉按鈕置於左側，防止誤觸;Coloque o botón de peche no lado esquerdo para evitar toques accidentais;Umieść przycisk zamykania po lewej stronie, aby zapobiec przypadkowym dotknięciom;Разместите кнопку закрытия слева, чтобы предотвратить случайные нажатия.
 Ask for password when open connect;Ask for password when open connect;打开连接时输入密码;Při otevření připojení požádat o heslo;Beim Öffnen der Verbindung nach dem Passwort fragen;Demander un mot de passe lors de l'ouverture de la connexion;Pedir senha quando abrir conectar;接続を開くときにパスワードを要求する;開啟連線時詢問密碼;Solicitar o contrasinal ao abrir a conexión;Zapytaj o hasło przy otwieraniu połączenia;Запросить пароль при открытии подключения
 Remember the information above;Remember the information above;记住上述信息;Pamatujte na výše uvedené informace;Denken Sie an die obigen Informationen;N'oubliez pas les informations ci-dessus;Lembre-se das informações acima;上記の情報を覚えておいてください;記住上面的訊息;Lembra a información anterior;Zapamiętaj powyższe informacje;Помните информацию выше
+Quick Connect;Quick Connect;快速连接;Rychlé připojení;Schnellverbindung;Connexion rapide;Conexão rápida;クイックコネクト;快速連接;Conexión rápida;Szybkie połączenie;Быстрое подключение
+Allow Quick Connect to save entered address information;Allow Quick Connect to save entered address information;允许`快速连接`保存输入的地址信息;Povolte rychlému připojení uložit zadané informace o adrese;Erlauben Sie Quick Connect, eingegebene Adressinformationen zu speichern;Autoriser Quick Connect à enregistrer les informations d'adresse saisies;Permitir que o Quick Connect salve as informações de endereço inseridas;クイック接続で入力したアドレス情報を保存できるようにする;允許快速連接保存輸入的地址信息;Permitir que a conexión rápida garde a información de enderezo introducida;Zezwól szybkiemu połączeniu na zapisanie wprowadzonych informacji adresowych;Разрешить Quick Connect сохранять введенную информацию об адресе
diff --git a/Ui/Resources/Languages/ja-jp.xaml b/Ui/Resources/Languages/ja-jp.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">誤操作を防ぐために閉じるボタンを左側に配置</s:String>
     <s:String x:Key="Ask for password when open connect">接続を開くときにパスワードを要求する</s:String>
     <s:String x:Key="Remember the information above">上記の情報を覚えておいてください</s:String>
+    <s:String x:Key="Quick Connect">クイックコネクト</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">クイック接続で入力したアドレス情報を保存できるようにする</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/pl-pl.xaml b/Ui/Resources/Languages/pl-pl.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Umieść przycisk zamykania po lewej stronie, aby zapobiec przypadkowym dotknięciom</s:String>
     <s:String x:Key="Ask for password when open connect">Zapytaj o hasło przy otwieraniu połączenia</s:String>
     <s:String x:Key="Remember the information above">Zapamiętaj powyższe informacje</s:String>
+    <s:String x:Key="Quick Connect">Szybkie połączenie</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Zezwól szybkiemu połączeniu na zapisanie wprowadzonych informacji adresowych</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/pt-br.xaml b/Ui/Resources/Languages/pt-br.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Coloque o botão fechar no lado esquerdo para evitar toques acidentais</s:String>
     <s:String x:Key="Ask for password when open connect">Pedir senha quando abrir conectar</s:String>
     <s:String x:Key="Remember the information above">Lembre-se das informações acima</s:String>
+    <s:String x:Key="Quick Connect">Conexão rápida</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Permitir que o Quick Connect salve as informações de endereço inseridas</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/readme.md b/Ui/Resources/Languages/readme.md
@@ -0,0 +1,15 @@
+# Text Library
+
+## How to Add or Edit a Language
+
+- Open the `glossary.csv` file. Please avoid using Office Excel, as it may alter the file encoding. You can use https://edit-csv.net for editing instead.
+- Insert the new language in the last column, filling in the first three rows with language information. `language_code-google` is used to automatically call Google Translate.
+- Enter the corresponding terms for the new language.
+- After completing this, run `conver_glossary_to_xaml.bat` to import the translated text into the APP source code. (Note: `conver_glossary_to_xaml.bat` requires Python support.)
+
+## 如何新增或编辑语言
+
+- 打开 `glossary.csv` 文件，请不要用 office excel 打开 csv，因为 excel 会修改文件的编码格式。可以使用 https://edit-csv.net 进行编辑。
+- 将在最后一列插入要新增的语言，前三行填写语言信息，language_code-google 用于自动调用 Google 翻译。
+- 填入词组在新语言中对应的单词
+- 完成后执行 conver_glossary_to_xaml.bat，将翻译文本导入到 APP 源码中。（注意，conver_glossary_to_xaml.bat 需要 python 环境支持）
diff --git a/Ui/Resources/Languages/ru-ru.xaml b/Ui/Resources/Languages/ru-ru.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Разместите кнопку закрытия слева, чтобы предотвратить случайные нажатия.</s:String>
     <s:String x:Key="Ask for password when open connect">Запросить пароль при открытии подключения</s:String>
     <s:String x:Key="Remember the information above">Помните информацию выше</s:String>
+    <s:String x:Key="Quick Connect">Быстрое подключение</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">Разрешить Quick Connect сохранять введенную информацию об адресе</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/zh-cn.xaml b/Ui/Resources/Languages/zh-cn.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">将关闭按钮放在左侧以防止误触</s:String>
     <s:String x:Key="Ask for password when open connect">打开连接时输入密码</s:String>
     <s:String x:Key="Remember the information above">记住上述信息</s:String>
+    <s:String x:Key="Quick Connect">快速连接</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">允许`快速连接`保存输入的地址信息</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/zh-tw.xaml b/Ui/Resources/Languages/zh-tw.xaml
@@ -315,4 +315,6 @@
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">將關閉按鈕置於左側，防止誤觸</s:String>
     <s:String x:Key="Ask for password when open connect">開啟連線時詢問密碼</s:String>
     <s:String x:Key="Remember the information above">記住上面的訊息</s:String>
+    <s:String x:Key="Quick Connect">快速連接</s:String>
+    <s:String x:Key="Allow Quick Connect to save entered address information">允許快速連接保存輸入的地址信息</s:String>
 </ResourceDictionary>
diff --git a/Ui/Service/ConfigurationService.cs b/Ui/Service/ConfigurationService.cs
@@ -92,6 +92,9 @@ public class LauncherConfig
         public bool ShowNoteFieldInLauncher = true;
         public bool ShowCredentials = true;
         public bool IsMatchingCredentials = true;
+        [DefaultValue(true)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public bool AllowSaveInfoInQuickConnect = true;
     }
 
     public class KeywordMatchConfig
diff --git a/Ui/Service/Locality/LocalityConnectRecorder.cs b/Ui/Service/Locality/LocalityConnectRecorder.cs
@@ -71,18 +71,18 @@ private static void Save()
         /// <summary>
         /// Update the connect time of id
         /// </summary>
-        public static void UpdateConnectTime(this ProtocolBaseViewModel vmServer, long time = 0)
+        public static void ConnectTimeAddOrUpdate(this ProtocolBaseViewModel vmServer, long time = 0)
         {
             Load();
             //var serverId = $"{server.Id}_From{server.DataSourceName}";
             if (time == 0)
                 time = DateTimeOffset.Now.ToUnixTimeMilliseconds();
             _settings.ConnectRecodes.AddOrUpdate(vmServer.Id, time, (s, l) => time);
             Save();
-            vmServer.LastConnectTime = Get(vmServer.Server);
+            vmServer.LastConnectTime = ConnectTimeGet(vmServer.Server);
         }
 
-        public static DateTime Get(ProtocolBase server)
+        public static DateTime ConnectTimeGet(ProtocolBase server)
         {
             Load();
             if (_settings.ConnectRecodes.TryGetValue(server.Id, out var ut))
@@ -92,9 +92,7 @@ public static DateTime Get(ProtocolBase server)
             }
             return DateTime.MinValue;
         }
-
-
-        public static void Cleanup(IEnumerable<string>? existedIds = null)
+        public static void ConnectTimeCleanup(IEnumerable<string>? existedIds = null)
         {
             Load();
             if (existedIds != null)
@@ -120,8 +118,8 @@ public static void Cleanup(IEnumerable<string>? existedIds = null)
 
         #region QuickConnectionHistory
 
-        public static List<QuickConnectionItem> QuickConnectionHistoryGet() => new List<QuickConnectionItem>(_settings.QuickConnectionHistory);
-        public static void QuickConnectionHistoryAdd(string host, string protocol, string username, string password, string privateKeyPath)
+        public static List<QuickConnectionItem> QuickConnectionHistoryGetAll() => new List<QuickConnectionItem>(_settings.QuickConnectionHistory);
+        public static void QuickConnectionHistoryAddOrUpdate(string host, string protocol, string username, string password, string privateKeyPath)
         {
             var item = new QuickConnectionItem()
             {
@@ -153,6 +151,12 @@ public static void QuickConnectionHistoryRemove(QuickConnectionItem item)
             }
             Save();
         }
+        public static void QuickConnectionHistoryRemoveAll()
+        {
+            Load();
+            _settings.QuickConnectionHistory.Clear();
+            Save();
+        }
         #endregion
 
 
diff --git a/Ui/Service/SessionControlService.cs b/Ui/Service/SessionControlService.cs
@@ -162,7 +162,7 @@ private bool ActivateOrReConnIfServerSessionIsOpened(in ProtocolBase server)
                     });
 
                     var vmServer = _appData.GetItemById(server.DataSource?.DataSourceName ?? "", server.Id);
-                    vmServer?.UpdateConnectTime();
+                    vmServer?.ConnectTimeAddOrUpdate();
                 }
                 catch (Exception e)
                 {
diff --git a/Ui/Service/SessionControlService_OpenConnection.cs b/Ui/Service/SessionControlService_OpenConnection.cs
@@ -192,7 +192,7 @@ private async Task<string> Connect(ProtocolBase protocol, string fromView, strin
             // update the last conn time
             {
                 var vmServer = _appData.GetItemById(protocol.DataSource?.DataSourceName ?? "", protocol.Id);
-                vmServer?.UpdateConnectTime();
+                vmServer?.ConnectTimeAddOrUpdate();
                 if (IoC.Get<ConfigurationService>().General.ShowRecentlySessionInTray)
                     IoC.Get<TaskTrayService>().ReloadTaskTrayContextMenu();
             }
diff --git a/Ui/View/Editor/PasswordPopupDialogViewModel.cs b/Ui/View/Editor/PasswordPopupDialogViewModel.cs
@@ -17,13 +17,11 @@ namespace _1RM.View.Editor
 {
     public class PasswordPopupDialogViewModel : NotifyPropertyChangedBaseScreen
     {
-        //public List<ProtocolBaseViewModel> ProtocolList { get; }
-
         public bool DialogResult { get; set; } = false;
 
         public string Title { get; set; } = "";
 
-        private string _userName = "Administrator";
+        private string _userName = "";
         public string UserName
         {
             get => _userName;
diff --git a/Ui/View/Launcher/QuickConnectionView.xaml.cs b/Ui/View/Launcher/QuickConnectionView.xaml.cs
@@ -100,8 +100,9 @@ private void ListBoxHistory_OnPreviewMouseLeftButtonDown(object sender, MouseBut
         {
             if (IoC.TryGet<LauncherWindowView>()?.IsClosing != false) return;
             if (this.DataContext is not QuickConnectionViewModel vm) return;
-
-            if (e.ClickCount == 2)
+            
+            if (vm.ConnectHistory.Count == 1 // only one connect button
+                || e.ClickCount == 2) // or there multiple items and double click
                 vm.OpenConnection();
         }
 
diff --git a/Ui/View/Launcher/QuickConnectionViewModel.cs b/Ui/View/Launcher/QuickConnectionViewModel.cs
diff --git a/Ui/View/ProtocolBaseViewModel.cs b/Ui/View/ProtocolBaseViewModel.cs
diff --git a/Ui/View/Settings/Launcher/LauncherSettingView.xaml b/Ui/View/Settings/Launcher/LauncherSettingView.xaml
diff --git a/Ui/View/Settings/Launcher/LauncherSettingViewModel.cs b/Ui/View/Settings/Launcher/LauncherSettingViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public bool ReloadServerList(bool force = false)`
`147`	`147`	`{`
`148`	`148`	`// read from db`
`149`	`149`	`VmItemList = _sourceService.GetServers(force);`
`150`		`- LocalityConnectRecorder.Cleanup();`
	`150`	`+ LocalityConnectRecorder.ConnectTimeCleanup();`
`151`	`151`	`ReadTagsFromServers();`
`152`	`152`	`OnDataReloaded?.Invoke();`
`153`	`153`	`return true;`