Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/connection-import-protocol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ mod tests {
port_forwarding: None,
quick_command: None,
workspace: None,
keybinding: None,
password_status: PasswordImportStatus::Unsupported,
warnings: Vec::new(),
};
Expand Down Expand Up @@ -67,6 +68,7 @@ mod tests {
port_forwarding: None,
quick_command: None,
workspace: None,
keybinding: None,
password_status: PasswordImportStatus::Unsupported,
warnings: Vec::new(),
};
Expand Down
16 changes: 16 additions & 0 deletions crates/connection-import-protocol/src/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub enum ImportRecordKind {
PortForwarding,
QuickCommand,
Workspace,
Keybinding,
}

#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
Expand Down Expand Up @@ -101,6 +102,8 @@ pub struct ImportRecord {
pub quick_command: Option<QuickCommandImportRecord>,
#[serde(default)]
pub workspace: Option<WorkspaceImportRecord>,
#[serde(default)]
pub keybinding: Option<KeybindingImportRecord>,
pub password_status: PasswordImportStatus,
pub warnings: Vec<ImportWarning>,
}
Expand All @@ -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,
Expand All @@ -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] {
Expand Down Expand Up @@ -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<String>,
#[serde(default)]
pub source_action: Option<String>,
#[serde(default)]
pub description: Option<String>,
}

#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub struct SshJumpServerImportRecord {
pub host: String,
Expand Down Expand Up @@ -370,6 +385,7 @@ mod tests {
port_forwarding: None,
quick_command: None,
workspace: None,
keybinding: None,
password_status: PasswordImportStatus::Unsupported,
warnings: Vec::new(),
}
Expand Down
64 changes: 64 additions & 0 deletions crates/core/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)。
///
/// 通道只决定「去哪份更新清单里找新版本」,安装包本身仍是同一套。稳定通道读
Expand Down Expand Up @@ -1360,6 +1390,8 @@ pub struct AppSettings {
pub main_window_state: Option<MainWindowState>,
#[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")]
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
88 changes: 87 additions & 1 deletion crates/core/src/tab_container.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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<Self>,
) {
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::<AppSettings>()
.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<Self>) {
if index >= self.tabs.len() {
return;
Expand Down Expand Up @@ -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 自身,避免渲染层重复一套守卫。
Expand Down Expand Up @@ -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)
);
}
}
1 change: 1 addition & 0 deletions crates/extension-runtime/src/connection_import_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ fn parse_output_kind(value: &str) -> Option<ImportRecordKind> {
"port-forwarding" | "port_forwarding" => Some(ImportRecordKind::PortForwarding),
"quick-command" | "quick_command" => Some(ImportRecordKind::QuickCommand),
"workspace" => Some(ImportRecordKind::Workspace),
"keybinding" => Some(ImportRecordKind::Keybinding),
_ => None,
}
}
4 changes: 3 additions & 1 deletion crates/extension-wasm/src/connection_import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}
}
Expand Down
42 changes: 42 additions & 0 deletions crates/navop_app/locales/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 应用来源
Expand Down Expand Up @@ -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:
Expand Down
27 changes: 27 additions & 0 deletions crates/navop_app/src/home/connection_import_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,33 @@ pub(crate) fn save_import_draft(
draft: &EditableImportDraft,
cx: &mut App,
) -> Result<ImportSaveResult, String> {
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::<GlobalStorageState>().storage.clone();
if draft.kind() == ImportDraftKind::Workspace {
let path = draft
Expand Down
Loading
Loading