diff --git a/crates/connection-import-protocol/src/lib.rs b/crates/connection-import-protocol/src/lib.rs index c6afb7562..1ec8caa3d 100644 --- a/crates/connection-import-protocol/src/lib.rs +++ b/crates/connection-import-protocol/src/lib.rs @@ -33,6 +33,7 @@ mod tests { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Unsupported, warnings: Vec::new(), }; @@ -67,6 +68,7 @@ mod tests { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Unsupported, warnings: Vec::new(), }; diff --git a/crates/connection-import-protocol/src/model.rs b/crates/connection-import-protocol/src/model.rs index 1cb706147..67e1b5f2d 100644 --- a/crates/connection-import-protocol/src/model.rs +++ b/crates/connection-import-protocol/src/model.rs @@ -31,6 +31,7 @@ pub enum ImportRecordKind { PortForwarding, QuickCommand, Workspace, + Keybinding, } #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -101,6 +102,8 @@ pub struct ImportRecord { pub quick_command: Option, #[serde(default)] pub workspace: Option, + #[serde(default)] + pub keybinding: Option, pub password_status: PasswordImportStatus, pub warnings: Vec, } @@ -115,6 +118,7 @@ impl ImportRecord { self.port_forwarding.is_some(), self.quick_command.is_some(), self.workspace.is_some(), + self.keybinding.is_some(), ]; let expected_slot = match self.kind { ImportRecordKind::Database => 0, @@ -123,6 +127,7 @@ impl ImportRecord { ImportRecordKind::PortForwarding => 3, ImportRecordKind::QuickCommand => 4, ImportRecordKind::Workspace => 5, + ImportRecordKind::Keybinding => 6, }; let payload_count = payloads.iter().filter(|present| **present).count(); if payload_count == 1 && payloads[expected_slot] { @@ -219,6 +224,16 @@ pub struct WorkspaceImportRecord { pub path: String, } +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct KeybindingImportRecord { + pub action_id: String, + pub shortcuts: Vec, + #[serde(default)] + pub source_action: Option, + #[serde(default)] + pub description: Option, +} + #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct SshJumpServerImportRecord { pub host: String, @@ -370,6 +385,7 @@ mod tests { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Unsupported, warnings: Vec::new(), } diff --git a/crates/core/src/settings.rs b/crates/core/src/settings.rs index 04c61b02e..083b699f7 100644 --- a/crates/core/src/settings.rs +++ b/crates/core/src/settings.rs @@ -1215,6 +1215,36 @@ impl CloseButtonBehavior { } } +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum TabDoubleClickAction { + #[default] + None, + DuplicateTab, + RenameTab, + CloseTab, +} + +impl TabDoubleClickAction { + pub fn as_str(&self) -> &'static str { + match self { + TabDoubleClickAction::None => "none", + TabDoubleClickAction::DuplicateTab => "duplicate_tab", + TabDoubleClickAction::RenameTab => "rename_tab", + TabDoubleClickAction::CloseTab => "close_tab", + } + } + + pub fn from_str(value: &str) -> Self { + match value { + "duplicate_tab" => TabDoubleClickAction::DuplicateTab, + "rename_tab" => TabDoubleClickAction::RenameTab, + "close_tab" => TabDoubleClickAction::CloseTab, + _ => TabDoubleClickAction::None, + } + } +} + /// 更新通道:稳定版 / 测试版(Beta)。 /// /// 通道只决定「去哪份更新清单里找新版本」,安装包本身仍是同一套。稳定通道读 @@ -1360,6 +1390,8 @@ pub struct AppSettings { pub main_window_state: Option, #[serde(default)] pub close_button_behavior: CloseButtonBehavior, + #[serde(default)] + pub tab_double_click_action: TabDoubleClickAction, #[serde(default = "default_locale")] pub locale: String, #[serde(default = "default_theme_mode")] @@ -1872,6 +1904,7 @@ impl Default for AppSettings { main_window_size: None, main_window_state: None, close_button_behavior: CloseButtonBehavior::default(), + tab_double_click_action: TabDoubleClickAction::default(), locale: default_locale(), theme_mode: default_theme_mode(), auto_switch_theme: false, @@ -2522,6 +2555,7 @@ mod tests { use super::{ AiChatBackendSelection, AiChatSettings, AiChatToolExecutionMode, AppSettings, CloseButtonBehavior, ConnectionSortOrder, CustomFont, DEFAULT_AI_REQUEST_TIMEOUT_SECS, + TabDoubleClickAction, DEFAULT_MCP_APPROVAL_TIMEOUT_MS, DEFAULT_SQL_EXPORT_ROWS_PER_STATEMENT, DEFAULT_TERMINAL_THEME, HomeConnectionLayout, LOCALE_SYSTEM, LargeTextCellEditorOpenMode, LocalTerminalProfileKind, LocalTerminalProfileSettings, LogLevel, @@ -2909,6 +2943,36 @@ mod tests { assert_eq!(CloseButtonBehavior::Ask, CloseButtonBehavior::from_str("")); } + #[test] + fn tab_double_click_action_defaults_round_trips_and_falls_back() { + assert_eq!( + TabDoubleClickAction::None, + AppSettings::default().tab_double_click_action + ); + + let legacy: AppSettings = serde_json::from_value(serde_json::json!({})).unwrap(); + assert_eq!(TabDoubleClickAction::None, legacy.tab_double_click_action); + + for action in [ + TabDoubleClickAction::None, + TabDoubleClickAction::DuplicateTab, + TabDoubleClickAction::RenameTab, + TabDoubleClickAction::CloseTab, + ] { + let mut settings = AppSettings::default(); + settings.tab_double_click_action = action; + let json = serde_json::to_value(&settings).unwrap(); + let restored: AppSettings = serde_json::from_value(json).unwrap(); + assert_eq!(action, restored.tab_double_click_action); + assert_eq!(action, TabDoubleClickAction::from_str(action.as_str())); + } + + assert_eq!( + TabDoubleClickAction::None, + TabDoubleClickAction::from_str("unknown_action") + ); + } + #[test] fn app_settings_enables_direct_server_transfer_by_default() { assert!(AppSettings::default().direct_server_transfer_enabled); diff --git a/crates/core/src/tab_container.rs b/crates/core/src/tab_container.rs index 956a51240..9088a0bc0 100644 --- a/crates/core/src/tab_container.rs +++ b/crates/core/src/tab_container.rs @@ -1,5 +1,6 @@ use crate::background_task_panel::BackgroundTaskPanel; use crate::layout::TOOLBAR_WIDTH; +use crate::settings::{AppSettings, TabDoubleClickAction}; use crate::sidebar_contribution::{ SidebarContribution, SidebarPanelChrome, SidebarPanelId, SidebarPanelPolicy, SidebarPlacement, sidebar_panel_renders_header, @@ -2710,6 +2711,36 @@ impl TabContainer { self.duplicate_tab(self.active_index, window, cx); } + pub fn handle_tab_double_click( + &mut self, + index: usize, + window: &mut Window, + cx: &mut Context, + ) { + let Some(tab) = self.tabs.get(index) else { + return; + }; + if self.renaming_tab_id.as_ref() == Some(&tab.id()) { + return; + } + let action = cx + .try_global::() + .map(|settings| settings.tab_double_click_action) + .unwrap_or_default(); + match action { + TabDoubleClickAction::None => {} + TabDoubleClickAction::DuplicateTab => { + self.duplicate_tab(index, window, cx); + } + TabDoubleClickAction::RenameTab => { + self.start_rename_tab(index, window, cx); + } + TabDoubleClickAction::CloseTab => { + self.close_tab(index, window, cx).detach(); + } + } + } + fn duplicate_tab(&mut self, index: usize, window: &mut Window, cx: &mut Context) { if index >= self.tabs.len() { return; @@ -4451,9 +4482,12 @@ impl TabContainer { }, )) }) - .on_click(cx.listener(move |this, _event, window, cx| { + .on_click(cx.listener(move |this, event: &gpui::ClickEvent, window, cx| { window.prevent_default(); this.set_active_index(idx, window, cx); + if event.click_count() == 2 { + this.handle_tab_double_click(idx, window, cx); + } })) // 中键关闭沿用浏览器惯例:悬停标签任意位置即可关闭,不必对准 ×。 // closeable / locked 判断交给 close_tab 自身,避免渲染层重复一套守卫。 @@ -6801,4 +6835,56 @@ mod tests { .as_deref() ); } + + #[gpui::test] + fn double_click_action_setting_controls_tab_double_click_behavior(cx: &mut TestAppContext) { + let (window, container) = + open_middle_click_window(cx, &["first", "second"], &[], &["home"]); + let mut cx = VisualTestContext::from_window(window.into(), cx); + cx.update(|window, cx| { + let mut settings = AppSettings::default(); + settings.tab_double_click_action = TabDoubleClickAction::None; + cx.set_global(settings); + window.refresh(); + }); + cx.run_until_parked(); + + cx.update(|window, cx| { + container.update(cx, |tabs, cx| tabs.handle_tab_double_click(0, window, cx)); + }); + cx.run_until_parked(); + assert_eq!( + vec!["first".to_string(), "second".to_string()], + regular_tab_ids(&container, &mut cx) + ); + assert!(cx.update(|_, cx| container.read(cx).renaming_tab_id.is_none())); + + cx.update(|window, cx| { + let mut settings = AppSettings::default(); + settings.tab_double_click_action = TabDoubleClickAction::RenameTab; + cx.set_global(settings); + container.update(cx, |tabs, cx| tabs.handle_tab_double_click(0, window, cx)); + }); + cx.run_until_parked(); + assert_eq!( + Some("first"), + cx.update(|_, cx| container.read(cx).renaming_tab_id.as_deref().map(str::to_string)) + .as_deref() + ); + + cx.update(|window, cx| { + container.update(cx, |tabs, cx| { + tabs.commit_rename_tab_by_id("first", "first".to_string(), window, cx); + }); + let mut settings = AppSettings::default(); + settings.tab_double_click_action = TabDoubleClickAction::CloseTab; + cx.set_global(settings); + container.update(cx, |tabs, cx| tabs.handle_tab_double_click(1, window, cx)); + }); + cx.run_until_parked(); + assert_eq!( + vec!["first".to_string()], + regular_tab_ids(&container, &mut cx) + ); + } } diff --git a/crates/extension-runtime/src/connection_import_provider.rs b/crates/extension-runtime/src/connection_import_provider.rs index 5495d0130..ea4270c39 100644 --- a/crates/extension-runtime/src/connection_import_provider.rs +++ b/crates/extension-runtime/src/connection_import_provider.rs @@ -410,6 +410,7 @@ fn parse_output_kind(value: &str) -> Option { "port-forwarding" | "port_forwarding" => Some(ImportRecordKind::PortForwarding), "quick-command" | "quick_command" => Some(ImportRecordKind::QuickCommand), "workspace" => Some(ImportRecordKind::Workspace), + "keybinding" => Some(ImportRecordKind::Keybinding), _ => None, } } diff --git a/crates/extension-wasm/src/connection_import.rs b/crates/extension-wasm/src/connection_import.rs index 59f6322bc..7607f25f0 100644 --- a/crates/extension-wasm/src/connection_import.rs +++ b/crates/extension-wasm/src/connection_import.rs @@ -186,7 +186,9 @@ where importer_id: importer_id.into(), host, permissions, - wasi_ctx: WasiCtxBuilder::new().build(), + wasi_ctx: WasiCtxBuilder::new() + .env("NAVOP_IMPORT_CAPABILITIES", "keybinding") + .build(), table: ResourceTable::new(), } } diff --git a/crates/navop_app/locales/main.yml b/crates/navop_app/locales/main.yml index 4477f32cd..0f584e669 100644 --- a/crates/navop_app/locales/main.yml +++ b/crates/navop_app/locales/main.yml @@ -624,6 +624,18 @@ Home: en: Group imports cannot be converted to connections zh-CN: 分组导入不能转换为连接 zh-HK: 分組匯入不能轉換為連線 + kind_keybinding: + en: Shortcut + zh-CN: 快捷键 + zh-HK: 快捷鍵 + keybinding_invalid: + en: Keybinding action or shortcut is empty + zh-CN: 快捷键动作或按键不能为空 + zh-HK: 快捷鍵動作或按鍵不能為空 + keybinding_editor_unsupported: + en: Keybinding imports cannot be opened in the connection editor + zh-CN: 快捷键导入不能在连接编辑器中打开 + zh-HK: 快捷鍵匯入不能在連線編輯器中開啟 sources: en: Application Sources zh-CN: 应用来源 @@ -3048,6 +3060,36 @@ Settings: zh-CN: 退出应用 zh-HK: 結束應用程式 + TabBehavior: + group_title: + en: Tab Bar + zh-CN: 标签栏 + zh-HK: 標籤列 + double_click_action: + en: Double-Click Tab Action + zh-CN: 双击标签页动作 + zh-HK: 雙擊標籤頁動作 + double_click_action_desc: + en: Choose what happens when double-clicking a regular tab in the tab bar. + zh-CN: 选择双击标签栏中的普通标签页时执行的操作。 + zh-HK: 選擇雙擊標籤列中的普通標籤頁時執行的操作。 + none: + en: None + zh-CN: 无动作 + zh-HK: 無動作 + duplicate_tab: + en: Duplicate tab + zh-CN: 复制标签页 + zh-HK: 複製標籤頁 + rename_tab: + en: Rename tab + zh-CN: 重命名标签页 + zh-HK: 重新命名標籤頁 + close_tab: + en: Close tab + zh-CN: 关闭标签页 + zh-HK: 關閉標籤頁 + # 笔记设置 Notes: group_title: diff --git a/crates/navop_app/src/home/connection_import_actions.rs b/crates/navop_app/src/home/connection_import_actions.rs index c612d26a4..e363800b9 100644 --- a/crates/navop_app/src/home/connection_import_actions.rs +++ b/crates/navop_app/src/home/connection_import_actions.rs @@ -135,6 +135,33 @@ pub(crate) fn save_import_draft( draft: &EditableImportDraft, cx: &mut App, ) -> Result { + if draft.kind() == ImportDraftKind::Keybinding { + let action_id = draft.keybinding_action_id.trim(); + if action_id.is_empty() || draft.keybinding_shortcuts.is_empty() { + return Err(t!("Home.ConnectionImport.keybinding_invalid").to_string()); + } + let shortcuts = draft.keybinding_shortcuts.clone(); + if one_core::settings::AppSettings::global(cx) + .custom_keybindings + .get(action_id) + .is_some_and(|existing| existing == &shortcuts) + { + return Ok(ImportSaveResult::SkippedDuplicate { + existing_name: draft.name.clone(), + }); + } + let action_id_owned = action_id.to_string(); + one_core::settings::AppSettings::update_and_save(cx, |settings| { + settings + .custom_keybindings + .insert(action_id_owned, shortcuts); + }); + crate::navop_app::refresh_keybindings(cx); + cx.refresh_windows(); + return Ok(ImportSaveResult::Saved { + connection_id: None, + }); + } let storage = cx.global::().storage.clone(); if draft.kind() == ImportDraftKind::Workspace { let path = draft diff --git a/crates/navop_app/src/home/connection_import_draft.rs b/crates/navop_app/src/home/connection_import_draft.rs index 45caa4293..b4909f805 100644 --- a/crates/navop_app/src/home/connection_import_draft.rs +++ b/crates/navop_app/src/home/connection_import_draft.rs @@ -18,6 +18,7 @@ pub(crate) enum ImportDraftKind { Telnet, QuickCommand, Workspace, + Keybinding, Unsupported, } @@ -59,6 +60,9 @@ pub(crate) struct EditableImportDraft { pub(crate) quick_command_command: String, pub(crate) quick_command_shortcut: String, pub(crate) quick_command_description: String, + pub(crate) keybinding_action_id: String, + pub(crate) keybinding_shortcuts: Vec, + pub(crate) keybinding_description: String, /// 导入窗口里统一指定的高级设置默认项,转换时套用到连接参数上。 pub(crate) defaults: ImportConnectionDefaults, payload: ImportDraftPayload, @@ -94,6 +98,7 @@ impl EditableImportDraft { ImportRecordKind::Telnet => Self::telnet(record), ImportRecordKind::QuickCommand => Self::quick_command(record), ImportRecordKind::Workspace => Self::workspace(record), + ImportRecordKind::Keybinding => Self::keybinding(record), ImportRecordKind::PortForwarding => Self::unsupported(record), } } @@ -138,6 +143,9 @@ impl EditableImportDraft { quick_command_command: String::new(), quick_command_shortcut: String::new(), quick_command_description: String::new(), + keybinding_action_id: String::new(), + keybinding_shortcuts: Vec::new(), + keybinding_description: String::new(), defaults: ImportConnectionDefaults::default(), payload: ImportDraftPayload::Record(record), } @@ -174,6 +182,9 @@ impl EditableImportDraft { quick_command_command: String::new(), quick_command_shortcut: String::new(), quick_command_description: String::new(), + keybinding_action_id: String::new(), + keybinding_shortcuts: Vec::new(), + keybinding_description: String::new(), defaults: ImportConnectionDefaults::default(), payload: ImportDraftPayload::Record(record), } @@ -210,6 +221,9 @@ impl EditableImportDraft { quick_command_command: String::new(), quick_command_shortcut: String::new(), quick_command_description: String::new(), + keybinding_action_id: String::new(), + keybinding_shortcuts: Vec::new(), + keybinding_description: String::new(), defaults: ImportConnectionDefaults::default(), payload: ImportDraftPayload::Record(record), } @@ -242,6 +256,9 @@ impl EditableImportDraft { quick_command_description: imported .and_then(|record| record.description.clone()) .unwrap_or_default(), + keybinding_action_id: String::new(), + keybinding_shortcuts: Vec::new(), + keybinding_description: String::new(), defaults: ImportConnectionDefaults::default(), payload: ImportDraftPayload::Record(record), } @@ -274,6 +291,40 @@ impl EditableImportDraft { quick_command_command: String::new(), quick_command_shortcut: String::new(), quick_command_description: String::new(), + keybinding_action_id: String::new(), + keybinding_shortcuts: Vec::new(), + keybinding_description: String::new(), + defaults: ImportConnectionDefaults::default(), + payload: ImportDraftPayload::Record(record), + } + } + + fn keybinding(record: ImportRecord) -> Self { + let imported = record.keybinding.as_ref(); + Self { + selected: true, + name: record.display_name.clone(), + host: String::new(), + port: String::new(), + username: String::new(), + ssh_group_path: String::new(), + workspace_path: String::new(), + password: String::new(), + database: String::new(), + private_key_path: String::new(), + quick_command_group_name: String::new(), + quick_command_command: String::new(), + quick_command_shortcut: String::new(), + quick_command_description: String::new(), + keybinding_action_id: imported + .map(|record| record.action_id.clone()) + .unwrap_or_default(), + keybinding_shortcuts: imported + .map(|record| record.shortcuts.clone()) + .unwrap_or_default(), + keybinding_description: imported + .and_then(|record| record.description.clone()) + .unwrap_or_default(), defaults: ImportConnectionDefaults::default(), payload: ImportDraftPayload::Record(record), } @@ -295,6 +346,9 @@ impl EditableImportDraft { quick_command_command: String::new(), quick_command_shortcut: String::new(), quick_command_description: String::new(), + keybinding_action_id: String::new(), + keybinding_shortcuts: Vec::new(), + keybinding_description: String::new(), defaults: ImportConnectionDefaults::default(), payload: ImportDraftPayload::Record(record), } @@ -308,6 +362,7 @@ impl EditableImportDraft { ImportRecordKind::Telnet => ImportDraftKind::Telnet, ImportRecordKind::QuickCommand => ImportDraftKind::QuickCommand, ImportRecordKind::Workspace => ImportDraftKind::Workspace, + ImportRecordKind::Keybinding => ImportDraftKind::Keybinding, ImportRecordKind::PortForwarding => ImportDraftKind::Unsupported, }, } @@ -321,6 +376,7 @@ impl EditableImportDraft { ImportRecordKind::Telnet => ConnectionType::Telnet, ImportRecordKind::QuickCommand => ConnectionType::SshSftp, ImportRecordKind::Workspace => ConnectionType::SshSftp, + ImportRecordKind::Keybinding => ConnectionType::SshSftp, ImportRecordKind::PortForwarding => ConnectionType::PortForwarding, }, } @@ -333,6 +389,9 @@ impl EditableImportDraft { ImportRecordKind::Workspace => { return Icon::new(IconName::FolderOpen).with_size(IconSize::Default); } + ImportRecordKind::Keybinding => { + return Icon::new(IconName::SettingColor).with_size(IconSize::Default); + } _ => { return crate::connection_visuals::connection_type_icon( self.visual_connection_type(), @@ -388,6 +447,20 @@ impl EditableImportDraft { normalized_workspace_path(&self.workspace_path) } + pub(crate) fn keybinding_detail_text(&self) -> String { + let mut parts = Vec::new(); + if !self.keybinding_action_id.trim().is_empty() { + parts.push(self.keybinding_action_id.clone()); + } + if !self.keybinding_shortcuts.is_empty() { + parts.push(self.keybinding_shortcuts.join(", ")); + } + if let Some(desc) = optional_text(&self.keybinding_description) { + parts.push(desc); + } + parts.join(" · ") + } + pub(crate) fn warning_text(&self) -> Option { match &self.payload { ImportDraftPayload::Record(record) if record.warnings.is_empty() => None, diff --git a/crates/navop_app/src/home/connection_import_draft_conversion.rs b/crates/navop_app/src/home/connection_import_draft_conversion.rs index 18022dee5..c41d715ba 100644 --- a/crates/navop_app/src/home/connection_import_draft_conversion.rs +++ b/crates/navop_app/src/home/connection_import_draft_conversion.rs @@ -78,6 +78,9 @@ fn import_draft_to_connection( ImportRecordKind::Workspace => { Err(t!("Home.ConnectionImport.workspace_save_unsupported").to_string()) } + ImportRecordKind::Keybinding => { + Err(t!("Home.ConnectionImport.keybinding_editor_unsupported").to_string()) + } } } @@ -96,6 +99,11 @@ pub(crate) fn import_draft_duplicate_identity( ImportRecordKind::Workspace => { Err(t!("Home.ConnectionImport.workspace_save_unsupported").to_string()) } + ImportRecordKind::Keybinding => Ok(format!( + "keybinding:{}:{}", + draft.keybinding_action_id.trim(), + draft.keybinding_shortcuts.join(",") + )), } } @@ -185,6 +193,10 @@ fn to_ssh_connection( &draft.name, t!("Home.ConnectionImport.field_connection_name").as_ref(), )?; + let username = draft.username.trim().to_string(); + let auth_method = edited_ssh_auth_method(draft, &imported.auth_method)?; + let prompt_username = username.is_empty().then_some(true); + let prompt_password = matches!(&auth_method, SshAuthMethod::Password { password } if password.is_empty()).then_some(true); let params = SshParams { otp: None, remote_file: None, sftp_default_directory: None, @@ -192,11 +204,11 @@ fn to_ssh_connection( sftp_account: None, host: required_text(&draft.host, t!("Home.ConnectionImport.field_host").as_ref())?, port: required_port(&draft.port)?, - username: draft.username.trim().to_string(), - auth_method: edited_ssh_auth_method(draft, &imported.auth_method)?, + username, + auth_method, credential_reference: None, - prompt_username: None, - prompt_password: None, + prompt_username, + prompt_password, // 导入协议不携带 keyboard-interactive 信息:迁移源里的「支持多种认证方式」只是服务器 // 返回的方法列表,不等于需要二次认证。此字段留空会落到全局默认 `true`,使每个迁移进来的 // 连接都走 keyboard-interactive 优先;而受限设备(交换机/防火墙)上这条路径可能直接被 diff --git a/crates/navop_app/src/home/connection_import_draft_tests.rs b/crates/navop_app/src/home/connection_import_draft_tests.rs index 47cfa5630..7e7fc3e11 100644 --- a/crates/navop_app/src/home/connection_import_draft_tests.rs +++ b/crates/navop_app/src/home/connection_import_draft_tests.rs @@ -785,6 +785,7 @@ fn database_import(name: &str) -> ImportRecord { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Included, warnings: Vec::new(), } @@ -813,6 +814,7 @@ fn sqlite_import(name: &str, path: Option<&str>) -> ImportRecord { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Missing, warnings: Vec::new(), } @@ -843,6 +845,7 @@ fn external_database_import(name: &str, driver_id: &str, port: u16) -> ImportRec port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Included, warnings: Vec::new(), } @@ -875,6 +878,7 @@ fn ssh_import(name: &str) -> ImportRecord { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Unsupported, warnings: Vec::new(), } @@ -896,6 +900,7 @@ fn workspace_import(path: &str) -> ImportRecord { workspace: Some(WorkspaceImportRecord { path: path.to_string(), }), + keybinding: None, password_status: PasswordImportStatus::Missing, warnings: Vec::new(), } @@ -922,6 +927,7 @@ fn telnet_import(name: &str, username: Option<&str>, password: Option<&str>) -> port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: if password.is_some() { PasswordImportStatus::Included } else { @@ -997,8 +1003,27 @@ fn imported_ssh_password_survives_the_whole_conversion() { let stored = draft.to_stored_connection().expect("转换应成功"); let params = stored.to_ssh_params().expect("应为 SSH 连接"); + assert_eq!(None, params.prompt_password); match params.auth_method { SshAuthMethod::Password { password } => assert_eq!("s3cret-from-securecrt", password), other => panic!("导入的密码应保留为密码认证,实际为 {other:?}"), } } + +#[test] +fn ssh_import_without_password_prompts_for_password_on_connect() { + let mut record = ssh_import("windterm-no-pass"); + record.ssh.as_mut().unwrap().auth_method = SshImportAuthMethod::Password { password: None }; + record.password_status = PasswordImportStatus::Missing; + + let draft = EditableImportDraft::new(record); + assert!(draft.password.is_empty()); + + let params = draft + .to_stored_connection() + .expect("转换应成功") + .to_ssh_params() + .expect("应为 SSH 连接"); + assert_eq!(Some(true), params.prompt_password); + assert_eq!(None, params.prompt_username); +} diff --git a/crates/navop_app/src/home/connection_import_model_tests.rs b/crates/navop_app/src/home/connection_import_model_tests.rs index 293d514c6..ee482c56b 100644 --- a/crates/navop_app/src/home/connection_import_model_tests.rs +++ b/crates/navop_app/src/home/connection_import_model_tests.rs @@ -423,6 +423,7 @@ fn database_record(name: &str) -> ImportRecord { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Unsupported, warnings: Vec::new(), } @@ -452,6 +453,7 @@ fn ssh_record(name: &str, group_path: Option<&str>) -> ImportRecord { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Missing, warnings: Vec::new(), } @@ -477,6 +479,7 @@ fn workspace_record_for(importer_id: &str, id: &str, path: &str) -> ImportRecord workspace: Some(WorkspaceImportRecord { path: path.to_string(), }), + keybinding: None, password_status: PasswordImportStatus::Missing, warnings: Vec::new(), } diff --git a/crates/navop_app/src/home/connection_import_window.rs b/crates/navop_app/src/home/connection_import_window.rs index ee3ede95c..38eefaaf7 100644 --- a/crates/navop_app/src/home/connection_import_window.rs +++ b/crates/navop_app/src/home/connection_import_window.rs @@ -296,20 +296,13 @@ impl Focusable for ConnectionImportWindow { fn load_importer_descriptors() -> (Vec, Option) { let Some(root) = extension_runtime::extension::extensions_root() else { - return ( - Vec::new(), - Some(t!("Home.ConnectionImport.extension_directory_unavailable").to_string()), - ); + return (Vec::new(), None); }; let composite_root = root.join(extension_runtime::extension::ExtensionKind::Composite.dir_name()); match extension_runtime::connection_import_provider::list_manifest_connection_importers( &composite_root, ) { - Ok(importers) if importers.is_empty() => ( - Vec::new(), - Some(t!("Home.ConnectionImport.no_import_extensions").to_string()), - ), Ok(importers) => ( importers .into_iter() diff --git a/crates/navop_app/src/home/connection_import_window/render/preview.rs b/crates/navop_app/src/home/connection_import_window/render/preview.rs index 07f6f19e8..157b6d1db 100644 --- a/crates/navop_app/src/home/connection_import_window/render/preview.rs +++ b/crates/navop_app/src/home/connection_import_window/render/preview.rs @@ -56,7 +56,9 @@ fn render_row_actions( .when( !matches!( row.draft.kind(), - ImportDraftKind::QuickCommand | ImportDraftKind::Workspace + ImportDraftKind::QuickCommand + | ImportDraftKind::Workspace + | ImportDraftKind::Keybinding ), |this| { this.child( @@ -146,6 +148,10 @@ fn row_detail_text(draft: &EditableImportDraft) -> String { } return parts.join(" · "); } + if matches!(draft.kind(), ImportDraftKind::Keybinding) { + parts.push(draft.keybinding_detail_text()); + return parts.join(" · "); + } if let Some(endpoint) = endpoint_text(draft) { parts.push(endpoint); } @@ -189,6 +195,7 @@ fn kind_text(kind: ImportDraftKind) -> String { ImportDraftKind::Telnet => "Telnet".to_string(), ImportDraftKind::QuickCommand => t!("Home.ConnectionImport.kind_quick_command").to_string(), ImportDraftKind::Workspace => t!("Home.ConnectionImport.kind_workspace").to_string(), + ImportDraftKind::Keybinding => t!("Home.ConnectionImport.kind_keybinding").to_string(), ImportDraftKind::Unsupported => t!("Home.ConnectionImport.kind_unsupported").to_string(), } } diff --git a/crates/navop_app/src/home/connection_import_window_tests.rs b/crates/navop_app/src/home/connection_import_window_tests.rs index 9bac840a6..9d67e6ac4 100644 --- a/crates/navop_app/src/home/connection_import_window_tests.rs +++ b/crates/navop_app/src/home/connection_import_window_tests.rs @@ -95,6 +95,7 @@ fn ssh_record(name: &str) -> ImportRecord { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Missing, warnings: Vec::new(), } @@ -144,6 +145,7 @@ fn database_record(name: &str) -> ImportRecord { port_forwarding: None, quick_command: None, workspace: None, + keybinding: None, password_status: PasswordImportStatus::Unsupported, warnings: Vec::new(), } diff --git a/crates/navop_app/src/home_tab/host_metrics.rs b/crates/navop_app/src/home_tab/host_metrics.rs index 7a9fd3fc1..a9b7a3890 100644 --- a/crates/navop_app/src/home_tab/host_metrics.rs +++ b/crates/navop_app/src/home_tab/host_metrics.rs @@ -175,6 +175,13 @@ impl HomePage { { return None; } + if let Ok(params) = connection.to_ssh_params() + && (params.prompts_for_username() + || (params.prompts_for_password() + && params.auth_method.contains_password())) + { + return None; + } Some((connection_id, connection.clone())) }) } diff --git a/crates/navop_app/src/setting_tab.rs b/crates/navop_app/src/setting_tab.rs index 22c25e8b2..75c0e2a44 100644 --- a/crates/navop_app/src/setting_tab.rs +++ b/crates/navop_app/src/setting_tab.rs @@ -79,6 +79,7 @@ fn llm_providers_page_index(pages_before_rest: usize) -> usize { use gpui_component::input::InputEvent; pub use one_core::settings::{ AppSettings, CloseButtonBehavior, CustomFont, GlobalCurrentUser, GlobalProxySettings, + TabDoubleClickAction, LOCALE_EN, LOCALE_SYSTEM, LOCALE_ZH_CN, LOCALE_ZH_HK, LogLevel, MasterKeyStorage, PersonalSyncBackendKind, PersonalSyncSettings, ProxyType, StartupDefaultPage, SyncProvider, effective_locale_for_setting, is_installed_font_family, is_supported_grid_monospace_font, @@ -991,6 +992,7 @@ impl SettingsPanel { ), ), close_behavior_setting_group(default_settings.close_button_behavior), + tab_behavior_setting_group(default_settings.tab_double_click_action), deeplink_setting_group(), notes_setting_group(font_options.clone()), SettingGroup::new() @@ -1523,6 +1525,49 @@ fn close_behavior_setting_group(default: CloseButtonBehavior) -> SettingGroup { ) } +fn tab_behavior_setting_group(default: TabDoubleClickAction) -> SettingGroup { + SettingGroup::new() + .title(t!("Settings.General.TabBehavior.group_title")) + .item( + SettingItem::new( + t!("Settings.General.TabBehavior.double_click_action"), + SettingField::dropdown( + vec![ + ( + SharedString::from(TabDoubleClickAction::None.as_str()), + t!("Settings.General.TabBehavior.none").into(), + ), + ( + SharedString::from(TabDoubleClickAction::DuplicateTab.as_str()), + t!("Settings.General.TabBehavior.duplicate_tab").into(), + ), + ( + SharedString::from(TabDoubleClickAction::RenameTab.as_str()), + t!("Settings.General.TabBehavior.rename_tab").into(), + ), + ( + SharedString::from(TabDoubleClickAction::CloseTab.as_str()), + t!("Settings.General.TabBehavior.close_tab").into(), + ), + ], + |cx: &App| { + SharedString::from( + AppSettings::global(cx).tab_double_click_action.as_str(), + ) + }, + |val: SharedString, cx: &mut App| { + AppSettings::update_and_save(cx, |settings| { + settings.tab_double_click_action = + TabDoubleClickAction::from_str(val.as_ref()); + }); + }, + ) + .default_value(SharedString::from(default.as_str())), + ) + .description(t!("Settings.General.TabBehavior.double_click_action_desc").to_string()), + ) +} + /// 同步设置分组。 /// /// `setting_pages` 每次渲染都会重建这里,所以按**当前**后端(而不是默认值)决定